dd

xggsve-trade/app/base/service/impl/trade/storderitemSve.js

@@ -137,32 +137,49 @@ class StOrderItemService extends ServiceBase {
     if(!(params.credit_code_array instanceof  Array) && params.credit_code_array.length <0){
       return system.getResult(null, `参数格式错误`);
     }
+
     try{
-      let list =  await this.dao.invoiceTrade(params);
-      for (let item of list) {
-        this.handleDate(item, ["created_at","trade_time"], null);
-        item.amt = system.f2y(item.amt);
-        item.actual_amt = system.f2y(item.actual_amt);
-        item.deduct_amt = system.f2y(item.deduct_amt);
-        item.service_tax = system.f2y(item.service_tax);
-        if(item.order_type == "10"){//00未设置 10平台交易 20商户交易
-          item.order_type_name = "平台交易";
-        }else if(item.order_type=="20"){
-          item.order_type_name = "商户交易";
-        }else{
-          item.order_type_name = "未设置";
-        }
-        if(item.trade_status=="00"){//交易状态 00 成功 01 待处理 02 失败
-          item.trade_status_name = "成功";
-        }else if(item.trade_status=="01"){
-          item.trade_status_name = "待处理";
-        }else if(item.trade_status=="02"){
-          item.trade_status_name = "失败";
-        }else{
-          item.trade_status_name = "";
+      let page = {
+        count: 0,
+        rows: []
+      };
+      params.currentPage = Number(params.currentPage || 1);
+      params.pageSize = Number(params.pageSize || 10);
+      params.startRow = (params.currentPage - 1) * params.pageSize;
+
+      page.count = await this.dao.countByCondition(params);
+      if (page.count == 0) {
+        return system.getResultSuccess(page);
+      }
+
+      page.rows =  await this.dao.invoiceTrade(params);
+      if(page.rows){
+        for (let item of  page.rows) {
+          this.handleDate(item, ["created_at","trade_time"], null);
+          item.amt = system.f2y(item.amt);
+          item.actual_amt = system.f2y(item.actual_amt);
+          item.deduct_amt = system.f2y(item.deduct_amt);
+          item.service_tax = system.f2y(item.service_tax);
+          if(item.order_type == "10"){//00未设置 10平台交易 20商户交易
+            item.order_type_name = "平台交易";
+          }else if(item.order_type=="20"){
+            item.order_type_name = "商户交易";
+          }else{
+            item.order_type_name = "未设置";
+          }
+          if(item.trade_status=="00"){//交易状态 00 成功 01 待处理 02 失败
+            item.trade_status_name = "成功";
+          }else if(item.trade_status=="01"){
+            item.trade_status_name = "待处理";
+          }else if(item.trade_status=="02"){
+            item.trade_status_name = "失败";
+          }else{
+            item.trade_status_name = "";
+          }
         }
       }
-      return system.getResult(list);
+
+      return system.getResult(page);
     }catch (e) {
       console.log(e);
       return system.getResult(null, `系统错误`);