diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go index 7b9db91c3..fc8b09266 100644 --- a/business/jxstore/cms/sync_store_sku.go +++ b/business/jxstore/cms/sync_store_sku.go @@ -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) { singleStoreHandler, _ := partner.GetPurchasePlatformFromVendorID(vendorID).(partner.ISingleStoreStoreSkuHandler) - if singleStoreHandler != nil { + if singleStoreHandler != nil { // 本地创建商品分类 if err = CreateStoreCategoryByStoreSku(ctx, vendorID, storeID, vendorStoreID, nameIDs, skuIDs); err != nil { return "", err } diff --git a/business/partner/delivery/rider.go b/business/partner/delivery/rider.go index e823f9543..9127a234b 100644 --- a/business/partner/delivery/rider.go +++ b/business/partner/delivery/rider.go @@ -59,35 +59,26 @@ func GetOrderRiderInfoToPlatform(orderId string) { riderInfo, err = handlerInfo.Handler.GetRiderInfo(v.VendorOrderID, 0, v.VendorWaybillID) if err != nil { globals.SugarLogger.Debug("Get Order waybill rider info err FN/DADA :%v", err) - continue } } else if v.WaybillVendorID == model.VendorIDMTPS { - if v.VendorWaybillID == "" { - continue + if v.VendorWaybillID != "" { + 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 == "" { - globals.SugarLogger.Debug("同步外卖骑手位置信息到美团失败,为获取到订单的骑手信息:", "----") - continue + if riderInfo.CourierName == "" && v.WaybillVendorID == -1 && v.DeliveryType == "store"{ // 真商家自送 + riderInfo.OrderId = v.VendorOrderID + 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 switch riderInfo.LogisticsStatus { case 20: //配送中 diff --git a/business/partner/purchase/jx/localjx/tonglianpay.go b/business/partner/purchase/jx/localjx/tonglianpay.go index 361d2727f..fd2519e30 100644 --- a/business/partner/purchase/jx/localjx/tonglianpay.go +++ b/business/partner/purchase/jx/localjx/tonglianpay.go @@ -60,9 +60,7 @@ func pay4OrderByTL(ctx *jxcontext.Context, order *model.GoodsOrder, payType int, Body: "京西菜市", Charset: "UTF-8", } - cc,err := api.TLpayAPI.CreateH5UnitorderOrder(param2) - globals.SugarLogger.Debug("h5=========", err) - globals.SugarLogger.Debug("h5=========", cc) + err = api.TLpayAPI.CreateH5UnitorderOrder(param2) } else { result, err := api.TLpayAPI.CreateUnitorderOrder(param) if err == nil {