dd

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

@@ -18,6 +18,7 @@ class IborderbaseService extends ServiceBase {
       "1030": this.iborderdzSve, // 代账订单
       "1030": this.iborderdzSve, // 代账订单
       "1040": this.iborderSve,   // 增值服务
       "1040": this.iborderSve,   // 增值服务
     }
     }
+    this.verifyProductType=["1010","1030"];
   }
   }
 
 
 
 
@@ -112,15 +113,10 @@ class IborderbaseService extends ServiceBase {
   async apiHandling(params) {
   async apiHandling(params) {
     try {
     try {
       let _baseOrder = this.dao.findById({id:this.trim(params.id),productType:this.trim(params.productType)});
       let _baseOrder = this.dao.findById({id:this.trim(params.id),productType:this.trim(params.productType)});
-      //1 检查个体户是否签约 
-      let _businessmen = await this.businessmenDao.findById(this.trim(params.businessmenId));
-      if (!_businessmen.signTime) {
-        return system.getResult(null, `个体户未签约`);
-      }
       if(!_baseOrder){
       if(!_baseOrder){
         return system.getResult(null,`参数错误 订单不存在`);
         return system.getResult(null,`参数错误 订单不存在`);
       }
       }
-      if(this.trim(params.productType)=="1010" || this.trim(params.productType)=="1030" ){
+      if(this.verifyProductType.includes(this.trim(params.productType))){
         if(baseorder.isInfoComplete!=1 || baseorder.isInfoComplete!=true){
         if(baseorder.isInfoComplete!=1 || baseorder.isInfoComplete!=true){
           return system.getResult(null,`请先完善信息`);
           return system.getResult(null,`请先完善信息`);
         }
         }
@@ -136,17 +132,6 @@ class IborderbaseService extends ServiceBase {
   }
   }
 
 
   /**
   /**
-   * 
-   * @param {*} params 
-   */
-  async verifySignOrComplete(baseorder){
-    if(baseorder.isInfoComplete!=1 || baseorder.isInfoComplete!=true){
-      return system.getResult(null,`请先完善信息`);
-    }
-  } 
-
-
-  /**
    * 订单列表
    * 订单列表
    * @param {*} params
    * @param {*} params
    * @param {*} params.productType  //产品类型 
    * @param {*} params.productType  //产品类型 
@@ -162,8 +147,7 @@ class IborderbaseService extends ServiceBase {
         if(item.baseInfo && item.baseInfo.productType!="1000"){
         if(item.baseInfo && item.baseInfo.productType!="1000"){
           this.changeStatus(item.baseInfo,item);
           this.changeStatus(item.baseInfo,item);
           this.changePayStatus(item.baseInfo,item);
           this.changePayStatus(item.baseInfo,item);
-        }
-        
+        }    
       }
       }
       return page;
       return page;
     } catch (error) {
     } catch (error) {

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

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

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

@@ -141,8 +141,20 @@ class IborderdzService extends ServiceBase {
    */
    */
   async handing(params) {
   async handing(params) {
     try {
     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 id = Number(params.id);
       let baseOrder = this.iborderbaseDao.findById(id);
       let baseOrder = this.iborderbaseDao.findById(id);
+      //2 检查是否支付
+      if (!baseOrder.payStatus != "20") {
+        return system.getResult(null, `订单未支付`);
+      }
+      if (!baseOrder.isInfoComplete != 1) {
+        return system.getResult(null, `请完善信息再注册`);
+      }
       let order = this.dao.findById(id);
       let order = this.dao.findById(id);
 
 
       baseOrder.status = "1020";
       baseOrder.status = "1020";