1

business/partner/purchase/tiktok_store/waybill.go

@@ -41,7 +41,7 @@ func (c *PurchaseHandler) onWaybillMsg(tag, orderId string, data interface{}) *t
 	waybill := c.callbackMsg2Waybill(tag, orderId, data)
 	if localOrder, err := partner.CurOrderManager.LoadOrder(waybill.VendorOrderID, model.VendorIDDD); err == nil {
 		err := partner.CurOrderManager.OnWaybillStatusChanged(waybill)
-		if err == nil && waybill.Status == model.WaybillStatusDelivering {
+		if err == nil {
 			status := &model.OrderStatus{
 				VendorOrderID:    waybill.VendorOrderID,
 				VendorID:         model.VendorIDDD,
@@ -71,7 +71,7 @@ func (c *PurchaseHandler) callbackMsg2Waybill(tag, orderId string, data interfac
 	if req.Status == tiktok_api.ShipmentStatusReceived {
 		tempRemark = req.RiderName + "," + req.RiderPhone
 	}
-	return &model.Waybill{
+	way := &model.Waybill{
 		VendorOrderID:   utils.Int64ToStr(req.ShopOrderID),
 		OrderVendorID:   model.VendorIDDD,
 		VendorWaybillID: utils.Int64ToStr(req.ShopOrderID),
@@ -84,6 +84,7 @@ func (c *PurchaseHandler) callbackMsg2Waybill(tag, orderId string, data interfac
 		Remark:          tempRemark,
 		VendorOrgCode:   utils.Int64ToStr(req.ShopID), //为抖音账号ID
 	}
+	return way
 }
 
 //设置自动呼叫运力