diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go index 6974e1e1d..85e1d12a8 100644 --- a/business/jxstore/cms/store_sku.go +++ b/business/jxstore/cms/store_sku.go @@ -516,7 +516,41 @@ func getGetStoresSkusBaseSQL(db *dao.DaoDB, storeIDs, skuIDs []int, upcs []strin sqlParams = append(sqlParams, skuIDs) } sql += ` - GROUP BY 1,2 + GROUP BY 1, 2 + UNION + SELECT a.store_id, a.sku_id, a.act_price*100 actual_act_price + FROM act_mtwm_vendor a + WHERE 1 = 1 + ` + if len(storeIDs) > 0 { + sql += " AND a.store_id IN (" + dao.GenQuestionMarks(len(storeIDs)) + ")" + sqlParams = append(sqlParams, storeIDs) + } + if len(skuIDs) > 0 { + sql += " AND a.sku_id IN (" + dao.GenQuestionMarks(len(skuIDs)) + ")" + sqlParams = append(sqlParams, skuIDs) + } + if actVendorID > 0 && actVendorID != model.VendorIDMTWM { + sql += " AND 1 = 2" + } + sql += ` GROUP BY 1, 2, 3 + UNION + SELECT a.store_id, a.sku_id, a.act_price*100 actual_act_price + FROM act_ebai_vendor_sku a + WHERE 1 = 1 + ` + if len(storeIDs) > 0 { + sql += " AND a.store_id IN (" + dao.GenQuestionMarks(len(storeIDs)) + ")" + sqlParams = append(sqlParams, storeIDs) + } + if len(skuIDs) > 0 { + sql += " AND a.sku_id IN (" + dao.GenQuestionMarks(len(skuIDs)) + ")" + sqlParams = append(sqlParams, skuIDs) + } + if actVendorID > 0 && actVendorID != model.VendorIDEBAI { + sql += " AND 1 = 2" + } + sql += ` GROUP BY 1, 2, 3 ) ta ON ta.store_id = t3.id AND ta.sku_id = t2.id` } } else {