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:
邹宗楠
2024-12-26 14:12:37 +08:00
parent 2b94256c58
commit bc2b1349da
2 changed files with 31 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
business/jxstore/cms/sku.go
View File

@@ -3484,6 +3484,7 @@ func GetSkuNamesNew(ctx *jxcontext.Context, keyword string, skuIDs, skuNameIDs [
t1.yb_name_suffix, t1.yb_name_suffix,
t1.jds_stock_switch, t1.jds_stock_switch,
t1.preparation_time, t1.preparation_time,
t1.mt_attribute,
t1.best_seller t1.best_seller
FROM sku_name t1 FROM sku_name t1
LEFT JOIN sku t2 ON t1.id = t2.name_id AND t2.deleted_at = ? LEFT JOIN sku t2 ON t1.id = t2.name_id AND t2.deleted_at = ?
@@ -3524,7 +3525,9 @@ func GetSkuNamesNew(ctx *jxcontext.Context, keyword string, skuIDs, skuNameIDs [
t1.yb_name_suffix, t1.yb_name_suffix,
t1.jds_stock_switch, t1.jds_stock_switch,
t1.preparation_time, t1.preparation_time,
t1.best_seller, t2.id sku_id t1.best_seller,
t1.mt_attribute,
t2.id sku_id
FROM sku_name t1 FROM sku_name t1
LEFT JOIN sku t2 ON t1.id = t2.name_id AND t2.deleted_at = ? LEFT JOIN sku t2 ON t1.id = t2.name_id AND t2.deleted_at = ?
LEFT JOIN thing_map t3 ON t3.thing_id = t2.id AND t3.thing_type = ? AND t3.vendor_org_code = ? AND t3.deleted_at = ? LEFT JOIN thing_map t3 ON t3.thing_id = t2.id AND t3.thing_type = ? AND t3.vendor_org_code = ? AND t3.deleted_at = ?
@@ -3648,6 +3651,30 @@ func GetSkuNamesNew(ctx *jxcontext.Context, keyword string, skuIDs, skuNameIDs [
} }
skuName.Places = placeCodes skuName.Places = placeCodes
} }
// 京西商品库页面只获取美团属性来作为判断值,其余平台暂不获取
skuVendorCats, _ := dao.GetSkuVendorCategoryMaps(db, []int{skuName.ID}, []int{model.VendorIDMTWM}, nil)
if len(skuVendorCats) > 0 {
for _, v := range skuVendorCats {
if v.VendorID == model.VendorIDMTWM {
skuName.MtwmCategoryID = v.VendorCategoryID
break
}
//if v.VendorID == model.VendorIDJDShop {
// skuName.JdsCategoryID = v.VendorCategoryID
//}
//if v.VendorID == model.VendorIDDD {
// skuName.DdCategoryID = v.VendorCategoryID
//}
//if v.VendorID == model.VendorIDJD {
// skuName.JdCategoryID = v.VendorCategoryID
//}
//if v.VendorID == model.VendorIDEBAI {
// skuName.EbaiCategoryID = v.VendorCategoryID
//}
}
}
return retVal, err return retVal, err
}, skuNamesInfo.SkuNames) }, skuNamesInfo.SkuNames)
tasksch.HandleTask(task, nil, true).Run() tasksch.HandleTask(task, nil, true).Run()

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

@@ -111,6 +111,9 @@ func GetOrderRiderInfoToPlatform(orderId string, wayBillStatus int) {
globals.SugarLogger.Debug("Get Order waybill rider info err FN/DADA/SFPS :%v", err) globals.SugarLogger.Debug("Get Order waybill rider info err FN/DADA/SFPS :%v", err)
continue continue
} }
if riderInfo.CourierPhone != "" && riderInfo.CourierName != "" && strings.Contains(riderInfo.LogisticsContext, "%s") {
riderInfo.LogisticsContext = fmt.Sprintf(riderInfo.LogisticsContext, riderInfo.CourierPhone, riderInfo.CourierName)
}
} else if v.WaybillVendorID == model.VendorIDMTPS { } else if v.WaybillVendorID == model.VendorIDMTPS {
if v.VendorWaybillID != "" { if v.VendorWaybillID != "" {
riderInfo, err = handlerInfo.Handler.GetRiderInfo(v.VendorOrderID, v.ID+1000000, v.VendorWaybillID) riderInfo, err = handlerInfo.Handler.GetRiderInfo(v.VendorOrderID, v.ID+1000000, v.VendorWaybillID)