Merge branch 'develop' into develop2

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

@@ -657,7 +657,7 @@ public class promotion extends Controller {
                             .toString();
                 }
                 if(row.getString("type").equals("套餐活动")){
-                    Rows orderRows = dbConnect.runSqlQuery("select * from sa_order  where sa_promotionid="+sa_promotionid+" and siteid='"+siteid+"'");
+                    Rows orderRows = dbConnect.runSqlQuery("select * from sa_order  where sa_promotionid="+sa_promotionid+" and siteid='"+siteid+"' and deleted=0");
                     if(orderRows.isNotEmpty()){
                         return getErrReturnObject().setErrMsg("该方案已存在订单，无法取消发布")
                                 .toString();