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-07-17 09:17:29 +08:00
parent 0cce5309df
commit 6c41b23ccb
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
business/partner/delivery/rider.go
View File

@@ -96,6 +96,10 @@ func GetOrderRiderInfoToPlatform(orderId string, wayBillStatus int) {
continue continue
} }
if (v.WaybillVendorID == model.YES || v.WaybillVendorID == -1) && v.VendorID == model.VendorIDMTWM {
continue
}
if orderId == "" { // 订单id为空是,是定时轮询操作,不做此状态 if orderId == "" { // 订单id为空是,是定时轮询操作,不做此状态
waybillList, _ := dao.GetWaybills(dao.GetDB(), v.VendorOrderID, nil) waybillList, _ := dao.GetWaybills(dao.GetDB(), v.VendorOrderID, nil)
if len(waybillList) > 0 && waybillList[0].Status > model.WaybillStatusEndBegin { if len(waybillList) > 0 && waybillList[0].Status > model.WaybillStatusEndBegin {

3
controllers/mtps_order.go
View File

@@ -1,8 +1,6 @@
package controllers package controllers
import ( import (
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/globals"
"net/http" "net/http"
"git.rosy.net.cn/jx-callback/business/partner/delivery/mtps" "git.rosy.net.cn/jx-callback/business/partner/delivery/mtps"
@@ -23,7 +21,6 @@ func (c *MtpsController) Status() {
} }
obj, callbackResponse := api.MtpsAPI.GetOrderCallbackMsg(c.Ctx.Request) obj, callbackResponse := api.MtpsAPI.GetOrderCallbackMsg(c.Ctx.Request)
globals.SugarLogger.Debugf("==========obj := %s", utils.Format4Output(obj, false))
if callbackResponse == nil { if callbackResponse == nil {
callbackResponse = mtps.OnWaybillMsg(obj) callbackResponse = mtps.OnWaybillMsg(obj)
} }