gsb

xggsve-order/app/base/db/models/order/iborderbase.js

@@ -18,7 +18,7 @@ module.exports = (db, DataTypes) => {
       type: DataTypes.BOOLEAN,
       type: DataTypes.BOOLEAN,
       defaultValue: false
       defaultValue: false
     },
     },
-    payType:DataTypes.INTEGER,field: 'pay_type',comment:'付款方式 10 按照次付费 20 按照年付费'
+    payType:{type: DataTypes.INTEGER, field: 'pay_type',comment:'付款方式 10 按照次付费 20 按照年付费'},
   }, {
   }, {
     paranoid: true, //假的删除
     paranoid: true, //假的删除
     underscored: true,
     underscored: true,

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

@@ -97,7 +97,8 @@ class IborderbaseService extends ServiceBase {
    */
    */
   async apiCompletedOrder(params) {
   async apiCompletedOrder(params) {
     try {
     try {
-      let childSve = this.getService(this.trim(params.productType));
+      let baseorder = await this.dao.findById(params.id);
+      let childSve = this.getService(baseorder.productType);
       return await childSve.completedOrder(params);
       return await childSve.completedOrder(params);
     } catch (error) {
     } catch (error) {
       return system.getResult(null, `系统错误 错误信息 ${error}`);
       return system.getResult(null, `系统错误 错误信息 ${error}`);

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

@@ -67,48 +67,68 @@ class IborderdzService extends ServiceBase {
     try {
     try {
       //1 检查个体户是否存在 （根据统一社会信用代码查个体工商户是否存在）
       //1 检查个体户是否存在 （根据统一社会信用代码查个体工商户是否存在）
       this.trimObject(params);
       this.trimObject(params);
-      if (!params.id) { return system.getResult(null, `参数错误 ID 不能为空`); }
-      if (!params.legalName) { return system.getResult(null, `参数错误 法人姓名不能为空`); }
-      if (!params.legalMobile) { return system.getResult(null, `参数错误 法人电话不能为空`); }
-      if (!params.creditCode) { return system.getResult(null, `参数错误 法人统一社会信用代码不能为空`); }
-      if (!params.names) { return system.getResult(null, `参数错误 个体户名称不能为空`); }
-      if (!params.businessScope) { return system.getResult(null, `参数错误 经营范围不能为空`); }
-
-      //2 如果不存在添加保存个体户  完善信息
-      let _businessmenRes = await this.businessmenDao.findBusinessmenByCreditCode(this.trim(params.creditCode));
-      if (_businessmenRes.hasOwnProperty("status")) {
-        return _businessmenRes;
+      if (!params.id) {
+        return system.getResult(null, `参数错误 ID 不能为空`);
+      }
+      if (!params.legalName) {
+        return system.getResult(null, `参数错误 法人姓名不能为空`);
+      }
+      if (!params.legalMobile) {
+        return system.getResult(null, `参数错误 法人电话不能为空`);
       }
       }
-      if (_businessmenRes.id) {
-        //如果用户存在id 直接更新
+      if (!params.creditCode) {
+        return system.getResult(null, `参数错误 法人统一社会信用代码不能为空`);
+      }
+      if (!params.names) {
+        return system.getResult(null, `参数错误 个体户名称不能为空`);
+      }
+      if (!params.businessScope) {
+        return system.getResult(null, `参数错误 经营范围不能为空`);
+      }
+      params.order_id = params.id;
+      //2 如果不存在添加保存个体户  完善信息
+      let _businessmen = await this.businessmenDao.findOne({creditCode: this.trim(params.creditCode)});
+      if (_businessmen) {
+        //如果用户存在 直接更新
         let _iborderbase = await this.iborderbaseDao.findById(this.trim(params.id));
         let _iborderbase = await this.iborderbaseDao.findById(this.trim(params.id));
         if (!_iborderbase) {
         if (!_iborderbase) {
           return system.getResult(null, `参数错误 订单不存在`);
           return system.getResult(null, `参数错误 订单不存在`);
         }
         }
         let self = this;
         let self = this;
         //向参数中添加 是否完善信息标识
         //向参数中添加 是否完善信息标识
-        params.isInfoComplete=1;
+        params.isInfoComplete = 1;
+        var updateFields = {
+          businessmen_id: self.trim(_businessmen.id),
+          id: self.trim(params.id),
+          isInfoComplete: 1
+        };
+        if(!_businessmen || !_businessmen.order_id) {
+          updateFields.order_id = _iborderbase.id;
+        }
         await this.db.transaction(async t => {
         await this.db.transaction(async t => {
           //更新主表
           //更新主表
-          await self.iborderbaseDao.update({ businessmen_id: self.trim(_businessmenRes.id),
-            id: self.trim(params.id),isInfoComplete:1 }, t);
+          await self.iborderbaseDao.update(updateFields, t);
           //更新子表
           //更新子表
           await this.dao.update(params, t);
           await this.dao.update(params, t);
         });
         });
       } else {
       } else {
+        delete params.id;
         let self = this;
         let self = this;
         await this.db.transaction(async t => {
         await this.db.transaction(async t => {
           //如果不存在id 创建后更新
           //如果不存在id 创建后更新
           let _businessment = await this.businessmenDao.create(params, t);
           let _businessment = await this.businessmenDao.create(params, t);
           //更新主表
           //更新主表
-          await self.iborderbaseDao.update({ businessmen_id: self.trim(_businessment.id), id: self.trim(params.id),
-            isInfoComplete:1 }, t);
+          await self.iborderbaseDao.update({
+            businessmen_id: self.trim(_businessment.id), id: self.trim(params.id),
+            isInfoComplete: 1
+          }, t);
           //更新子表
           //更新子表
           await this.dao.update(params, t);
           await this.dao.update(params, t);
         });
         });
       }
       }
       return system.getResultSuccess();
       return system.getResultSuccess();
     } catch (error) {
     } catch (error) {
+      console.log(error);
       return system.getResult(null, `系统错误 错误信息 ${error}`);
       return system.getResult(null, `系统错误 错误信息 ${error}`);
     }
     }
   }
   }