d

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

@@ -50,7 +50,12 @@ class SaasOrderDao extends Dao {
     if(params.attribute && params.value){
       sql.push(`AND t1.${params.attribute} = :value`);
     }
-
+    if(params.handle_attribute && params.handle_attribute_value){
+      sql.push(`AND t1.${params.handle_attribute} = :handle_attribute_value`);
+    }
+    if(params.pay_attribute && params.pay_attribute_value){
+      sql.push(`AND t1.${params.pay_attribute} = :pay_attribute_value`);
+    }
     if (params.saas_id) {
       sql.push("AND t1.saas_id = :saas_id");
     }

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

@@ -358,8 +358,18 @@ class SaasOrderService extends ServiceBase {
     }else if(params.order_type == "2010" || params.order_type =="2030"){
       params.attribute = "audit_status";
       params.value = params.order_type =="2010"?"10":"30";
-    }else if(params.order_type =="2030" || params.order_type == "3020" ||  params.order_type =="3030"||  params.order_type =="3010"  ){
+      params.pay_attribute = 'pay_status';
+      params.pay_attribute_value = "20";
+    }else if( params.order_type == "3020" ||  params.order_type =="3030"||  params.order_type =="3010"  ){
       params.attribute = "handle_status";
+
+      params.handle_attribute = 'audit_status';
+      params.handle_attribute_value = "20";
+
+      params.pay_attribute = 'pay_status';
+      params.pay_attribute_value = "20";
+
+
       if(params.order_type == "3010"){
         params.value = "10";
       }else if(params.order_type == "3020"){
@@ -402,23 +412,23 @@ class SaasOrderService extends ServiceBase {
       }
 
       // 10待审核 20审核通过 30审核驳回
-      if (row.audit_status != "20") {
+      if (row.audit_status != "20" ) {
         row.status = row.audit_status == "10" ? "2010" : "2030";
         row.status_name = row.audit_status == "10" ? "待审核" : "审核驳回";
         continue;
       }
-
       // 审核状态
-      if (row.handle_status == "10") {
+      if (row.handle_status == "10" ) {
         row.status = "3010";
         row.status_name = "业务办理中";
-      } else if (row.handle_status == "20") {
+      } else if (row.handle_status == "20" ) {
         row.status = "3020";
         row.status_name = "待交付";
       } else if (row.handle_status == "30") {
         row.status = "3030";
         row.status_name = "已交付";
       }
+
     }
 
   }