Merge branch 'xggsve-order' of gitlab.gongsibao.com:jiangyong/zhichan into xggsve-order

xggsve-order/app/base/db/impl/saas/saasorderDao.js

@@ -68,6 +68,10 @@ class SaasOrderDao extends Dao {
       sql.push("AND t1.handle_status = :handle_status");
       sql.push("AND t1.handle_status = :handle_status");
     }
     }
 
 
+    if (params.handle_statuses) {
+      sql.push("AND t1.handle_status IN (:handle_statuses) ");
+    }
+
     if (params.saas_merchant_id) {
     if (params.saas_merchant_id) {
       sql.push("AND t1.merchant_id = :saas_merchant_id");
       sql.push("AND t1.merchant_id = :saas_merchant_id");
     }
     }
@@ -87,6 +91,9 @@ class SaasOrderDao extends Dao {
       sql.push("AND t2.legal_idno = :legal_idno");
       sql.push("AND t2.legal_idno = :legal_idno");
     }
     }
 
 
+    if (params.unInvoice) {
+      sql.push("AND t1.saas_invoice_id = ''");
+    }
   }
   }
 
 
   async mapByIds(ids, attrs) {
   async mapByIds(ids, attrs) {

xggsve-order/app/base/service/impl/saas/saasorderSve.js

@@ -513,7 +513,6 @@ class SaasOrderService extends ServiceBase {
       await self.saasorderpayDao.create(_pay, t);
       await self.saasorderpayDao.create(_pay, t);
       return 1;
       return 1;
     });
     });
-
   }
   }
 
 
   async mapByCreditCodes(params) {
   async mapByCreditCodes(params) {
@@ -521,7 +520,6 @@ class SaasOrderService extends ServiceBase {
     return system.getResultSuccess(rs);
     return system.getResultSuccess(rs);
   }
   }
 
 
-
   async businessmenPage(params) {
   async businessmenPage(params) {
     let page = {
     let page = {
       count: 0,
       count: 0,