促销订单退回（活动已结束提示退回后无法再次提交）

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

@@ -1754,6 +1754,11 @@ public class Order extends Controller {
         if (!rows.get(0).getString("status").equals("提交")) {
             return getErrReturnObject().setErrMsg("订单非提交状态无法退回").toString();
         }
+        if(rows.get(0).getLong("sa_promotionid")!=0){
+            if (dbConnect.runSqlQuery("SELECT 1 FROM sa_promotion WHERE CURRENT_TIME> enddate AND siteid='" + siteid + "' AND sa_promotionid='" + rows.get(0).getLong("sa_promotionid") + "'").isNotEmpty()) {
+                return getErrReturnObject().setErrMsg("活动已结束，是否确认退回，退回后无法再次提交").toString();
+            }
+        }
         //通过版本更新订单表头数据
         beans.order.Order.updateOrderWithVersion(this);
         Row row = rows.get(0);