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

1

Browse Source
This commit is contained in:
邹宗楠
2023-08-18 09:48:00 +08:00
parent 9d2f29bce6
commit 6229fc5acc
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
business/partner/delivery/mtps/waybill.go
View File

@@ -94,11 +94,11 @@ func (c *DeliveryHandler) onWaybillMsg(msg *mtpsapi.CallbackOrderMsg) (retVal *m
c.pushToGy(msg) c.pushToGy(msg)
return mtpsapi.SuccessResponse return mtpsapi.SuccessResponse
} }
// 多次取消,只处理第一次 // 多次取消,送达,只处理第一次
if msg.Status == mtpsapi.OrderStatusCanceled { if msg.Status == mtpsapi.OrderStatusCanceled || msg.Status == mtpsapi.OrderStatusDeliverred {
orderStatus, _ := orderman.FixedOrderManager.GetWayBillStatusList(msg.OrderID, msg.MtPeisongID, model.VendorIDMTPS) orderStatus, _ := orderman.FixedOrderManager.GetWayBillStatusList(msg.OrderID, msg.MtPeisongID, model.VendorIDMTPS)
for _, v := range orderStatus { for _, v := range orderStatus {
if v.VendorStatus == "99" { if v.VendorStatus == utils.Int64ToStr(mtpsapi.OrderStatusCanceled) || v.VendorStatus == utils.Int64ToStr(mtpsapi.OrderStatusDeliverred) {
return mtpsapi.SuccessResponse return mtpsapi.SuccessResponse
} }
} }

4
business/partner/purchase/mtwm/financial.go
View File

@@ -154,6 +154,10 @@ func (p *PurchaseHandler) OrderDetail2Financial(result map[string]interface{}) (
} else { } else {
err = nil err = nil
} }
// 区分门店是否为报价门店
// 报价门店商品如果京西系统存在则不管,不存在则获取平台上填写的进货价
if result["package_bag_money"] != nil { if result["package_bag_money"] != nil {
orderFinancial.BoxMoney = utils.MustInterface2Int64(result["package_bag_money"]) orderFinancial.BoxMoney = utils.MustInterface2Int64(result["package_bag_money"])
} }