gsb

xgg-saas-merchant/app/base/controller/impl/saas/invoiceCtl.js

+var system = require("../../../system")
+const CtlBase = require("../../ctlms.base");
+class InvoiceCtl extends CtlBase {
+  constructor() {
+    super();
+    this.orderSve = system.getObject("service.saas.orderSve");
+    this.tradeSve = system.getObject("service.trade.tradeSve");
+    this.merchantSve = system.getObject("service.trade.tradeSve");
+  }
+
+  // 注册订单列表
+  async orderPage(params, pobj2, req) {
+    try {
+      params.unInvoice = 1;
+      params.handle_statuses = ['20', '30'];
+      this.doTimeCondition(params, ["createBegin", "createEnd"]);
+      return await this.orderSve.page(params);
+    } catch (error) {
+      return system.getResult(null, `系统错误 错误信息 ${error}`);
+    }
+  }
+
+  // 平台交易列表
+  async platformPage(params, pobj2, req) {
+    try {
+      params.unInvoice = 1;
+      params.order_type = "10";
+      params.trade_status = "00";
+      this.doTimeCondition(params, ["createBegin", "createEnd"]);
+      return await this.tradeSve.itemPage(params);
+    } catch (error) {
+      return system.getResult(null, `系统错误 错误信息 ${error}`);
+    }
+  }
+
+  // 商户交易列表
+  async merchantPage(params, pobj2, req) {
+    try {
+      params.unInvoice = 1;
+      params.order_type = "20";
+      params.trade_status = "00";
+      this.doTimeCondition(params, ["createBegin", "createEnd"]);
+      return await this.tradeSve.itemPage(params);
+    } catch (error) {
+      return system.getResult(null, `系统错误 错误信息 ${error}`);
+    }
+  }
+
+  // 商户抬头信息
+  async apply(params, pobj2, req) {
+    try {
+      return await this.orderSve.page(params);
+    } catch (error) {
+      return system.getResult(null, `系统错误 错误信息 ${error}`);
+    }
+  }
+  // 商户交付信息
+  async apply(params, pobj2, req) {
+    try {
+      return await this.orderSve.page(params);
+    } catch (error) {
+      return system.getResult(null, `系统错误 错误信息 ${error}`);
+    }
+  }
+  // 发票申请
+  async apply(params, pobj2, req) {
+    try {
+      return await this.orderSve.page(params);
+    } catch (error) {
+      return system.getResult(null, `系统错误 错误信息 ${error}`);
+    }
+  }
+
+
+}
+module.exports = InvoiceCtl;
\ No newline at end of file

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

@@ -4,7 +4,6 @@ class MerchantCtl extends CtlBase {
   constructor() {
     super();
     this.merchantSve = system.getObject("service.saas.merchantSve");
-    this.merchantuserSve = system.getObject("service.uc.merchantuserSve");
   }
 
   async dics(params, pobj2, req) {
@@ -68,34 +67,5 @@ class MerchantCtl extends CtlBase {
       return system.getResult(null, `系统错误 错误信息 ${error}`);
     }
   }
-
-  async userInfo(params, pobj2, req) {
-    try {
-      let rs = await this.merchantuserSve.info(params);
-      await this.merchantSve.setMerchant([rs.data]);
-      return system.getResultSuccess(rs);
-    } catch (error) {
-      return system.getResult(null, `系统错误 错误信息 ${error}`);
-    }
-  }
-
-  async userSave(params, pobj2, req) {
-    try {
-      return await this.merchantuserSve.save(params);
-    } catch (error) {
-      return system.getResult(null, `系统错误 错误信息 ${error}`);
-    }
-  }
-
-  async userPage(params, pobj2, req) {
-    try {
-      let rs = await this.merchantuserSve.page(params);
-      await this.merchantSve.setMerchant(rs.data.rows);
-      return rs;
-    } catch (error) {
-      return system.getResult(null, `系统错误 错误信息 ${error}`);
-    }
-  }
-
 }
 module.exports = MerchantCtl;
\ No newline at end of file

xgg-saas-merchant/app/base/service/impl/trade/tradeSve.js

@@ -89,6 +89,7 @@ class TradeService extends ServiceBase {
       item_count: itemList.length,
       acc_type: params.acc_type,
       order_file: params.fileUrl,
+      order_type: "10",
       // 付款凭证信息
       pay_voucher: "",
       pay_bank_account: main.bank_account,

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

@@ -181,7 +181,7 @@ class System {
 				merchant: dev + ":3101" + path,
 
 				// 订单服务
-				order: dev + ":3103" + path,
+				order: local + ":3103" + path,
 
 				// 发票服务
 				invoice: dev + ":3105" + path,
@@ -190,10 +190,9 @@ class System {
 				uc: dev + ":3106" + path,
 
 				// 交易
-				trade: dev + ":3107" + path,
+				trade: local + ":3107" + path,
 			}
 		} else {
-			var odomain = "http://123.57.217.203"
 			return {
 				common: "xggsvecommon-service" + path,
 				merchant: "xggsvemerchant-service" + path,