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

xggsve-trade/app/base/api/impl/op/action.js

@@ -78,7 +78,10 @@ class ActionAPI extends APIBase {
             case "cancelItemInvoice":
             case "cancelItemInvoice":
                 opResult = await this.storderitemSve.cancelInvoice(action_body);
                 opResult = await this.storderitemSve.cancelInvoice(action_body);
                 break;
                 break;
-
+            case "invoiceTrade":
+                opResult = await this.storderitemSve.invoiceTrade(action_body);
+                break;
+    
 
 
             default:
             default:
                 opResult = system.getResult(null, "action_type参数错误");
                 opResult = system.getResult(null, "action_type参数错误");

xggsve-trade/app/base/db/impl/trade/storderitemDao.js

@@ -180,6 +180,13 @@ class StOrderItemDao extends Dao {
       sql.push("AND saas_invoice_id = ''");
       sql.push("AND saas_invoice_id = ''");
     }
     }
   }
   }
+
+  async  invoiceTrade(id,order_type){
+    let sql = `select * from st_order_item where saas_invoice_id =:id and order_type =:order_type`;
+    return await this.customQuery(sql, {id:id,order_type:order_type});
+  }
+
+
 }
 }
 
 
 module.exports = StOrderItemDao;
 module.exports = StOrderItemDao;

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

@@ -9,7 +9,10 @@ class StOrderItemService extends ServiceBase {
   }
   }
 
 
   async pageByCondition(params) {
   async pageByCondition(params) {
-    let page = {count: 0, rows: []};
+    let page = {
+      count: 0,
+      rows: []
+    };
     params.currentPage = Number(params.currentPage || 1);
     params.currentPage = Number(params.currentPage || 1);
     params.pageSize = Number(params.pageSize || 10);
     params.pageSize = Number(params.pageSize || 10);
     params.startRow = (params.currentPage - 1) * params.pageSize;
     params.startRow = (params.currentPage - 1) * params.pageSize;
@@ -36,7 +39,7 @@ class StOrderItemService extends ServiceBase {
     }
     }
 
 
     let trade_time = params.trade_time;
     let trade_time = params.trade_time;
-    if(!trade_time) {
+    if (!trade_time) {
       return system.getResult(null, "请填写交易时间");
       return system.getResult(null, "请填写交易时间");
     }
     }
 
 
@@ -44,27 +47,35 @@ class StOrderItemService extends ServiceBase {
     if (order.check_status != "05") {
     if (order.check_status != "05") {
       return system.getResult(null, "批次未审核");
       return system.getResult(null, "批次未审核");
     }
     }
-    if(order.trade_mode == "00") {
+    if (order.trade_mode == "00") {
       return system.getResult(null, "批次未触发打款");
       return system.getResult(null, "批次未触发打款");
     }
     }
 
 
-    let itemParams = {ids: item_ids, trade_desc: params.trade_desc, trade_time: params.trade_time};
-    let countParams = {order_id: order.id, trade_status: "00"};
-    let orderParams = {id: order.id};
+    let itemParams = {
+      ids: item_ids,
+      trade_desc: params.trade_desc,
+      trade_time: params.trade_time
+    };
+    let countParams = {
+      order_id: order.id,
+      trade_status: "00"
+    };
+    let orderParams = {
+      id: order.id
+    };
 
 
     let self = this;
     let self = this;
     await this.db.transaction(async t => {
     await this.db.transaction(async t => {
       await self.dao.updateTrade(itemParams, t);
       await self.dao.updateTrade(itemParams, t);
       let count = await self.dao.countItems(countParams, t);
       let count = await self.dao.countItems(countParams, t);
-      if(count == order.item_count) {}
+      if (count == order.item_count) {}
       orderParams.trade_status = count == order.item_count ? "00" : "03";
       orderParams.trade_status = count == order.item_count ? "00" : "03";
       await self.storderDao.update(orderParams, t);
       await self.storderDao.update(orderParams, t);
       return order;
       return order;
     });
     });
     return system.getResultSuccess();
     return system.getResultSuccess();
   }
   }
-  async tradeOnlineCB(params) {
-  }
+  async tradeOnlineCB(params) {}
   async updateInvoice(params) {
   async updateInvoice(params) {
     let rs = await this.dao.updateInvoice(params);
     let rs = await this.dao.updateInvoice(params);
     return system.getResult(rs);
     return system.getResult(rs);
@@ -83,12 +94,29 @@ class StOrderItemService extends ServiceBase {
     let rs = await this.dao.bySaasInvoiceId(params);
     let rs = await this.dao.bySaasInvoiceId(params);
     return system.getResultSuccess(rs);
     return system.getResultSuccess(rs);
   }
   }
-}
 
 
-module.exports = StOrderItemService;
-// var task=new UserService();
-// task.getUserStatisticGroupByApp().then(function(result){
-//   console.log((result));
-// }).catch(function(e){
-//   console.log(e);
-// });
+
+  /**
+   * 根据 invoice_id 和 order_type  查询交易流水
+   * @param {*} params 
+   */
+  async invoiceTrade(params){
+    if(!params.id){
\ No newline at end of file
+      return system.getResult(null, `参数错误 ID不能为空`);
+    }
+    if(!params.order_type){
+      return system.getResult(null,`订单类型不能为空`);
+    }
+    try {
+      let res = await this.dao.invoiceTrade(this.trim(params.id),this.trim(params.order_type)) || [];
+      for(let item of res){
+        this.handleDate(item, ['updated_at', 'created_at'], 'YYYY-MM-DD HH:mm:ss');
+      }          
+      return system.getResult(res);
+    } catch (error) {
+      console.log(error);
+      return system.getResult(null,`系统错误`);
+    }
+  }
+}
+module.exports = StOrderItemService;
\ No newline at end of file