gtb

xgg-saas-merchant/app/base/system.js

@@ -197,7 +197,7 @@ class System {
 				order: dev + ":3103" + path,
 				order: dev + ":3103" + path,
 
 
 				// 发票服务
 				// 发票服务
-				invoice: local + ":3105" + path,
+				invoice: dev + ":3105" + path,
 
 
 				// 用户服务
 				// 用户服务
 				uc: dev + ":3106" + path,
 				uc: dev + ":3106" + path,

xgg-saas-merchant/app/base/wxapplet/impl/merchantApplet.js

@@ -271,7 +271,12 @@ class MerchantApplet extends AppletBase {
   async saasorderbusinessmenPage (params, pobj2, req){
   async saasorderbusinessmenPage (params, pobj2, req){
     let loginUser = await this.getLoginUser(pobj2.merchant_id, pobj2.openid);
     let loginUser = await this.getLoginUser(pobj2.merchant_id, pobj2.openid);
     pobj2.merchant_app_user_id = loginUser.id;
     pobj2.merchant_app_user_id = loginUser.id;
-    return await  this.businessmenSve.saasorderbusinessmenPage(pobj2);
+    let res =  await  this.businessmenSve.saasorderbusinessmenPage(pobj2);
+    if(res.status==0){
+      return this.returnSuccess(res.data);
+    }else{
+      this.returnFail("请求超时 请稍后在试");
+    }
   }
   }
 
 
   /**
   /**
@@ -301,10 +306,15 @@ class MerchantApplet extends AppletBase {
         return sys.getResult([]);
         return sys.getResult([]);
       }
       }
       pobj2.credit_code_array = creditCodes;
       pobj2.credit_code_array = creditCodes;
-      return  await this.tradeSve.tradeItemBycreditCode(pobj2);
+      let res = await this.tradeSve.tradeItemBycreditCode(pobj2);
+      if(res.status==0){
+        return this.returnSuccess(res.data);
+      }else{
+        this.returnFail("请求超时 请稍后在试");
+      }
     }catch (e) {
     }catch (e) {
       console.log(e);
       console.log(e);
-      return system.getResult(null, `系统错误`);
+      this.returnFail("请求超时 请稍后在试");
     }
     }
   }
   }
 
 
@@ -335,7 +345,13 @@ class MerchantApplet extends AppletBase {
         return sys.getResult([]);
         return sys.getResult([]);
       }
       }
       pobj2.credit_code_array = creditCodes;
       pobj2.credit_code_array = creditCodes;
-      return  await this.saasInvoiceSve.invoiceBycreditCode(pobj2);
+
+      let res = await this.saasInvoiceSve.invoiceBycreditCode(pobj2);
+      if(res.status==0){
+        return this.returnSuccess(res.data);
+      }else{
+        this.returnFail("请求超时 请稍后在试");
+      }
     }catch (e) {
     }catch (e) {
       console.log(e);
       console.log(e);
       return system.getResult(null,`系统错误`);
       return system.getResult(null,`系统错误`);