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-05-23 10:36:44 +08:00
parent 8fb81f6522
commit 4b140e830c
6 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
business/jxstore/cms/store.go
View File

@@ -1954,13 +1954,9 @@ func updateCourierStores(ctx *jxcontext.Context, storeID int) (err error) {
db := dao.GetDB() db := dao.GetDB()
errList := errlist.New() errList := errlist.New()
for k, v := range partner.DeliveryPlatformHandlers { for k, v := range partner.DeliveryPlatformHandlers {
//fmt.Println("k===================", k)
if v.Use4CreateWaybill { if v.Use4CreateWaybill {
if _, ok := v.Handler.(partner.IDeliveryUpdateStoreHandler); ok { if _, ok := v.Handler.(partner.IDeliveryUpdateStoreHandler); ok {
storeDetail, err2 := dao.GetStoreDetail2(db, storeID, "", k) storeDetail, err2 := dao.GetStoreDetail2(db, storeID, "", k)
//fmt.Println("storeDetail.VendorID===================", storeDetail.VendorID)
//fmt.Println("storeDetail.AuditStatus===================", storeDetail.AuditStatus)
//fmt.Println("storeDetail.VendorStoreID===================", storeDetail.VendorStoreID)
if err = err2; err2 == nil { if err = err2; err2 == nil {
if storeDetail.VendorStoreID != "" && storeDetail.AuditStatus == model.StoreAuditStatusOnline { if storeDetail.VendorStoreID != "" && storeDetail.AuditStatus == model.StoreAuditStatusOnline {
// 同步更新门店信息 // 同步更新门店信息

4
business/partner/delivery/dada/waybill.go
View File

@@ -95,7 +95,7 @@ func (c *DeliveryHandler) onWaybillMsg(msg *dadaapi.CallbackMsg) (retVal *dadaap
order.Status = model.WaybillStatusUnknown order.Status = model.WaybillStatusUnknown
} }
err := dadaapi.Err2CallbackResponse(partner.CurOrderManager.OnWaybillStatusChanged(order), utils.Int2Str(order.Status)) err := dadaapi.Err2CallbackResponse(partner.CurOrderManager.OnWaybillStatusChanged(order), utils.Int2Str(order.Status))
delivery.GetOrderRiderInfoToPlatform(order.VendorOrderID) // 骑手位置更新 defer delivery.GetOrderRiderInfoToPlatform(order.VendorOrderID) // 骑手位置更新
return err return err
} }
@@ -459,7 +459,7 @@ func (c *DeliveryHandler) GetRiderInfo(orderId string, deliveryId int64, mtPeiso
case 4: // 完成 case 4: // 完成
result.LogisticsStatus = model.WaybillStatusDelivered result.LogisticsStatus = model.WaybillStatusDelivered
case 5: // 取消 case 5: // 取消
result.LogisticsStatus = model.WaybillStatusAcceptCanceled result.LogisticsStatus = model.WaybillStatusCanceled
case 9: // 配送异常 case 9: // 配送异常
result.LogisticsStatus = model.WaybillStatusDeliverFailed result.LogisticsStatus = model.WaybillStatusDeliverFailed
default: default:

4
business/partner/delivery/fn/waybill.go
View File

@@ -253,7 +253,7 @@ func OnWaybillMsg(msg *fnpsapi.OrderStatusNottify) (resp *fnpsapi.CallbackRespon
globals.SugarLogger.Debugf("FNPS partner.CurOrderManager.OnWaybillStatusChanged fail :[%s]", err) globals.SugarLogger.Debugf("FNPS partner.CurOrderManager.OnWaybillStatusChanged fail :[%s]", err)
return fnpsapi.Err2CallbackResponse(err, "") return fnpsapi.Err2CallbackResponse(err, "")
} }
delivery.GetOrderRiderInfoToPlatform(order.VendorOrderID) // 骑手位置更新 defer delivery.GetOrderRiderInfoToPlatform(order.VendorOrderID) // 骑手位置更新
return fnpsapi.Err2CallbackResponse(nil, "") return fnpsapi.Err2CallbackResponse(nil, "")
} }
@@ -323,7 +323,7 @@ func (c *DeliveryHandler) GetRiderInfo(orderId string, deliveryId int64, mtPeiso
case 3: // 完成 case 3: // 完成
result.LogisticsStatus = model.WaybillStatusDelivered result.LogisticsStatus = model.WaybillStatusDelivered
case 4: // 取消 case 4: // 取消
result.LogisticsStatus = model.WaybillStatusAcceptCanceled result.LogisticsStatus = model.WaybillStatusCanceled
case 5: // 配送异常 case 5: // 配送异常
result.LogisticsStatus = model.WaybillStatusDeliverFailed result.LogisticsStatus = model.WaybillStatusDeliverFailed
default: default:

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

@@ -120,7 +120,7 @@ func (c *DeliveryHandler) onWaybillMsg(msg *mtpsapi.CallbackOrderMsg) (retVal *m
} }
// 加入调度器 // 加入调度器
err := mtpsapi.Err2CallbackResponse(partner.CurOrderManager.OnWaybillStatusChanged(order), order.VendorStatus) err := mtpsapi.Err2CallbackResponse(partner.CurOrderManager.OnWaybillStatusChanged(order), order.VendorStatus)
delivery.GetOrderRiderInfoToPlatform(order.VendorOrderID) // 骑手位置更新 defer delivery.GetOrderRiderInfoToPlatform(order.VendorOrderID) // 骑手位置更新
return err return err
} }

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

@@ -26,7 +26,6 @@ import (
//注：若同步配送状态为“配送单已取消”，接口仍支持继续同步配送状态。 说明：商家如未上传此信息，则平台默认值为20（现已要求必传）。 //注：若同步配送状态为“配送单已取消”，接口仍支持继续同步配送状态。 说明：商家如未上传此信息，则平台默认值为20（现已要求必传）。
func GetOrderRiderInfoToPlatform(orderId string) { func GetOrderRiderInfoToPlatform(orderId string) {
params := make(map[string]interface{}, 0) params := make(map[string]interface{}, 0)
params["statuss"] = "[20]"
params["isDateFinish"] = false params["isDateFinish"] = false
params["isIncludeFake"] = true params["isIncludeFake"] = true
params["mustInvoice"] = false params["mustInvoice"] = false
@@ -34,6 +33,8 @@ func GetOrderRiderInfoToPlatform(orderId string) {
params["waybillVendorIDs"] = `[101,102,103]` params["waybillVendorIDs"] = `[101,102,103]`
if orderId != "" { // 订单id会忽略其他参数 if orderId != "" { // 订单id会忽略其他参数
params["keyword"] = orderId params["keyword"] = orderId
} else {
params["statuss"] = "[20,110]"
} }
// 每五分钟查询当前订单信息，待配送状态订单1 // 每五分钟查询当前订单信息，待配送状态订单1
@@ -93,7 +94,7 @@ func GetOrderRiderInfoToPlatform(orderId string) {
riderInfo.LogisticsStatus = 20 riderInfo.LogisticsStatus = 20
case 110: // 完成 case 110: // 完成
riderInfo.LogisticsStatus = 40 riderInfo.LogisticsStatus = 40
case 105:// 完成 case 105: // 完成
riderInfo.LogisticsStatus = 40 riderInfo.LogisticsStatus = 40
case 115: // 取消 case 115: // 取消
riderInfo.LogisticsStatus = 100 riderInfo.LogisticsStatus = 100

3
business/partner/purchase/gomei/order.go
View File

@@ -28,10 +28,8 @@ func (p *PurchaseHandler) AcceptOrRefuseFailedGetOrder(ctx *jxcontext.Context, o
func (p *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *model.GoodsOrder) { func (p *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *model.GoodsOrder) {
result := &jdshopapi.AllOrdersResult{} result := &jdshopapi.AllOrdersResult{}
if err := utils.Map2StructByJson(orderData, &result, false); err != nil { if err := utils.Map2StructByJson(orderData, &result, false); err != nil {
fmt.Println("err===============", err)
return nil return nil
} }
fmt.Println("err===============", orderData)
jdsOrder := result.OrderList[0] jdsOrder := result.OrderList[0]
order = &model.GoodsOrder{ order = &model.GoodsOrder{
@@ -56,7 +54,6 @@ func (p *PurchaseHandler) GetOrder(vendorOrgCode, vendorOrderID, vendorStoreID s
if err != nil { if err != nil {
return nil, err return nil, err
} }
fmt.Println("resultOrders===============", resultOrders)
return p.Map2Order(utils.Struct2FlatMap(resultOrders)), err return p.Map2Order(utils.Struct2FlatMap(resultOrders)), err
} }
func (p *PurchaseHandler) GetOrderStatus(vendorOrgCode, vendorOrderID string) (status int, err error) { func (p *PurchaseHandler) GetOrderStatus(vendorOrgCode, vendorOrderID string) (status int, err error) {