Skip to content

Z
zhichan
Commit 70dd4d6a by 王昆
Options

dd

parent d560de0c
Showing with 123 additions and 75 deletions
xgg-saas-merchant/app/base/controller/impl/tax/taxCtl.js
......@@ -2,53 +2,71 @@ var system = require("../../../system")
const CtlBase = require("../../ctlms.base");
class TaxCtl extends CtlBase {
constructor() {
super();
this.taxSve = system.getObject("service.trade.tradeSve");
this.redisClient = system.getObject("util.redisClient");
}
constructor() {
super();
this.taxSve = system.getObject("service.tax.taxSve");
this.redisClient = system.getObject("util.redisClient");
}
/**
* 月账期
* @param {*} params
*/
async getReportData(params) {
try {
let res = await this.taxSve.getReportData(params);
return system.getResult(res);
} catch (error) {
return system.getResult(null, `系统错误 错误信息 ${error}`);
/**
* 月账期
* @param {*} params
*/
async getReportData(params) {
try {
let res = await this.taxSve.getReportData(params);
return system.getResult(res);
} catch (error) {
return system.getResult(null, `系统错误 错误信息 ${error}`);
}
}
}
/**
* 季度账期
* @param {*} params
*/
async getReportDataQuarter(params) {
try {
let res = await this.taxSve.getReportData(params);
return system.getResult(res);
} catch (error) {
return system.getResult(null, `系统错误 错误信息 ${error}`);
/**
* 季度账期
* @param {*} params
*/
async getReportDataQuarter(params) {
try {
let res = await this.taxSve.getReportDataQuarter(params);
return system.getResult(res);
} catch (error) {
return system.getResult(null, `系统错误 错误信息 ${error}`);
}
}
}
/**
* 获取账簿用户信息
* @param {*} pobj
* @param {*} pobj2
* @param {*} req
* @id
*/
async getCustomerById(pobj, pobj2, req){
if(!pobj.id){
return system.getResult(null,`参数错误 ID 不能为空`);
/**
* 获取账簿用户信息
* @param {*} pobj
* @param {*} pobj2
* @param {*} req
* @id
*/
async getCustomerById(pobj, pobj2, req) {
try {
if (!pobj.id) {
return system.getResult(null, `参数错误 ID 不能为空`);
}
let res = await this.taxSve.getCustomerById(pobj);
return res;
} catch (error) {
console.log(error);
return system.getResult(error);
}
}
let res = await this.orderSve.getCustomerById(pobj.invoice_id);
return res;
}
// async businessmenPage(pobj, pobj2, req) {
// try {
// if (!pobj.id) {
// return system.getResult(null, `参数错误 ID 不能为空`);
// }
// let res = await this.taxSve.businessmenPage(pobj);
// return res;
// } catch (error) {
// console.log(error);
// return system.getResult(error);
// }
// }
}
module.exports = TaxCtl;
\ No newline at end of file
xgg-saas-merchant/app/base/service/impl/tax/taxSve.js
const system = require("../../../system");
const ServiceBase = require("../../svems.base")
const settings = require("../../../../config/settings");
const axios = require("axios");
class TaxService extends ServiceBase {
constructor() {
super();
......@@ -12,14 +13,14 @@ class TaxService extends ServiceBase {
async getReportData(params) {
try {
let data ={
"accountPeriod": 202003,
"companyId": 102,
"customerId": 498779,
"desc": "string",
"reportType": 2,
"signWithoutKey": "string"
"accountPeriod": this.trim(params.accountPeriod),
"companyId": this.trim(params.companyId),
"customerId": this.trim(params.customerId),
"desc": this.trim(params.desc) || "string",
"reportType":this.trim(params.reportType) || 2,
"signWithoutKey": this.trim(params.signWithoutKey)|| "string"
}
let url = settings.ntapi().getReportData
let url = settings.ntapi().getReportData;
return await this.callApi(url, data, "月账期");
} catch (error) {
return system.getResult(null, `系统错误 错误信息 ${error}`);
......@@ -33,17 +34,15 @@ class TaxService extends ServiceBase {
async getReportDataQuarter(params) {
try {
let data ={
"companyId": 102,
"customerId": 498779,
"desc": "string",
"endPeriod": 202003,
"reportType": 2,
"signWithoutKey": "string",
"startPeriod": 202001
};
let url = settings.ntapi().getReportDataQuarter
return await this.callApi(url, data, "季度账期");
"accountPeriod": this.trim(params.accountPeriod),
"companyId": this.trim(params.companyId),
"customerId": this.trim(params.customerId),
"desc": this.trim(params.desc) || "string",
"reportType":this.trim(params.reportType) || 2,
"signWithoutKey": this.trim(params.signWithoutKey)|| "string"
}
let url = settings.ntapi().getReportDataQuarter;
return await this.callApi(url, params, "季度账期");
} catch (error) {
return system.getResult(null, `系统错误 错误信息 ${error}`);
}
......@@ -56,25 +55,17 @@ class TaxService extends ServiceBase {
*/
async getCustomerById(params) {
try {
//
// let res = await axios({
// method: 'post',
// url: url,
// data: settings.deliverSysApi().orderPushApi
// });
// console.log(res.data);
if(res.status == 200 && res.data && res.data.status == 0 && res.data.data) {
await this.updateOrder({id: id, deliver_order_id: res.data.data.id});
}
let businessmen = await this.callms("order", "queryObusinessmen", {
id: params.id
let businessmen = await axios({
method: 'post',
url: settings.deliverSysApi().info,
data: {id: params.id}
});
if (!businessmen || !businessmen.data) {
if (businessmen.status=!200 || businessmen.data.status!=0 || !businessmen.data.data.customer_id) {
return system.getResult(null, `个体工商户不存在`);
}
let url = settings.ntapi().getCustomerById;
let res = await this.callApi(url, {
id: businessmen.customer_id
id: businessmen.data.data.customer_id
}, "获取用户账簿信息");
return res;
} catch (error) {
......@@ -82,5 +73,37 @@ class TaxService extends ServiceBase {
return system.getResult(null, `系统错误`);
}
}
/**
* 获取工商户列表
* @param {*} params
*/
// async businessmenPage(params) {
// try {
// let businessmen = await axios({
// method: 'post',
// url: settings.deliverSysApi().businessmenPage,
// data: {id: params.id}
// });
// if (businessmen.status=!200 || businessmen.data.status!=0 ) {
// return system.getResult(null, `系统错误`);
// }
// let url = settings.ntapi().getCustomerById;
// let res = await this.callApi(url, {
// id: businessmen.data.data.customer_id
// }, "获取用户账簿信息");
// return res;
// } catch (error) {
// console.log(error);
// return system.getResult(null, `系统错误`);
// }
// }
}
module.exports = TaxService;
\ No newline at end of file
xgg-saas-merchant/app/base/system.js
......@@ -182,8 +182,8 @@ class System {
// merchant: "http://127.0.0.1:3101" + path,
// 订单服务
order: dev + ":3103" + path,
// order: "http://127.0.0.1:3103" + path,
// order: dev + ":3103" + path,
order: "http://127.0.0.1:3103" + path,
// 发票服务
invoice: dev + ":3105" + path,
......
xgg-saas-merchant/app/config/settings.js
......@@ -128,13 +128,18 @@ var settings = {
deliverSysApi: function () {
let domain = "";
if (this.env == "dev") {
domain = "http://39.107.234.14:3002";
// domain = "http://39.107.234.14:3002";
domain = "http://127.0.0.1:3002";
} else {
domain = "https://xggadmin.gongsibao.com";
}
return {
// 推送订单s
orderPushApi: domain + "/web/order/orderCtl/addSourceOrder",
// 获取个体工商户信息
info: domain + "/web/business/businessmenCtl/info",
//获取工商户列表
businessmenPage:"/web/business/businessmenCtl/businessmenPage",
}
},
redis: function () {
......
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