Merge branch 'develop-green' into develop2

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

@@ -1482,7 +1482,9 @@ public class Order extends Controller {
             if (dbConnect.runSqlQuery("SELECT 1 FROM sa_promotion WHERE CURRENT_TIME> enddate AND siteid='" + siteid + "' AND sa_promotionid='" + sa_promotionid + "'").isNotEmpty()) {
                 return getErrReturnObject().setErrMsg("该促销活动已截止，无法提交").toString();
             }
-
+            if (dbConnect.runSqlQuery("SELECT 1 FROM sa_promotion WHERE status='关闭' AND siteid='" + siteid + "' AND sa_promotionid='" + sa_promotionid + "'").isNotEmpty()) {
+                return getErrReturnObject().setErrMsg("该促销活动已结束，无法提交").toString();
+            }
             Rows promotionRows = dbConnect.runSqlQuery("SELECT isauth FROM sa_promotion WHERE  siteid='" + siteid + "' AND sa_promotionid='" + sa_promotionid + "'");
             if(!promotionRows.get(0).getBoolean("isauth")){
                 SQLFactory sqlFactory = new SQLFactory(this, "促销方案经销商授权区域查询");