Merge branch 'xgg-saas-merchant' of gitlab.gongsibao.com:jiangyong/zhichan into xgg-saas-merchant

xgg-saas-merchant/.idea/.gitignore

+# Default ignored files
+/workspace.xml
\ No newline at end of file

xgg-saas-merchant/.idea/misc.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="JavaScriptSettings">
+    <option name="languageLevel" value="ES6" />
+  </component>
+</project>
\ No newline at end of file

xgg-saas-merchant/.idea/modules.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/xgg-saas-merchant.iml" filepath="$PROJECT_DIR$/.idea/xgg-saas-merchant.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file

xgg-saas-merchant/.idea/vcs.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
+  </component>
+</project>
\ No newline at end of file

xgg-saas-merchant/.idea/xgg-saas-merchant.iml

+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file

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

@@ -5,7 +5,7 @@ class InvoiceCtl extends CtlBase {
     super();
     this.orderSve = system.getObject("service.saas.orderSve");
     this.tradeSve = system.getObject("service.trade.tradeSve");
-    this.merchantSve = system.getObject("service.trade.tradeSve");
+    this.invoiceSve = system.getObject("service.saas.invoiceSve");
   }
 
   // 注册订单列表
@@ -55,6 +55,14 @@ class InvoiceCtl extends CtlBase {
     }
   }
 
-
+  //发票列表
+  async saasinvoicePage(params, pobj2, req) {
+  try {
+      let rs = await this.invoiceSve.saasinvoicePage(params);
+      return rs;
+    } catch (error) {
+      return system.getResult(null, `系统错误 错误信息 ${error}`);
+    }
+  }
 }
-module.exports = InvoiceCtl;
\ No newline at end of file
+module.exports = InvoiceCtl;

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

@@ -30,7 +30,7 @@ class MerchantCtl extends CtlBase {
       return system.getResult(null, `系统错误 错误信息 ${error}`);
     }
   }
-  
+
   async signPage(params, pobj2, req) {
     try {
       params.is_sign = 1;
@@ -48,7 +48,7 @@ class MerchantCtl extends CtlBase {
       return system.getResult(null, `系统错误 错误信息 ${error}`);
     }
   }
-  
+
   async sign(params, pobj2, req) {
     try {
       params.bm_reg_price = system.y2f(params.bm_reg_price || 0);
@@ -67,5 +67,7 @@ class MerchantCtl extends CtlBase {
       return system.getResult(null, `系统错误 错误信息 ${error}`);
     }
   }
+
+
 }
-module.exports = MerchantCtl;
\ No newline at end of file
+module.exports = MerchantCtl;

xgg-saas-merchant/app/base/service/impl/saas/invoiceSve.js

+const system = require("../../../system");
+const ServiceBase = require("../../svems.base")
+const settings = require("../../../../config/settings")
+class InvoiceService extends ServiceBase {
+    constructor() {
+        super();
+    }
+
+    async saasinvoicePage(params){
+        var rs = await this.callms("invoice", "saasinvoicePage", params);
+        if (rs && rs.data && rs.data.rows) {
+            this.transOrderField(rs.data.rows);
+        }
+        return rs;
+    }
+
+    transOrderField(rows) {
+        if (!rows || rows.length == 0) {
+            return;
+        }
+
+        for (let row of rows) {
+            row.price = system.f2y(row.price);
+        }
+    }
+
+}
+module.exports = InvoiceService;

xgg-saas-merchant/app/base/service/impl/saas/merchantSve.js

@@ -192,4 +192,4 @@ class MerchantService extends ServiceBase {
   }
 
 }
-module.exports = MerchantService;
\ No newline at end of file
+module.exports = MerchantService;

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

@@ -184,7 +184,7 @@ class System {
 				order: local + ":3103" + path,
 
 				// 发票服务
-				invoice: dev + ":3105" + path,
+				invoice: local + ":3105" + path,
 
 				// 用户服务
 				uc: dev + ":3106" + path,
@@ -235,4 +235,4 @@ System.appidFail = 1200;
 System.signFail = 1300;
 //获取访问token失败
 System.getAppInfoFail = 1130;
-module.exports = System;
\ No newline at end of file
+module.exports = System;