liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'jdshop' of https://e.coding.net/rosydev/jx-callback into jdshop

Browse Source
This commit is contained in:
richboo111
2022-11-03 10:44:28 +08:00
parent c6fd8fce66 418cd06536
commit 6051b0c5b2
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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)

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

@@ -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