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

business/jxstore/misc/misc.go

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

business/partner/purchase/jd/order.go

@@ -176,6 +176,19 @@ func (c *PurchaseHandler) onOrderInfoChangeMsg(vendorOrgCode string, msg *jdapi.
 }
 
 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 {
 		order.TotalShopMoney = orderSettlement.SettlementAmount
 		order.PmSubsidyMoney = orderSettlement.PlatOrderGoodsDiscountMoney + orderSettlement.PlatSkuGoodsDiscountMoney