提交订单

business/partner/delivery/mtps/waybill.go

@@ -120,6 +120,7 @@ func (c *DeliveryHandler) onWaybillMsg(msg *mtpsapi.CallbackOrderMsg) (retVal *m
 		c.pushToGy(msg)
 		return mtpsapi.SuccessResponse
 	}
+	// 加入调度器
 	return mtpsapi.Err2CallbackResponse(partner.CurOrderManager.OnWaybillStatusChanged(order), order.VendorStatus)
 }
 
@@ -207,10 +208,15 @@ func (c *DeliveryHandler) GetWaybillFee(order *model.GoodsOrder) (deliveryFeeInf
 	deliveryFeeInfo = &partner.WaybillFeeInfo{}
 	// 获取送货单id
 	deliveryID := c.getDeliveryID(order)
+	shopId, err := c.getMTPSShopID(order, dao.GetDB())
+	if err != nil {
+		return nil, err
+	}
+
 	deliveryFeeInfo.RefDeliveryFee, deliveryFeeInfo.RefAddFee, err = api.MtpsAPI.PreCreateByShop(&mtpsapi.PreCreateByShopParam{
 		DeliveryID:           deliveryID,
 		OrderID:              order.VendorOrderID,
-		ShopID:               utils.Int2Str(order.StoreID),
+		ShopID:               shopId,
 		DeliveryServiceCode:  mtpsapi.DeliveryServiceCodeRapid,
 		ReceiverName:         order.ConsigneeName,
 		ReceiverAddress:      order.ConsigneeAddress,