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:
邹宗楠
2022-11-03 14:03:22 +08:00
parent 418cd06536
commit d2707ddaf1
3 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
business/jxcallback/orderman/order_afs.go
View File

@@ -211,6 +211,10 @@ func (c *OrderManager) addAfsOrderStatus(db *dao.DaoDB, orderStatus *model.Order
"VendorStatus", "VendorStatus",
"Status", "Status",
} }
if orderStatus.VendorID == model.VendorIDDD {
order.Flag = 0
updateFields = append(updateFields, "Flag")
}
if model.IsAfsOrderFinalStatus(orderStatus.Status) { if model.IsAfsOrderFinalStatus(orderStatus.Status) {
order.AfsFinishedAt = orderStatus.StatusTime order.AfsFinishedAt = orderStatus.StatusTime
if utils.IsTimeZero(order.AfsFinishedAt) { if utils.IsTimeZero(order.AfsFinishedAt) {

4
business/jxcallback/scheduler/defsch/defsch.go
View File

@@ -586,6 +586,10 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending boo
s.saveDeliveryFeeFromAndStartWatch(savedOrderInfo, bill.StatusTime) s.saveDeliveryFeeFromAndStartWatch(savedOrderInfo, bill.StatusTime)
} }
// s.sendCourierOrderSMS(bill) // s.sendCourierOrderSMS(bill)
// 抖店在创建运单时,推送发单
if order.VendorID == model.VendorIDDD && bill.Status == model.WaybillStatusNew {
partner.GetPurchaseOrderHandlerFromVendorID(order.VendorID).SelfDeliverDelivering(order, "")
}
} else { } else {
isBillExist := s.updateBillsInfo(savedOrderInfo, bill) isBillExist := s.updateBillsInfo(savedOrderInfo, bill)
if !isBillExist { if !isBillExist {

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

@@ -152,6 +152,7 @@ func GetOrderRiderInfoToPlatform(orderId string, wayBillStatus int) {
case model.VendorIDJDShop: // 京东商城 case model.VendorIDJDShop: // 京东商城
case model.VendorIDWSC: // 微盟微商城 case model.VendorIDWSC: // 微盟微商城
case model.VendorIDDD: // 抖店小时达 case model.VendorIDDD: // 抖店小时达
// 呼叫骑手的时候推送发货
// 抖店由于发配送时运单id已经固定了,我们系统在重新发货,或者运单号发生改变时去推送信息时.抖店只识别第一个运单号所以在这儿修改成发单时的第一个运单号! // 抖店由于发配送时运单id已经固定了,我们系统在重新发货,或者运单号发生改变时去推送信息时.抖店只识别第一个运单号所以在这儿修改成发单时的第一个运单号!
riderInfo.ThirdCarrierOrderId = riderInfo.OrderId riderInfo.ThirdCarrierOrderId = riderInfo.OrderId
paramsMap := utils.Struct2Map(riderInfo, "", true) paramsMap := utils.Struct2Map(riderInfo, "", true)