返利促销结算时去除删除状态的订单

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

@@ -525,7 +525,7 @@ public class promotion extends Controller {
             agentnum=enterpriserows.get(0).getString("agentnum");
         }
         //查询经销商未关闭的促销订单
-        Rows rows = dbConnect.runSqlQuery("select * from  sa_order where type ='促销订单' and sa_promotionid="+sa_promotionid+" and sys_enterpriseid ='"+sys_enterpriseid+"'  and status not in('关闭','手工关闭') and siteid='"+siteid+"'");
+        Rows rows = dbConnect.runSqlQuery("select * from  sa_order where type ='促销订单' and deleted!=1 and  sa_promotionid="+sa_promotionid+" and sys_enterpriseid ='"+sys_enterpriseid+"'  and status not in('关闭','手工关闭') and siteid='"+siteid+"'");
         if (rows.isNotEmpty()) {
             return getErrReturnObject().setErrMsg("存在未关闭的返利促销订单，无法结算").toString();
         } else {