gsb

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

@@ -151,20 +151,16 @@ class IborderdkService extends ServiceBase {
    */
   async handling(params) {
     try {
-      //1 检查个体户是否签约 
-      let _businessmen = await this.businessmenDao.findById(this.trim(params.businessmenId));
-      if (!_businessmen.signTime) {
-        return system.getResult(null, `个体户未签约`);
-      }
-      //2 检查是否支付
+
       let _iborderbase = await this.iborderbaseDao.findById(this.trim(params.id));
-      if (!_iborderbase.payStatus != "20") {
-        return system.getResult(null, `订单未支付`);
-      }
       if (!_iborderbase.isInfoComplete != 1) {
         return system.getResult(null, `请完善信息再注册`);
       }
-      //3 判断是按照年付费还是按照月付费
+      //1 检查个体户是否签约
+      let _businessmen = await this.businessmenDao.findById(this.trim(params.businessmenId));
+      if (!_businessmen.signTime) {
+        return system.getResultFail(-2, "个体户未签约",-2);
+      }
       let valueAddedTax = 0;
       let additionalTax = 0;
 

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

@@ -102,7 +102,7 @@ class IborderdzService extends ServiceBase {
           id: self.trim(params.id),
           isInfoComplete: 1
         };
-        if(!_businessmen || !_businessmen.order_id) {
+        if (!_businessmen || !_businessmen.order_id) {
           updateFields.order_id = _iborderbase.id;
         }
         await this.db.transaction(async t => {
@@ -141,20 +141,18 @@ class IborderdzService extends ServiceBase {
    */
   async handing(params) {
     try {
-      //1 检查个体户是否签约 
-      let _businessmen = await this.businessmenDao.findById(this.trim(params.businessmenId));
-      if (!_businessmen.signTime) {
-        return system.getResult(null, `个体户未签约`);
-      }
       let id = Number(params.id);
       let baseOrder = this.iborderbaseDao.findById(id);
-      //2 检查是否支付
-      if (!baseOrder.payStatus != "20") {
-        return system.getResult(null, `订单未支付`);
-      }
       if (!baseOrder.isInfoComplete != 1) {
         return system.getResult(null, `请完善信息再注册`);
       }
+
+      //1 检查个体户是否签约
+      let _businessmen = await this.businessmenDao.findById(this.trim(params.businessmenId));
+      if (!_businessmen.signTime) {
+        return system.getResultFail(-2, "个体户未签约",-2);
+      }
+
       let order = this.dao.findById(id);
 
       baseOrder.status = "1020";