gsb

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

@@ -128,63 +128,8 @@ class IborderbaseService extends ServiceBase {
    */
   async completedOrder(params) {
     try {
-<<<<<<< HEAD
       let childSve =this.getService(); 
       return await childSve.completedOrder(params);
-=======
-      //1 检查个体户是否存在 （根据统一社会信用代码查个体工商户是否存在）
-      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.businessmenSve.findBusinessmenByCreditCode(this.trim(params.creditCode));
-      if (_businessmenRes.hasOwnProperty("status")) {
-        return _businessmenRes;
-      }
-      let childSve = this.getService(productType);
-      if (_businessmenRes.id) {
-        //如果用户存在id 直接更新  
-        let _iborderbase = await this.dao.findById(this.trim(params.id));
-        if (!_iborderbase) {
-          return system.getResult(null, `参数错误 订单不存在`);
-        }
-        let self = this;
-        await this.db.transaction(async t => {
-          //更新主表
-          await self.dao.update({businessmen_id: self.trim(_businessmenRes.id), id: self.trim(params.id)}, t);
-          //更新子表
-          await childSve.dao.update(params, null);
-        });
-      } else {
-        let self = this;
-        await this.db.transaction(async t => {
-          //如果不存在id 创建后更新
-          let _businessment = await this.businessmenSve.dao.create(params, t);
-          //更新主表
-          await self.dao.update({businessmen_id: self.trim(_businessment.id), id: self.trim(params.id)}, t);
-          //更新子表
-          await childSve.dao.update(params, null);
-        });
-      }
-      return system.getResultSuccess();
->>>>>>> f5666332088f65a7ad246b1415175ebe3678309f
     } catch (error) {
       return system.getResult(null, `系统错误 错误信息 ${error}`);
     }
@@ -200,18 +145,6 @@ class IborderbaseService extends ServiceBase {
   }
 
   /**
-<<<<<<< HEAD
-=======
-   * 计算 增值税 和 附加税
-   * @param {*} params
-   */
-  async calInvoiceAmount(params) {
-    let res = await this.cal
-  }
-
-
-  /**
->>>>>>> f5666332088f65a7ad246b1415175ebe3678309f
    * 更新base表
    * @param {*} params
    */