1

business/jxcallback/scheduler/defsch/defsch.go

@@ -948,7 +948,6 @@ func (s *DefScheduler) createWaybillOn3rdProviders(savedOrderInfo *WatchOrderInf
 					// excludeVendorIDs 包括上面已经发送的平台id
 					storeCourierList, err := dao.GetStoreCourierList2(dao.GetDB(), []int{jxutils.GetSaleStoreIDFromOrder(order)}, nil, model.StoreStatusOpened, []int{model.StoreAuditStatusOnline, model.StoreAuditStatusUpdated})
 					excludeVendorIDsMap := make(map[int]int, 0) // 被排除的配送
-					globals.SugarLogger.Debugf("excludeVendorIDs 1 ===========初始排除平台id列表 : %s", utils.Format4Output(excludeVendorIDs, false))
 					for _, v := range excludeVendorIDs {
 						excludeVendorIDsMap[v] = model.YES
 					}
@@ -984,7 +983,6 @@ func (s *DefScheduler) createWaybillOn3rdProviders(savedOrderInfo *WatchOrderInf
 							break
 						}
 					}
-					globals.SugarLogger.Debugf("excludeVendorIDs 2 ===========初始排除平台id列表 : %s", utils.Format4Output(excludeVendorIDs, false))
 					partner.CurOrderManager.OnOrderMsg(order, fmt.Sprintf("发起自动创建三方运单,目标创建运单平台[%s],排除平台[%s]", jxutils.GetVendorName(vendorID), utils.Format4Output(excludeVendorIDs, false)), "")
 					if _, err = s.CreateWaybillOnProviders4SavedOrder(jxcontext.AdminCtx, savedOrderInfo, nil, excludeVendorIDs, false, maxDeliveryFee); err == nil {
 						savedOrderInfo.retryCount++

business/partner/purchase/mtwm/order_afs.go

@@ -107,11 +107,11 @@ func (c *PurchaseHandler) onAfsOrderMsg(msg *mtwmapi.CallbackMsg) (retVal *mtwma
 			for _, sku := range refundData.FoodList {
 				orderSku := &model.OrderSkuFinancial{
 					// VendorID:      model.VendorIDMTWM,
-					// AfsOrderID:    afsOrder.AfsOrderID,
+					AfsOrderID: afsOrder.AfsOrderID,
 					// VendorOrderID: afsOrder.VendorOrderID,
 					// VendorStoreID: afsOrder.VendorStoreID,
 					// StoreID:       afsOrder.StoreID,
-					// IsAfsOrder:  1,
+					IsAfsOrder: 1,
 
 					Count: sku.Count,
 					// ConfirmTime:          afsOrder.AfsCreateAt,
@@ -120,6 +120,10 @@ func (c *PurchaseHandler) onAfsOrderMsg(msg *mtwmapi.CallbackMsg) (retVal *mtwma
 					Name:        sku.FoodName,
 					UserMoney:   jxutils.StandardPrice2Int(sku.RefundPrice)*int64(sku.Count) + jxutils.StandardPrice2Int(sku.BoxPrice)*int64(sku.BoxNum),
 				}
+				if orderSku.VendorSkuID == "" || orderSku.VendorSkuID == "0" {
+					orderSku.VendorSkuID = sku.AppFoodCode
+				}
+
 				afsOrder.SkuUserMoney += orderSku.UserMoney
 				afsOrder.Skus = append(afsOrder.Skus, orderSku)
 			}

controllers/jd_callback.go

@@ -110,9 +110,8 @@ func (c *DjswController) OrderCommentPush() {
 
 func (c *DjswController) Token() {
 	urlValues, err := utils.HTTPBody2Values(c.Ctx.Input.RequestBody, false)
-	if err == nil {
 	globals.SugarLogger.Info(utils.Format4Output(utils.URLValues2Map(urlValues), false))
-	}
+	globals.SugarLogger.Info(utils.Format4Output(utils.Format4Output(err, false), false))
 	jd.OnTokenChange(urlValues)
 	c.Data["json"] = c.transferResponse("Token", nil)
 	c.ServeJSON()