促销方案逻辑变更

src/custom/restcontroller/sale/promotion/SQL/促销方案列表查询.sql

@@ -10,6 +10,7 @@ SELECT
 	t1.orderminqty,
 	t1.orderaddqty,
 	t1.orderminamount,
+	t1.isrelevancepromotion,
 	t1.begdate,
 	t1.enddate,
 	t1.STATUS,
@@ -41,7 +42,7 @@ WHERE
 	AND t1.STATUS = '发布' 
 	AND DATE_FORMAT( now(), '%Y-%m-%d' )>= DATE_FORMAT( t1.begdate, '%Y-%m-%d' ) 
 	AND DATE_FORMAT( now(), '%Y-%m-%d' )<= DATE_FORMAT( t1.enddate, '%Y-%m-%d' )
-	and t1.sa_promotionid not in (select  sa_openpromotionid from  sa_promotion where STATUS = '发布' 	AND DATE_FORMAT( now(), '%Y-%m-%d' )>= DATE_FORMAT( t1.begdate, '%Y-%m-%d' ) AND DATE_FORMAT( now(), '%Y-%m-%d' )<= DATE_FORMAT( t1.enddate, '%Y-%m-%d' ) )
+	and t1.sa_promotionid not in (select  ifnull(sa_openpromotionid,0) from  sa_promotion where STATUS = '发布' 	AND DATE_FORMAT( now(), '%Y-%m-%d' )>= DATE_FORMAT( t1.begdate, '%Y-%m-%d' ) AND DATE_FORMAT( now(), '%Y-%m-%d' )<= DATE_FORMAT( t1.enddate, '%Y-%m-%d' ) )
 	AND (
 		t1.sa_promotionid IN ( SELECT sa_promotionid FROM sa_promotion_auth WHERE sys_enterpriseid = $sys_enterpriseid$ ) 
 	OR NOT EXISTS ( SELECT * FROM sa_promotion_auth WHERE sa_promotionid = t1.sa_promotionid AND siteid = t1.siteid )) 

src/custom/restcontroller/sale/promotion/SQL/促销方案列表查询（触发的促销方案).sql

@@ -10,6 +10,7 @@ SELECT
 	t1.orderminqty,
 	t1.orderaddqty,
 	t1.orderminamount,
+	t1.isrelevancepromotion,
 	t1.begdate,
 	t1.enddate,
 	t1.STATUS,

src/custom/restcontroller/webmanage/sale/promotion/SQL/促销方案列表查询.sql

@@ -10,6 +10,7 @@ SELECT
 	t1.orderminqty,
 	t1.orderaddqty,
 	t1.orderminamount,
+	t1.isrelevancepromotion,
 	t1.begdate,
 	t1.enddate,
 	t1.status,

src/custom/restcontroller/webmanage/sale/promotion/SQL/促销方案新增.sql

@@ -1,4 +1,4 @@
 insert into sa_promotion (siteid, sa_promotionid,createuserid,createby, createdate, promnum,changeuserid,changeby, changedate,promname,remarks,type,sa_accountclassid,
-                                sa_brandid,tradefield, status,orderminqty,orderaddqty,orderminamount,begdate,enddate,sa_openpromotionid,openamount)
+                                sa_brandid,tradefield, status,orderminqty,orderaddqty,orderminamount,begdate,enddate,sa_openpromotionid,openamount,isrelevancepromotion)
 values ($siteid$, $sa_promotionid$,$userid$,$username$, CURRENT_TIME, $promnum$,$userid$, $username$, CURRENT_TIME,$promname$,$remarks$,$type$,$sa_accountclassid$,
-                                $sa_brandid$,$tradefield$,'新建',$orderminqty$,$orderaddqty$,$orderminamount$,$begdate$,$enddate$,$sa_openpromotionid$,$openamount$);
+                                $sa_brandid$,$tradefield$,'新建',$orderminqty$,$orderaddqty$,$orderminamount$,$begdate$,$enddate$,$sa_openpromotionid$,$openamount$,$isrelevancepromotion$);

src/custom/restcontroller/webmanage/sale/promotion/SQL/促销方案更新.sql

@@ -15,5 +15,6 @@ SET
     begdate = $begdate$,
     enddate = $enddate$,
     sa_openpromotionid=$sa_openpromotionid$,
-    openamount=$openamount$
+    openamount=$openamount$,
+    isrelevancepromotion=$isrelevancepromotion$
 WHERE sa_promotionid = $sa_promotionid$ and siteid=$siteid$

src/custom/restcontroller/webmanage/sale/promotion/SQL/促销方案详情查询.sql

@@ -10,6 +10,7 @@ SELECT
 	t1.orderminqty,
 	t1.orderaddqty,
 	t1.orderminamount,
+	t1.isrelevancepromotion,
 	t1.begdate,
 	t1.enddate,
 	t1.status,

src/custom/restcontroller/webmanage/sale/promotion/promotion.java

@@ -87,6 +87,8 @@ public class promotion extends Controller {
 		sqlFactory.addParameter("orderminamount", orderminamount);
 		sqlFactory.addParameter("sa_openpromotionid", content.getIntValue("sa_openpromotionid"));
 		sqlFactory.addParameter("openamount",  content.getBigDecimalValue("openamount"));
+		sqlFactory.addParameter("isrelevancepromotion",  content.getLongValue("isrelevancepromotion"));
+
 		sqlFactory.addParameter("begdate", begdate);
 		sqlFactory.addParameter("enddate", enddate);
 		// 备注说明