Browse Source

Merge branch 'develop' into develop2

hu 1 year ago
parent
commit
d113cd5cfa

+ 1 - 1
src/custom/restcontroller/sale/itemgroup/SQL/查询商品所在有效活动.sql

@@ -1,4 +1,4 @@
 select t1.sa_promotionid,t1.promname from sa_promotion t1
      inner join sa_promotion_items t2 on t1.sa_promotionid=t2.sa_promotionid and t1.siteid=t2.siteid
      inner join plm_item t3 on t2.itemid=t3.itemid and t2.siteid=t3.siteid
-     where t1.sa_promotionid in $sa_promotionids$ and t3.itemno=$itemno$ and t1.siteid=$siteid$
+     where t1.sa_promotionid in $sa_promotionids$ and t3.itemno=$itemno$ and t1.siteid=$siteid$ and t2.isonsale=1