Merge branch 'develop' into develop2

src/custom/restcontroller/webmanage/sale/order/Order.java

@@ -1492,7 +1492,7 @@ public class Order extends Controller {
                 sqlFactory.addParameter("siteid",siteid);
                 Rows spromotionsaleareaRows = dbConnect.runSqlQuery(sqlFactory);
                 RowsMap spromotionsaleareaRowsMap = spromotionsaleareaRows.toRowsMap("sa_promotionid");
-                if ((dbConnect.runSqlQuery("SELECT 1 FROM sa_promotion_auth WHERE sys_enterpriseid= "+sys_enterpriseid+" AND siteid='" + siteid + "' AND sa_promotionid='" + sa_promotionid + "'").isEmpty() && !spromotionsaleareaRowsMap.containsKey(String.valueOf(sa_promotionid)))) {
+                if ((dbConnect.runSqlQuery("SELECT 1 FROM sa_promotion_auth WHERE if(t2.authmethod=1,not exists(select 1 from sa_promotion_auth where sa_promotionid=t1.sa_promotionid and sys_enterpriseid= "+sys_enterpriseid+"),t1.sys_enterpriseid= "+sys_enterpriseid+") AND siteid='" + siteid + "' AND sa_promotionid='" + sa_promotionid + "'").isEmpty() && !spromotionsaleareaRowsMap.containsKey(String.valueOf(sa_promotionid)))) {
                     return getErrReturnObject().setErrMsg("该促销活动已过期，无法提交").toString();
                 }
             }