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

!删除IsUseThingMap

Browse Source
This commit is contained in:
gazebo
2020-01-17 16:09:52 +08:00
parent 0fffdfdd76
commit 3e89a07a96
10 changed files with 45 additions and 301 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
business/model/dao/act.go
View File

@@ -77,13 +77,9 @@ func GetActStoreSkuVendorList(db *DaoDB, actID int, vendorIDs, storeIDs, skuIDs
pageSize = jxutils.FormalizePageSize(pageSize)
leftOrEmpty := ""
jdVendorIDField := "t4.jd_id"
if len(vendorIDs) == 1 && (vendorIDs[0] == -1 || vendorIDs[0] == model.VendorIDJX) {
leftOrEmpty = "LEFT"
}
if globals.IsUseThingMap {
jdVendorIDField = "t4m.vendor_thing_id"
}
sql := fmt.Sprintf(`
SELECT SQL_CALC_FOUND_ROWS
t1.*,
@@ -91,7 +87,7 @@ func GetActStoreSkuVendorList(db *DaoDB, actID int, vendorIDs, storeIDs, skuIDs
t3.vendor_store_id,
CASE t2.vendor_id
WHEN 0 THEN
%s
t4m.vendor_thing_id
WHEN 1 THEN
t5.mtwm_id
WHEN 3 THEN
@@ -103,7 +99,7 @@ func GetActStoreSkuVendorList(db *DaoDB, actID int, vendorIDs, storeIDs, skuIDs
t6.name store_name,
t7.name sku_name_name, t7.unit, t7.prefix, t7.ex_prefix, t7.ex_prefix_begin, t7.ex_prefix_end
FROM act_store_sku t1
%s JOIN act_store_sku_map t2 ON t2.act_id = ? AND t2.bind_id = t1.id AND t2.deleted_at = ?`, jdVendorIDField, leftOrEmpty)
%s JOIN act_store_sku_map t2 ON t2.act_id = ? AND t2.bind_id = t1.id AND t2.deleted_at = ?`, leftOrEmpty)
sqlParams := []interface{}{
actID,
utils.DefaultTimeValue,
@@ -115,20 +111,16 @@ func GetActStoreSkuVendorList(db *DaoDB, actID int, vendorIDs, storeIDs, skuIDs
}
sql += `
LEFT JOIN store_map t3 ON t3.store_id = t1.store_id AND t3.vendor_id = t2.vendor_id AND t3.deleted_at = ?
JOIN sku t4 ON t4.id = t1.sku_id`
sqlParams = append(sqlParams, utils.DefaultTimeValue)
if globals.IsUseThingMap {
sql += `
LEFT JOIN thing_map t4m ON t4m.thing_id = t4.id AND t4m.thing_type = ? AND t4m.vendor_id = t2.vendor_id AND t4m.vendor_org_code = t3.vendor_org_code AND t4m.deleted_at = ?`
sqlParams = append(sqlParams, model.ThingTypeSku, utils.DefaultTimeValue)
}
sql += `
JOIN sku t4 ON t4.id = t1.sku_id
LEFT JOIN thing_map t4m ON t4m.vendor_id = ? AND t4m.thing_id = t4.id AND t4m.thing_type = ? AND t4m.vendor_id = t2.vendor_id AND t4m.vendor_org_code = t3.vendor_org_code AND t4m.deleted_at = ?
LEFT JOIN store_sku_bind t5 ON t5.sku_id = t1.sku_id AND t5.store_id = t1.store_id AND t5.deleted_at = ?
LEFT JOIN store t6 ON t6.id = t1.store_id
JOIN sku_name t7 ON t7.id = t4.name_id
WHERE t1.act_id = ?
`
sqlParams = append(sqlParams,
utils.DefaultTimeValue,
model.VendorIDJD, model.ThingTypeSku, utils.DefaultTimeValue,
utils.DefaultTimeValue,
actID,
)