gsb

xggsve-order/app/base/service/impl/order/iborderbaseSve.js

@@ -15,7 +15,8 @@ class IborderbaseService extends ServiceBase {
    * 创建基类订单
    * 创建基类订单
    * @param {*} params
    * @param {*} params
    */
    */
-  apiCreateOrder(params) {
+  async apiCreateOrder(params) {
+    this.trimObject(params);
     // if(!params.productType){
     // if(!params.productType){
     //   return system.getResult(null, `参数错误 产品类型错误`);
     //   return system.getResult(null, `参数错误 产品类型错误`);
     // }
     // }
@@ -54,15 +55,15 @@ class IborderbaseService extends ServiceBase {
       params.payType = Number(params.payType || 1);
       params.payType = Number(params.payType || 1);
       params.productType = Number(params.productType || 1);
       params.productType = Number(params.productType || 1);
       params.price = Number(params.price || 0);
       params.price = Number(params.price || 0);
+      var self = this;
       //1 保存基类的信息
       //1 保存基类的信息
       await this.db.transaction(async t => {
       await this.db.transaction(async t => {
-
         //创建基类表
         //创建基类表
-        let _baseOrder = await this.create(params);
-        let childSve = this.getService(params);
+        let _baseOrder = await self.create(params, t);
+        let childSve = self.getService(params);
         //将id 赋值
         //将id 赋值
-        params.id = _baseOrder.raw.id;
-        await childSve.createOrder(params);
+        params.id = _baseOrder.id;
+        await childSve.createOrder(params, t);
       });
       });
       return system.getResultSuccess();
       return system.getResultSuccess();
     } catch (error) {
     } catch (error) {
@@ -74,7 +75,7 @@ class IborderbaseService extends ServiceBase {
    * 完善信息
    * 完善信息
    * @param {*} params
    * @param {*} params
    */
    */
-  async completedOrder(params){
+  async completedOrder(params) {
     //1 检查个体户是否存在
     //1 检查个体户是否存在
 
 
     //2 如果不存在添加保存个体户  
     //2 如果不存在添加保存个体户  

xggsve-order/app/base/service/impl/order/iborderdkSve.js

@@ -2,6 +2,7 @@ const system = require("../../../system");
 const ServiceBase = require("../../sve.base")
 const ServiceBase = require("../../sve.base")
 const settings = require("../../../../config/settings")
 const settings = require("../../../../config/settings")
 const moment = require("moment");
 const moment = require("moment");
+
 class IborderdkService extends ServiceBase {
 class IborderdkService extends ServiceBase {
   constructor() {
   constructor() {
     super("order", ServiceBase.getDaoName(IborderdkService));
     super("order", ServiceBase.getDaoName(IborderdkService));
@@ -16,37 +17,34 @@ class IborderdkService extends ServiceBase {
    * 创建订单
    * 创建订单
    * @param {*} params
    * @param {*} params
    */
    */
-  async createOrder(params){
+  async createOrder(params, t) {
     try {
     try {
-      if(!params.merchantId){
+      if (!params.merchantId) {
         return system.getResult(null, `参数错误 商户ID不能为空`);
         return system.getResult(null, `参数错误 商户ID不能为空`);
       }
       }
-      if(!params.businessmentId){
+      if (!params.businessmentId) {
         return system.getResult(null, `参数错误 个体户ID不能为空`);
         return system.getResult(null, `参数错误 个体户ID不能为空`);
       }
       }
-      if(!params.orderpayId){
+      if (!params.orderpayId) {
         return system.getResult(null, `参数错误 支付ID不能为空`);
         return system.getResult(null, `参数错误 支付ID不能为空`);
       }
       }
-      if(!Number(params.price)<0){
+      if (!Number(params.price) < 0) {
         return system.getResult(null, `参数错误 订单金额格式错误`);
         return system.getResult(null, `参数错误 订单金额格式错误`);
       }
       }
       for (let key in params) {
       for (let key in params) {
-          if(params[key] instanceof String){
+        if (params[key] instanceof String) {
           params[key] = this.trim(params[key]);
           params[key] = this.trim(params[key]);
         }
         }
       }
       }
       let _ibOrderDk = null;
       let _ibOrderDk = null;
-      if(!params.id){
-        _ibOrderDk = await this.create(params);
-      }else{
-        _ibOrderDk = await this.dao.create(params);
-      }
+      _ibOrderDk = await this.dao.create(params, t);
       return system.getResult(_ibOrderDk);
       return system.getResult(_ibOrderDk);
     } catch (error) {
     } catch (error) {
-      return system.getResult(null,`系统错误 错误信息 ${error}`);
+      return system.getResult(null, `系统错误 错误信息 ${error}`);
     }
     }
   }
   }
 }
 }
+
 module.exports = IborderdkService;
 module.exports = IborderdkService;
 // var task=new UserService();
 // var task=new UserService();
 // task.getUserStatisticGroupByApp().then(function(result){
 // task.getUserStatisticGroupByApp().then(function(result){

xggsve-order/app/base/service/sve.base.js

@@ -268,5 +268,17 @@ class ServiceBase {
     }
     }
     return o.toString().trim();
     return o.toString().trim();
   }
   }
+
+  trimObject(o) {
+    if(!o) {
+      return;
+    }
+    for(var k in o) {
+      var v = o[k];
+      if(typeof v === "string") {
+        o[k] = this.trim(v);
+      }
+    }
+  }
 }
 }
 module.exports = ServiceBase;
 module.exports = ServiceBase;