liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
邹宗楠
2023-05-23 09:34:23 +08:00
parent c011092a2b
commit 77e7b21917
4 changed files with 52 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
business/jxcallback/orderman/orderman_ext.go
View File

@@ -502,6 +502,15 @@ func (c *OrderManager) ExportOrders(ctx *jxcontext.Context, fromDateStr, toDateS
v.CourierVendorName = model.VendorChineseNames[v.WaybillVendorID] v.CourierVendorName = model.VendorChineseNames[v.WaybillVendorID]
v.Status2 = model.OrderStatusName[v.Status] v.Status2 = model.OrderStatusName[v.Status]
v.SkuInfo = skuStr v.SkuInfo = skuStr
// 统计订单的违约金
var damages = &struct {
Damages int64 `json:"damages"`
}{}
sqlDamages := ` SELECT SUM(w.desired_fee) damages FROM waybill w WHERE w.vendor_order_id = ? AND w.status = ? `
paramDamages := []interface{}{v.VendorOrderID, model.OrderStatusCanceled}
if err := dao.GetRow(dao.GetDB(), damages, sqlDamages, paramDamages); err == nil {
v.LiquidatedDamages = damages.Damages
}
orders2 = append(orders2, v) orders2 = append(orders2, v)
} else { } else {
order.SkuInfo += ";" + skuStr order.SkuInfo += ";" + skuStr
@@ -542,6 +551,7 @@ func (c *OrderManager) ExportOrders(ctx *jxcontext.Context, fromDateStr, toDateS
"courierMobile", "courierMobile",
"courierMobile", "courierMobile",
"desiredFee", "desiredFee",
"liquidated_damages",
"waybillCreatedAt", "waybillCreatedAt",
"waybillFinishedAt", "waybillFinishedAt",
"status2", "status2",

1
business/jxstore/misc/misc.go
View File

@@ -210,6 +210,7 @@ func Init() {
// (自动发单拣货,设置骑手) // (自动发单拣货,设置骑手)
ScheduleTimerFuncByInterval(func() { ScheduleTimerFuncByInterval(func() {
auto_delivery.Init() // 初始化骑手列表
auto_delivery.AutoSettingFakeDelivery() auto_delivery.AutoSettingFakeDelivery()
}, 10*time.Second, 3*time.Minute) }, 10*time.Second, 3*time.Minute)

89
business/model/store.go
View File

@@ -473,55 +473,46 @@ func (*StoreSub) TableUnique() [][]string {
type StoreMap struct { type StoreMap struct {
ModelIDCULD ModelIDCULD
StoreID int `orm:"column(store_id)" json:"storeID"` StoreID int `orm:"column(store_id)" json:"storeID"`
VendorID int `orm:"column(vendor_id)" json:"vendorID"` VendorID int `orm:"column(vendor_id)" json:"vendorID"`
VendorOrgCode string `orm:"size(32)" json:"vendorOrgCode"` // 同一平台下不同的商户代码，如果只有一个，可以为空 VendorOrgCode string `orm:"size(32)" json:"vendorOrgCode"` // 同一平台下不同的商户代码，如果只有一个，可以为空
VendorStoreID string `orm:"column(vendor_store_id);size(48)" json:"vendorStoreID"`
VendorStoreID string `orm:"column(vendor_store_id);size(48)" json:"vendorStoreID"` Status int `json:"status"` // 取值同Store.Status
Status int `json:"status"` // 取值同Store.Status IsOnline int `json:"isOnline"` //上下线状态, -1是下线，1是上线
IsOnline int `json:"isOnline"` //上下线状态, -1是下线，1是上线 StoreName string `orm:"size(255)" json:"storeName"` // 平台门店的名字,由平台到京西
StoreName string `orm:"size(255)" json:"storeName"` // 平台门店的名字,由平台到京西 VendorStoreName string `orm:"size(255)" json:"vendorStoreName"` //平台门店名，由京西到平台
VendorStoreName string `orm:"size(255)" json:"vendorStoreName"` //平台门店名，由京西到平台 VendorPayPercentage int `json:"vendorPayPercentage"` //平台结算比例
VendorPayPercentage int `json:"vendorPayPercentage"` //平台结算比例 PricePercentage int16 `orm:"default(100)" json:"pricePercentage"` // todo 厂商价格相对于本地价格的百分比，这个字段的修改会比较特殊，因为可能需要刷新厂商价格
PricePercentagePack string `orm:"size(32)" json:"pricePercentagePack"` //
PricePercentage int16 `orm:"default(100)" json:"pricePercentage"` // todo 厂商价格相对于本地价格的百分比，这个字段的修改会比较特殊，因为可能需要刷新厂商价格 FreightDeductionPack string `orm:"size(32)" json:"freightDeductionPack"` //
PricePercentagePack string `orm:"size(32)" json:"pricePercentagePack"` // AutoPickup int8 `orm:"default(1)" json:"autoPickup"` // 是否自动拣货
FreightDeductionPack string `orm:"size(32)" json:"freightDeductionPack"` // DeliveryType int8 `orm:"default(0)" json:"deliveryType"` // 配送类型
DeliveryFeeDeductionSill int `json:"deliveryFeeDeductionSill"` //在vendorID=14,存储满 x 包邮金额
AutoPickup int8 `orm:"default(1)" json:"autoPickup"` // 是否自动拣货 DeliveryFeeDeductionFee int `json:"deliveryFeeDeductionFee"` //在vendorID=14,存储打包费
DeliveryType int8 `orm:"default(0)" json:"deliveryType"` // 配送类型 DeliveryCompetition int8 `orm:"default(1)" json:"deliveryCompetition"` // 是否支持配送竞争
DeliveryFeeDeductionSill int `json:"deliveryFeeDeductionSill"` //在vendorID=14,存储满 x 包邮金额 CreateDeliveryType int `orm:"default(0)" json:"createDeliveryType"` //默认0系统发单，1为门店发单
DeliveryFeeDeductionFee int `json:"deliveryFeeDeductionFee"` //在vendorID=14,存储打包费 IsService int `orm:"default(0)" json:"isService"` // 默认0非服务商，1服务商
DeliveryCompetition int8 `orm:"default(1)" json:"deliveryCompetition"` // 是否支持配送竞争 SyncStatus int8 `orm:"default(2)" json:"syncStatus"`
CreateDeliveryType int `orm:"default(0)" json:"createDeliveryType"` //默认0系统发单，1为门店发单 IsSync int8 `orm:"default(1)" json:"isSync"` // 是否同步
IsService int `orm:"default(0)" json:"isService"` // 默认0非服务商，1服务商 SyncRule int8 `orm:"default(0)" json:"syncRule"` //目前用于京东商城晚上的同步规则，0表示关闭，1表示小同步，2表示大同步
FakeOpenStart int16 `orm:"default(0)" json:"fakeOpenStart"` // 假开店开始
SyncStatus int8 `orm:"default(2)" json:"syncStatus"` FakeOpenStop int16 `orm:"default(0)" json:"fakeOpenStop"` // 假开店结束
IsSync int8 `orm:"default(1)" json:"isSync"` // 是否同步 JdStoreLevel string `orm:"size(32)" json:"jdStoreLevel"` //京东门店等级
SyncRule int8 `orm:"default(0)" json:"syncRule"` //目前用于京东商城晚上的同步规则，0表示关闭，1表示小同步，2表示大同步 JdsStreetCode int `orm:"default(0)" json:"jdsStreetCode"` //京东商城直辖市街道code
FakeOpenStart int16 `orm:"default(0)" json:"fakeOpenStart"` // 假开店开始 JdsStreetName string `orm:"size(32)" json:"jdsStreetName"` //京东商城直辖市街道
FakeOpenStop int16 `orm:"default(0)" json:"fakeOpenStop"` // 假开店结束 IsOrder int `orm:"default(0)" json:"isOrder"` //是否是下预订单门店
JdStoreLevel string `orm:"size(32)" json:"jdStoreLevel"` //京东门店等级 IsSysCat int `orm:"default(0)" json:"isSysCat"` //是否使用京西分类
JdsStreetCode int `orm:"default(0)" json:"jdsStreetCode"` //京东商城直辖市街道code IsSupplyGoods int `orm:"default(0)" json:"isSupplyGoods"` // 是否是货源门店
JdsStreetName string `orm:"size(32)" json:"jdsStreetName"` //京东商城直辖市街道 YbAppID string `orm:"column(yb_app_id);size(255)" json:"ybAppID"`
YbAppKey string `orm:"size(255)" json:"ybAppKey"`
IsOrder int `orm:"default(0)" json:"isOrder"` //是否是下预订单门店 YbStorePrefix string `orm:"size(255)" json:"ybStorePrefix"` //在vendorID=14,存储抖店门店起送金额 单位分
IsSysCat int `orm:"default(0)" json:"isSysCat"` //是否使用京西分类 MtwmToken string `orm:"size(512)" json:"mtwmToken"` //美团外卖商超token，有效期30天，每20天刷一次
IsSupplyGoods int `orm:"default(0)" json:"isSupplyGoods"` // 是否是货源门店 MtwmRefreshToken string `orm:"size(255)" json:"mtwmRefreshToken"` //美团外卖商超refreshToken
EbaiSupplierID string `orm:"column(ebai_supplier_id)" json:"ebaiSupplierID"` //饿百供应商ID
YbAppID string `orm:"column(yb_app_id);size(255)" json:"ybAppID"` BussinessStatus int `orm:"-" json:"bussinessStatus"`
YbAppKey string `orm:"size(255)" json:"ybAppKey"` VendorAccount string `orm:"size(255)" json:"vendorAccount"` //商户在平台上的账号（授权用
YbStorePrefix string `orm:"size(255)" json:"ybStorePrefix"` //在vendorID=14,存储抖店门店起送金额 单位分 VendorPasswaord string `orm:"size(255)" json:"vendorPasswaord"` //商户在平台上的密码（ aes cbc base64后的
AuditStatus int `json:"auditStatus"` //审核状态（授权状态
MtwmToken string `orm:"size(512)" json:"mtwmToken"` //美团外卖商超token，有效期30天，每20天刷一次
MtwmRefreshToken string `orm:"size(255)" json:"mtwmRefreshToken"` //美团外卖商超refreshToken
EbaiSupplierID string `orm:"column(ebai_supplier_id)" json:"ebaiSupplierID"` //饿百供应商ID
BussinessStatus int `orm:"-" json:"bussinessStatus"`
VendorAccount string `orm:"size(255)" json:"vendorAccount"` //商户在平台上的账号（授权用
VendorPasswaord string `orm:"size(255)" json:"vendorPasswaord"` //商户在平台上的密码（ aes cbc base64后的
AuditStatus int `json:"auditStatus"` //审核状态（授权状态
} }
func (*StoreMap) TableUnique() [][]string { func (*StoreMap) TableUnique() [][]string {

5
main.go
View File

@@ -11,8 +11,6 @@ import (
"git.rosy.net.cn/jx-callback/business/partner/purchase/im" "git.rosy.net.cn/jx-callback/business/partner/purchase/im"
"git.rosy.net.cn/jx-callback/business/enterprise" "git.rosy.net.cn/jx-callback/business/enterprise"
"git.rosy.net.cn/jx-callback/business/jxcallback/auto_delivery"
"git.rosy.net.cn/jx-callback/business/partner/purchase/jdshop" "git.rosy.net.cn/jx-callback/business/partner/purchase/jdshop"
"git.rosy.net.cn/jx-callback/business/partner/purchase/yb" "git.rosy.net.cn/jx-callback/business/partner/purchase/yb"
@@ -93,8 +91,7 @@ func Init() {
jdshop.CurPurchaseHandler.StartRefreshComment() jdshop.CurPurchaseHandler.StartRefreshComment()
} }
misc.Init() misc.Init()
enterprise.Init() // 初始化enterprise key enterprise.Init() // 初始化enterprise key
auto_delivery.Init() // 初始化骑手列表
im.Init() //初始化ws连接 im.Init() //初始化ws连接