Commit b762da0f by zhaoxiqing

gsb

parent d008e4e2
# Default ignored files
/workspace.xml
\ No newline at end of file
<?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
<?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
<?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
<?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
......@@ -31,7 +31,7 @@ class MerchantCtl extends CtlBase {
return system.getResult(null, `系统错误 错误信息 ${error}`);
}
}
async signPage(params, pobj2, req) {
try {
params.is_sign = 1;
......@@ -49,7 +49,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);
......@@ -97,5 +97,14 @@ class MerchantCtl extends CtlBase {
}
}
async saasinvoicePage(params, pobj2, req) {
try {
let rs = await this.merchantSve.saasinvoicePage(params);
return rs;
} catch (error) {
return system.getResult(null, `系统错误 错误信息 ${error}`);
}
}
}
module.exports = MerchantCtl;
\ No newline at end of file
module.exports = MerchantCtl;
......@@ -169,5 +169,10 @@ class MerchantService extends ServiceBase {
}
}
async saasinvoicePage(params){
var rs = await this.callms("invoice", "saasinvoicePage", params);
return rs;
}
}
module.exports = MerchantService;
\ No newline at end of file
module.exports = MerchantService;
......@@ -171,8 +171,8 @@ class System {
var path = "/api/op/action/springboard";
if (settings.env == "dev") {
// var domain = "http://192.168.18.237";
let local = "http://127.0.0.1";
let dev = "http://39.107.234.14";
let dev = "http://127.0.0.1";
//let dev = "http://39.107.234.14";
return {
// 公共服务
common: dev + ":3102" + path,
......@@ -236,4 +236,4 @@ System.appidFail = 1200;
System.signFail = 1300;
//获取访问token失败
System.getAppInfoFail = 1130;
module.exports = System;
\ No newline at end of file
module.exports = System;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment