dd

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

@@ -111,12 +111,41 @@ 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)});
+      //1 检查个体户是否签约 
+      let _businessmen = await this.businessmenDao.findById(this.trim(params.businessmenId));
+      if (!_businessmen.signTime) {
+        return system.getResult(null, `个体户未签约`);
+      }
+      if(!_baseOrder){
+        return system.getResult(null,`参数错误 订单不存在`);
+      }
+      if(this.trim(params.productType)=="1010" || this.trim(params.productType)=="1030" ){
+        if(baseorder.isInfoComplete!=1 || baseorder.isInfoComplete!=true){
+          return system.getResult(null,`请先完善信息`);
+        }
+        if(baseorder.isInfoComplete!=1 || baseorder.isInfoComplete!=true){
+          return system.getResult(null,`请先完善信息`);
+        }
+      }
       let childSve = this.getService(params.productType);
       let childSve = this.getService(params.productType);
       return await childSve.handling(params);
       return await childSve.handling(params);
     } catch (error) {
     } catch (error) {
       return system.getResult(null, `系统错误 错误信息 ${error}`);
       return system.getResult(null, `系统错误 错误信息 ${error}`);
     }
     }
   }
   }
+
+  /**
+   * 
+   * @param {*} params 
+   */
+  async verifySignOrComplete(baseorder){
+    if(baseorder.isInfoComplete!=1 || baseorder.isInfoComplete!=true){
+      return system.getResult(null,`请先完善信息`);
+    }
+  } 
+
+
   /**
   /**
    * 订单列表
    * 订单列表
    * @param {*} params
    * @param {*} params

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

@@ -151,11 +151,7 @@ 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") {

xggsve-order/app/front/entry/public/apidoc/order/orderbase.md

@@ -77,7 +77,7 @@
 ```
 ```
 
 
 
 
-## **<a name="completedOrder"> 完善信息接口</a>**
+## **<a name="orders"> 订单列表</a>**
 [返回到目录](#menu)
 [返回到目录](#menu)
 #### 参数格式  `JSON`
 #### 参数格式  `JSON`
 #### HTTP请求方式 `POST`
 #### HTTP请求方式 `POST`