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

Merge branch 'jdshop' of https://e.coding.net/rosydev/jx-callback into jdshop

Browse Source
This commit is contained in:
richboo111
2022-12-28 15:46:43 +08:00
parent 2ac7187363 df513ab2ad
commit 79bd199db6
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -578,7 +578,8 @@ func syncStoreSku() {
} }
func syncStoreSkuTiktok() { func syncStoreSkuTiktok() {
syncFlag := 0 | model.SyncFlagSaleMask //syncFlag := 0 | model.SyncFlagSaleMask
syncFlag := 0
task := tasksch.NewParallelTask("同步京西商品到抖音平台,方案二使用", nil, jxcontext.AdminCtx, task := tasksch.NewParallelTask("同步京西商品到抖音平台,方案二使用", nil, jxcontext.AdminCtx,
func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
step := batchItemList[0].(int) step := batchItemList[0].(int)

13
business/partner/purchase/jd/order.go
View File

@@ -176,6 +176,19 @@ func (c *PurchaseHandler) onOrderInfoChangeMsg(vendorOrgCode string, msg *jdapi.
} }
func UpdateOrderBySettleMent(order *model.GoodsOrder, orderSettlement *jdapi.OrderSettlementInfo) { func UpdateOrderBySettleMent(order *model.GoodsOrder, orderSettlement *jdapi.OrderSettlementInfo) {
partner.CurOrderManager.OnOrderStatusChanged(order.VendorOrgCode, &model.OrderStatus{
VendorOrderID: order.VendorOrderID,
VendorID: order.VendorID,
OrderType: 0,
RefVendorOrderID: order.VendorOrderID,
RefVendorID: 0,
Status: 50000,
VendorStatus: "50000",
StatusTime: time.Now(),
DuplicatedCount: 0,
Remark: "收集京东结算信息推送",
ModelTimeInfo: model.ModelTimeInfo{CreatedAt: time.Now(), UpdatedAt: time.Now()},
})
if orderSettlement != nil { if orderSettlement != nil {
order.TotalShopMoney = orderSettlement.SettlementAmount order.TotalShopMoney = orderSettlement.SettlementAmount
order.PmSubsidyMoney = orderSettlement.PlatOrderGoodsDiscountMoney + orderSettlement.PlatSkuGoodsDiscountMoney order.PmSubsidyMoney = orderSettlement.PlatOrderGoodsDiscountMoney + orderSettlement.PlatSkuGoodsDiscountMoney