ddg

xgg-saas-platform/app/base/controller/impl/saas/merchantCtl.js

@@ -105,7 +105,7 @@ class MerchantCtl extends CtlBase {
    */
    */
   async merchantTitleAddrPage (pobj1, pobj2, req){
   async merchantTitleAddrPage (pobj1, pobj2, req){
     try {
     try {
-      return this.saasmerchantSve.merchantTitleAddrPage(pobj1);
+      return this.merchantSve.merchantTitleAddrPage(pobj1);
     } catch (error) {
     } catch (error) {
       console.log(error);
       console.log(error);
       return system.getResult(null, `系统错误`);
       return system.getResult(null, `系统错误`);
@@ -120,7 +120,7 @@ class MerchantCtl extends CtlBase {
    */
    */
   async queryInvoiceTitleAndAddr(pobj1, pobj2, req){
   async queryInvoiceTitleAndAddr(pobj1, pobj2, req){
     try {
     try {
-      return this.saasmerchantSve.queryInvoiceTitleAndAddr(pobj1);
+      return this.merchantSve.queryInvoiceTitleAndAddr(pobj1);
     } catch (error) {
     } catch (error) {
       console.log(error);
       console.log(error);
       return system.getResult(null, `系统错误`);
       return system.getResult(null, `系统错误`);
@@ -135,7 +135,7 @@ class MerchantCtl extends CtlBase {
    */
    */
   async updateOrSaveTitleAndAddr(pobj1, pobj2, req){
   async updateOrSaveTitleAndAddr(pobj1, pobj2, req){
     try {
     try {
-      return this.saasmerchantSve.updateOrSaveTitleAndAddr(pobj1);
+      return this.merchantSve.updateOrSaveTitleAndAddr(pobj1);
     } catch (error) {
     } catch (error) {
       console.log(error);
       console.log(error);
       return system.getResult(null, `系统错误`);
       return system.getResult(null, `系统错误`);

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

@@ -186,10 +186,10 @@ class System {
         common: dev + ":3102" + path,
         common: dev + ":3102" + path,
 
 
         // 商户服务
         // 商户服务
-        merchant: dev + ":3101" + path,
+        merchant: local + ":3101" + path,
 
 
         // 订单服务
         // 订单服务
-        order: local + ":3103" + path,
+        order: dev + ":3103" + path,
 
 
         // 发票服务
         // 发票服务
         invoice: dev + ":3105" + path,
         invoice: dev + ":3105" + path,
@@ -198,7 +198,7 @@ class System {
         uc: dev + ":3106" + path,
         uc: dev + ":3106" + path,
 
 
         // 交易
         // 交易
-        trade: local + ":3107" + path,
+        trade: dev + ":3107" + path,
       }
       }
     } else {
     } else {
       return {
       return {