dd

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

@@ -197,13 +197,13 @@ class System {
 				order: local + ":3103" + path,
 				order: local + ":3103" + path,
 
 
 				// 发票服务
 				// 发票服务
-				invoice: dev + ":3105" + path,
+				invoice: local + ":3105" + path,
 
 
 				// 用户服务
 				// 用户服务
 				uc: dev + ":3106" + path,
 				uc: dev + ":3106" + path,
 
 
 				// 交易
 				// 交易
-				trade: dev + ":3107" + path,
+				trade: local + ":3107" + path,
 			}
 			}
 		} else {
 		} else {
 			return {
 			return {

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

@@ -228,19 +228,6 @@ class MerchantApplet extends AppletBase {
     }
     }
   }
   }
 
 
-  //
-  // async commonInfo(gobj, pobj, req, loginUser) {
-  //     var user = await this.bmuserSve.findById(loginUser.id);
-  //     return {
-  //         code : 1,
-  //         data: {
-  //             telphone: "15235755003",
-  //             telphones: ["15235755003","15210210265"],
-  //         }
-  //     };
-  // }
-  //
-  //
 
 
   async idNoValid(gobj, pobj, req, loginUser){
   async idNoValid(gobj, pobj, req, loginUser){
       try {
       try {
@@ -296,25 +283,25 @@ class MerchantApplet extends AppletBase {
     try{
     try{
       let creditCodeArray =await  this.businessmenSve.assorderBusinessmenInfo(pobj2);
       let creditCodeArray =await  this.businessmenSve.assorderBusinessmenInfo(pobj2);
       if(creditCodeArray.status != 0){
       if(creditCodeArray.status != 0){
-        return creditCodeArray;
+        return this.returnSuccess({count:0,rows:[]});
       }
       }
       let creditCodes = [];
       let creditCodes = [];
       for (let val of creditCodeArray.data) {
       for (let val of creditCodeArray.data) {
         creditCodes.push(val.credit_code);
         creditCodes.push(val.credit_code);
       }
       }
       if(!creditCodes || creditCodes.length ==0){
       if(!creditCodes || creditCodes.length ==0){
-        return sys.getResult([]);
+        return this.returnSuccess({count:0,rows:[]});
       }
       }
       pobj2.credit_code_array = creditCodes;
       pobj2.credit_code_array = creditCodes;
       let res = await this.tradeSve.tradeItemBycreditCode(pobj2);
       let res = await this.tradeSve.tradeItemBycreditCode(pobj2);
       if(res.status==0){
       if(res.status==0){
         return this.returnSuccess(res.data);
         return this.returnSuccess(res.data);
       }else{
       }else{
-        this.returnFail("请求超时 请稍后在试");
+        return this.returnFail("请求超时 请稍后在试");
       }
       }
     }catch (e) {
     }catch (e) {
       console.log(e);
       console.log(e);
-      this.returnFail("请求超时 请稍后在试");
+      return this.returnFail("请求超时 请稍后在试");
     }
     }
   }
   }
 
 
@@ -335,14 +322,15 @@ class MerchantApplet extends AppletBase {
     try{
     try{
       let creditCodeArray =await  this.businessmenSve.assorderBusinessmenInfo(pobj2);
       let creditCodeArray =await  this.businessmenSve.assorderBusinessmenInfo(pobj2);
       if(creditCodeArray.status != 0){
       if(creditCodeArray.status != 0){
-        return creditCodeArray;
+        return this.returnSuccess({count:0,rows:[]});
+
       }
       }
       let creditCodes = [];
       let creditCodes = [];
       for (let val of creditCodeArray.data) {
       for (let val of creditCodeArray.data) {
         creditCodes.push(val.credit_code);
         creditCodes.push(val.credit_code);
       }
       }
       if(!creditCodes || creditCodes.length ==0){
       if(!creditCodes || creditCodes.length ==0){
-        return sys.getResult([]);
+        return this.returnSuccess({count:0,rows:[]});
       }
       }
       pobj2.credit_code_array = creditCodes;
       pobj2.credit_code_array = creditCodes;
 
 
@@ -350,7 +338,7 @@ class MerchantApplet extends AppletBase {
       if(res.status==0){
       if(res.status==0){
         return this.returnSuccess(res.data);
         return this.returnSuccess(res.data);
       }else{
       }else{
-        this.returnFail("请求超时 请稍后在试");
+        return this.returnFail("请求超时 请稍后在试");
       }
       }
     }catch (e) {
     }catch (e) {
       console.log(e);
       console.log(e);