Skip to content

Z
zhichan
Commit 61b81848 by 王昆
Options

gsb

parent e971208d
Showing with 72 additions and 59 deletions
xgg-saas-merchant/app/base/controller/impl/tax/taxCtl.js
...@@ -2,71 +2,69 @@ var system = require("../../../system") ...@@ -2,71 +2,69 @@ var system = require("../../../system")
const CtlBase = require("../../ctlms.base"); const CtlBase = require("../../ctlms.base");
class TaxCtl extends CtlBase { class TaxCtl extends CtlBase {
constructor() { constructor() {
super(); super();
this.taxSve = system.getObject("service.tax.taxSve"); this.taxSve = system.getObject("service.tax.taxSve");
this.redisClient = system.getObject("util.redisClient"); this.orderSve = system.getObject("service.saas.orderSve");
} this.redisClient = system.getObject("util.redisClient");
}
/** /**
* 月账期 * 月账期
* @param {*} params * @param {*} params
*/ */
async getReportData(params) { async getReportData(params) {
try { try {
let res = await this.taxSve.getReportData(params); let res = await this.taxSve.getReportData(params);
return system.getResult(res); return system.getResult(res);
} catch (error) { } catch (error) {
return system.getResult(null, `系统错误 错误信息 ${error}`); return system.getResult(null, `系统错误 错误信息 ${error}`);
}
} }
}
/** /**
* 季度账期 * 季度账期
* @param {*} params * @param {*} params
*/ */
async getReportDataQuarter(params) { async getReportDataQuarter(params) {
try { try {
let res = await this.taxSve.getReportDataQuarter(params); let res = await this.taxSve.getReportDataQuarter(params);
return system.getResult(res); return system.getResult(res);
} catch (error) { } catch (error) {
return system.getResult(null, `系统错误 错误信息 ${error}`); return system.getResult(null, `系统错误 错误信息 ${error}`);
}
} }
}
/** /**
* 获取账簿用户信息 * 获取账簿用户信息
* @param {*} pobj * @param {*} pobj
* @param {*} pobj2 * @param {*} pobj2
* @param {*} req * @param {*} req
* @id * @id
*/ */
async getCustomerById(pobj, pobj2, req) { async getCustomerById(pobj, pobj2, req) {
try { try {
if (!pobj.id) { if (!pobj.id) {
return system.getResult(null, `参数错误 ID 不能为空`); return system.getResult(null, `参数错误 ID 不能为空`);
} }
let res = await this.taxSve.getCustomerById(pobj); let res = await this.taxSve.getCustomerById(pobj);
return res; return res;
} catch (error) { } catch (error) {
console.log(error); console.log(error);
return system.getResult(error); return system.getResult(error);
}
} }
}
// async businessmenPage(pobj, pobj2, req) { async businessmenPage(pobj, pobj2, req) {
// try { try {
// if (!pobj.id) { let res = await this.orderSve.businessmenPage(pobj);
// return system.getResult(null, `参数错误 ID 不能为空`); return res;
// } } catch (error) {
// let res = await this.taxSve.businessmenPage(pobj); console.log(error);
// return res; return system.getResult(error);
// } catch (error) { }
// console.log(error); }
// return system.getResult(error);
// }
// }
} }
module.exports = TaxCtl; module.exports = TaxCtl;
\ No newline at end of file
xgg-saas-merchant/app/base/service/impl/saas/orderSve.js
...@@ -39,6 +39,19 @@ class OrderService extends ServiceBase { ...@@ -39,6 +39,19 @@ class OrderService extends ServiceBase {
return rs.data || {}; return rs.data || {};
} }
// 交付信息 map by 信用代码
async mapByCreditCodes(params) {
let rs = await this.callms("order", "saasOrderDeliverMapByCreditCodes", params);
if(!rs || !rs.data) {
return {};
}
return rs.data;
}
async businessmenPage(params) {
let rs = await this.callms("order", "saasOrderDeliverBusinessmenPage", params) || {};
return rs;
}
transOrderField(rows) { transOrderField(rows) {
if (!rows || rows.length == 0) { if (!rows || rows.length == 0) {
return; return;
......
xgg-saas-merchant/app/base/service/impl/trade/tradeSve.js
...@@ -9,6 +9,7 @@ class TradeService extends ServiceBase { ...@@ -9,6 +9,7 @@ class TradeService extends ServiceBase {
super(); super();
// this.businessmenSve = system.getObject("service.business.businessmenSve"); // this.businessmenSve = system.getObject("service.business.businessmenSve");
this.merchantSve = system.getObject("service.saas.merchantSve"); this.merchantSve = system.getObject("service.saas.merchantSve");
this.orderSve = system.getObject("service.saas.orderSve");
this.redisClient = system.getObject("util.redisClient"); this.redisClient = system.getObject("util.redisClient");
} }
...@@ -220,7 +221,7 @@ class TradeService extends ServiceBase { ...@@ -220,7 +221,7 @@ class TradeService extends ServiceBase {
for (let data of itemList) { for (let data of itemList) {
creditCodes.push(data.credit_code); creditCodes.push(data.credit_code);
} }
let creditCodeMap = await this.businessmenSve.mapByCreditCodes({creditCodes: creditCodes, attrs: "credit_code"}); let creditCodeMap = await this.orderSve.mapByCreditCodes({creditCodes: creditCodes, attrs: "sve_businessmen_credit_code"});
for (let data of itemList) { for (let data of itemList) {
this.checkField(data, "acc_name", {name: "收款户名", is_require: true, maxLen: 64}); this.checkField(data, "acc_name", {name: "收款户名", is_require: true, maxLen: 64});
let bm = creditCodeMap[data.credit_code]; let bm = creditCodeMap[data.credit_code];
......
xgg-saas-merchant/app/base/system.js
...@@ -181,7 +181,7 @@ class System { ...@@ -181,7 +181,7 @@ class System {
merchant: dev + ":3101" + path, merchant: dev + ":3101" + path,
// 订单服务 // 订单服务
order: dev + ":3103" + path, order: local + ":3103" + path,
// 发票服务 // 发票服务
invoice: dev + ":3105" + path, invoice: dev + ":3105" + path,
......
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