diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go index 31d87decb..421daff35 100644 --- a/business/jxstore/cms/store_sku.go +++ b/business/jxstore/cms/store_sku.go @@ -1152,8 +1152,6 @@ func GetStoresSkusNew(ctx *jxcontext.Context, storeIDs, skuIDs []int, upcs []str if isHighPrice || priceType != 0 { sql += " , t4.unit_price DESC LIMIT 99" } - globals.SugarLogger.Debugf("==========slq := %s", sql) - globals.SugarLogger.Debugf("==========sqlParams := %s", utils.Format4Output(sqlParams, false)) var tmpList []*tGetStoresSkusInfo if err = dao.GetRowsTx(txDB, &tmpList, sql, sqlParams...); err != nil { dao.Rollback(db, txDB) diff --git a/business/partner/delivery/rider.go b/business/partner/delivery/rider.go index 4de4cb649..40cb96782 100644 --- a/business/partner/delivery/rider.go +++ b/business/partner/delivery/rider.go @@ -75,13 +75,22 @@ func GetOrderRiderInfoToPlatform(orderId string, wayBillStatus int) { } } } - if riderInfo == nil || (riderInfo.CourierName == "" && v.WaybillVendorID == -1 && v.DeliveryType == "store") { // 真商家自送 + if riderInfo == nil || wayBillStatus == model.OrderStatusNew || wayBillStatus == model.OrderStatusCanceled || (riderInfo.CourierName == "" && v.WaybillVendorID == -1 && v.DeliveryType == "store") { // 真商家自送 riderInfo.OrderId = v.VendorOrderID - riderInfo.LogisticsStatus = 5 riderInfo.CourierName = "石锋" riderInfo.CourierPhone = "18048531223" riderInfo.LogisticsProviderCode = "10017" - riderInfo.LogisticsContext = "呼叫骑手,新建运单" + if wayBillStatus == model.WaybillStatusNew { + riderInfo.LogisticsStatus = model.WaybillStatusNew + riderInfo.LogisticsContext = "呼叫骑手,新建运单" + } else if wayBillStatus == model.WaybillStatusCanceled { + riderInfo.LogisticsStatus = model.WaybillStatusCanceled + riderInfo.LogisticsContext = "取消骑手" + } else { + riderInfo.LogisticsStatus = model.WaybillStatusDeliverFailed + riderInfo.LogisticsContext = "配送异常,等待恢复" + } + } riderInfo.ThirdCarrierOrderId = v.VendorWaybillID