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:
邹宗楠
2024-03-11 11:41:21 +08:00
parent 73821c40a1
commit cf49205cbf
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
business/partner/purchase/ebai/order.go
View File

@@ -1,7 +1,6 @@
package ebai
import (
"errors"
"fmt"
"math"
"strings"
@@ -417,8 +416,8 @@ func (p *PurchaseHandler) Swtich2SelfDeliver(order *model.GoodsOrder, userName s
p.trySyncCancelStatus(order.VendorOrderID)
case ebaiapi.WaybillStatusNew, ebaiapi.WaybillStatusEvent, ebaiapi.WaybillStatusRequestDelivery, ebaiapi.WaybillStatusWait4Courier:
err = api.EbaiAPI.OrderCancelDelivery(order.VendorOrderID) // 取消呼叫众包骑手
case ebaiapi.WaybillStatusCourierAccepted:
err = errors.New("骑手已接单,无法转自送")
case ebaiapi.WaybillStatusCourierAccepted: // 骑手已接单,无法转自送
err = nil
}
}

13
business/partner/purchase/mtwm/order.go
View File

@@ -362,6 +362,19 @@ func (c *PurchaseHandler) onOrderMsg(msg *mtwmapi.CallbackMsg) (response *mtwmap
})
}
}
} else if msg.Cmd == mtwmapi.MsgTypeOrderModified {
order, _, err2 := c.getOrder(msg.AppID, GetOrderIDFromMsg(msg), GetVendorStoreIDFromMsg(msg))
if err = err2; err == nil {
localOrder, _ := partner.CurOrderManager.LoadOrder(GetOrderIDFromMsg(msg), model.VendorIDMTWM)
localOrder.ConsigneeName = order.ConsigneeName
localOrder.ConsigneeMobile = order.ConsigneeMobile
localOrder.BuyerComment = order.BuyerComment
localOrder.ExpectedDeliveredTime = order.ExpectedDeliveredTime
localOrder.ConsigneeAddress = order.ConsigneeAddress
localOrder.ConsigneeLat = order.ConsigneeLat
localOrder.ConsigneeLng = order.ConsigneeLng
dao.UpdateEntity(dao.GetDB(), localOrder, "ConsigneeName", "ConsigneeMobile", "BuyerComment", "ExpectedDeliveredTime", "ConsigneeAddress", "ConsigneeLat", "ConsigneeLng")
}
} else {
if status != nil {
var order *model.GoodsOrder