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-27 15:24:11 +08:00
parent 9bc8812bf7
commit 798c010608
3 changed files with 16 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/jxstore/cms/sync_store_sku.go
View File

@@ -174,7 +174,7 @@ func SyncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
func SyncStoreSkuNew2(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag int, vendorID, storeID int, vendorStoreID, vendorOrgCode string, nameIDs, skuIDs, excludeSkuIDs []int, useVendorPriceDirectly, isAsync, isContinueWhenError bool) (hint string, err error) { func SyncStoreSkuNew2(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag int, vendorID, storeID int, vendorStoreID, vendorOrgCode string, nameIDs, skuIDs, excludeSkuIDs []int, useVendorPriceDirectly, isAsync, isContinueWhenError bool) (hint string, err error) {
singleStoreHandler, _ := partner.GetPurchasePlatformFromVendorID(vendorID).(partner.ISingleStoreStoreSkuHandler) singleStoreHandler, _ := partner.GetPurchasePlatformFromVendorID(vendorID).(partner.ISingleStoreStoreSkuHandler)
if singleStoreHandler != nil { if singleStoreHandler != nil { // 本地创建商品分类
if err = CreateStoreCategoryByStoreSku(ctx, vendorID, storeID, vendorStoreID, nameIDs, skuIDs); err != nil { if err = CreateStoreCategoryByStoreSku(ctx, vendorID, storeID, vendorStoreID, nameIDs, skuIDs); err != nil {
return "", err return "", err
} }

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

@@ -59,35 +59,26 @@ func GetOrderRiderInfoToPlatform(orderId string) {
riderInfo, err = handlerInfo.Handler.GetRiderInfo(v.VendorOrderID, 0, v.VendorWaybillID) riderInfo, err = handlerInfo.Handler.GetRiderInfo(v.VendorOrderID, 0, v.VendorWaybillID)
if err != nil { if err != nil {
globals.SugarLogger.Debug("Get Order waybill rider info err FN/DADA :%v", err) globals.SugarLogger.Debug("Get Order waybill rider info err FN/DADA :%v", err)
continue
} }
} else if v.WaybillVendorID == model.VendorIDMTPS { } else if v.WaybillVendorID == model.VendorIDMTPS {
if v.VendorWaybillID == "" { if v.VendorWaybillID != "" {
continue riderInfo, err = handlerInfo.Handler.GetRiderInfo(v.VendorOrderID, v.ID+1000000, v.VendorWaybillID)
if err != nil {
globals.SugarLogger.Debug("Get Order waybill rider info err MT:%v", err)
}
} }
riderInfo, err = handlerInfo.Handler.GetRiderInfo(v.VendorOrderID, v.ID+1000000, v.VendorWaybillID)
if err != nil {
globals.SugarLogger.Debug("Get Order waybill rider info err MT:%v", err)
continue
}
} else {
continue
} }
} }
if riderInfo.CourierName == "" { if riderInfo.CourierName == "" && v.WaybillVendorID == -1 && v.DeliveryType == "store"{ // 真商家自送
globals.SugarLogger.Debug("同步外卖骑手位置信息到美团失败，为获取到订单的骑手信息:", "----") riderInfo.OrderId = v.VendorOrderID
continue riderInfo.LogisticsStatus = v.Status
riderInfo.CourierName = "石锋"
riderInfo.CourierPhone = "18048531223"
riderInfo.LogisticsProviderCode = "10017"
globals.SugarLogger.Debug("同步外卖骑手位置信息到美团失败，未获取到订单的骑手信息:", "----")
} }
//if v.WaybillVendorID == model.VendorIDDada {
// riderInfo.LogisticsProviderCode = "10002"
// riderInfo.OrderId = v.VendorOrderID // 运单id
//}
//if v.WaybillVendorID == model.VendorIDFengNiao {
// riderInfo.LogisticsProviderCode = "10004"
//}
//if v.WaybillVendorID == model.VendorIDMTPS {
// riderInfo.LogisticsProviderCode = "10032"
//}
riderInfo.ThirdCarrierOrderId = v.VendorWaybillID riderInfo.ThirdCarrierOrderId = v.VendorWaybillID
switch riderInfo.LogisticsStatus { switch riderInfo.LogisticsStatus {
case 20: //配送中 case 20: //配送中

4
business/partner/purchase/jx/localjx/tonglianpay.go
View File

@@ -60,9 +60,7 @@ func pay4OrderByTL(ctx *jxcontext.Context, order *model.GoodsOrder, payType int,
Body: "京西菜市", Body: "京西菜市",
Charset: "UTF-8", Charset: "UTF-8",
} }
cc,err := api.TLpayAPI.CreateH5UnitorderOrder(param2) err = api.TLpayAPI.CreateH5UnitorderOrder(param2)
globals.SugarLogger.Debug("h5=========", err)
globals.SugarLogger.Debug("h5=========", cc)
} else { } else {
result, err := api.TLpayAPI.CreateUnitorderOrder(param) result, err := api.TLpayAPI.CreateUnitorderOrder(param)
if err == nil { if err == nil {