gsb

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

@@ -37,6 +37,9 @@ class ActionAPI extends APIBase {
             case "test":
             case "test":
                 opResult = await this.storderSve.test(action_body);
                 opResult = await this.storderSve.test(action_body);
                 break;
                 break;
+            case "saveOrder":
+                opResult = await this.storderSve.saveOrder(action_body);
+                break;
 
 
             default:
             default:
                 opResult = system.getResult(null, "action_type参数错误");
                 opResult = system.getResult(null, "action_type参数错误");

xggsve-trade/app/base/db/dao.base.js

@@ -10,7 +10,7 @@ class Dao {
   }
   }
 
 
   async preCreate(u) {
   async preCreate(u) {
-    if (!u.id) {
+    if (!u.id && !u.autoIncrement) {
       u.id = await this.redisClient.genrateId(this.modelName);
       u.id = await this.redisClient.genrateId(this.modelName);
     }
     }
     return u;
     return u;
@@ -31,6 +31,23 @@ class Dao {
       });
       });
     }
     }
   }
   }
+
+  async bulkCreate(objs, t) {
+    if (!objs || objs.length == 0) {
+      return;
+    }
+    for (var obj of objs) {
+      if (!obj.id && !obj.autoIncrement) {
+        obj.id = await this.redisClient.genrateId(this.modelName);
+      }
+    }
+    if (t) {
+      return await this.model.bulkCreate(objs, { transaction: t });
+    } else {
+      return await this.model.bulkCreate(objs);
+    }
+  }
+
   static getModelName(ClassObj) {
   static getModelName(ClassObj) {
     return ClassObj["name"].substring(0, ClassObj["name"].lastIndexOf("Dao")).toLowerCase()
     return ClassObj["name"].substring(0, ClassObj["name"].lastIndexOf("Dao")).toLowerCase()
   }
   }

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

@@ -3,9 +3,8 @@ const ServiceBase = require("../../sve.base")
 
 
 class StOrderService extends ServiceBase {
 class StOrderService extends ServiceBase {
   constructor() {
   constructor() {
-    super("deliver", ServiceBase.getDaoName(StOrderService));
-    this.deliveruserDao = system.getObject("db.deliver.deliveruserDao");
-    this.deliverorgDao = system.getObject("db.deliver.deliverorgDao");
+    super("trade", ServiceBase.getDaoName(StOrderService));
+    this.storderitemDao = system.getObject("db.trade.storderitemDao");
   }
   }
 
 
   async test(params) {
   async test(params) {
@@ -39,10 +38,35 @@ class StOrderService extends ServiceBase {
     return system.getResultSuccess(page);
     return system.getResultSuccess(page);
   }
   }
 
 
+  // 保存打款信息
+  async saveOrder(order) {
+    if (!order) {
+      return system.getResult(null, "订单不存在");
+    }
+    let itemList = order.itemList || [];
+
+    if (itemList.length == 0) {
+      return system.getResult(null, "订单明细不存在");
+    }
 
 
+    let self = this;
+    order = await this.db.transaction(async t => {
+      order = await self.dao.create(order, t);
 
 
+      for (let item of itemList) {
+        item.order_id = order.id;
+        item.saas_merchant_id = order.saas_merchant_id;
+        item.out_trade_no = order.out_trade_no;
+        item.saas_id = order.saas_id;
+        item.trade_status = "01";
+      }
+      await self.storderitemDao.bulkCreate(itemList, t);
+      return order;
+    });
+
+    return system.getResultSuccess(order);
+  }
 
 
-  // 解析打款详情 excel
 
 
   // 详情
   // 详情
 
 
@@ -61,17 +85,16 @@ class StOrderService extends ServiceBase {
   // 交易列表页
   // 交易列表页
 
 
 
 
-
   async page(params) {
   async page(params) {
     let currentPage = Number(params.currentPage || 1);
     let currentPage = Number(params.currentPage || 1);
     let pageSize = Number(params.pageSize || 10);
     let pageSize = Number(params.pageSize || 10);
 
 
     let where = {};
     let where = {};
-    if(params.id){
-      where.id=this.trim(params.id);
+    if (params.id) {
+      where.id = this.trim(params.id);
     }
     }
-    if(params.name){
-      where.name=this.trim(params.name);
+    if (params.name) {
+      where.name = this.trim(params.name);
     }
     }
     let orderby = [
     let orderby = [
       ["id", 'desc']
       ["id", 'desc']

xggsve-trade/app/config/localsettings.js

@@ -6,7 +6,7 @@ var settings={
     db:10,
     db:10,
   },
   },
   database:{
   database:{
-    dbname : "xgg-common",
+    dbname : "xgg-trade",
     user: "write",
     user: "write",
     password: "write",
     password: "write",
     config: {
     config: {

xggsve-trade/app/config/settings.js

@@ -21,7 +21,7 @@ var settings = {
   cacheprefix: "sjb",
   cacheprefix: "sjb",
   usertimeout: 3600, //单位秒
   usertimeout: 3600, //单位秒
   basepath: path.normalize(path.join(__dirname, '../..')),
   basepath: path.normalize(path.join(__dirname, '../..')),
-  port: process.env.NODE_PORT || 3102,
+  port: process.env.NODE_PORT || 3107,
   defaultPassWord: "987456",
   defaultPassWord: "987456",
   paasUrl: function () {
   paasUrl: function () {
     if (this.env == "dev") {
     if (this.env == "dev") {