|
@@ -295,8 +295,8 @@ public class ShoppingCart extends Controller {
|
|
|
,"colorschemeid","cheekschemeid","sa_customschemeid");
|
|
|
querySQL.addJoinTable(JOINTYPE.left, "plm_unit", "t4", "t4.unitid = t3.unitid AND t4.siteid = t1.siteid","unitname");
|
|
|
querySQL.addJoinTable(JOINTYPE.left, "plm_unitgroup", "t5", "t5.unitgroupid = t3.unitgroupid AND t5.siteid = t1.siteid","unitgroupname");
|
|
|
- querySQL.addJoinTable(JOINTYPE.left, "plm_unit", "t6", "t6.unitid = t5.auxunitid AND t5.siteid = t1.siteid","enterprisename","industry","sys_enterpriseid");
|
|
|
- querySQL.addJoinTable(JOINTYPE.left, "sa_promotion_items", "t7", "t7.sa_promotion_itemsid = t1.sa_promotion_itemsid AND t7.siteid = t1.siteid","enterprisename","industry","sys_enterpriseid");
|
|
|
+ querySQL.addJoinTable(JOINTYPE.left, "plm_unit", "t6", "t6.unitid = t5.auxunitid AND t5.siteid = t1.siteid");
|
|
|
+ querySQL.addJoinTable(JOINTYPE.left, "sa_promotion_items", "t7", "t7.sa_promotion_itemsid = t1.sa_promotion_itemsid AND t7.siteid = t1.siteid");
|
|
|
querySQL.addQueryFields("tradefield_shoppingcart","t1.tradefield");
|
|
|
querySQL.addQueryFields("auxunitname","t6.unitname");
|
|
|
querySQL.addQueryFields("packageqty","if(t1.sa_promotionid>0,ifnull(t7.packageqty,0),ifnull(t3.packageqty,0))");
|