Skip to content

Z
zhichan
Commit cad6fd9d by 王勇飞
Options

gyq

parent b0da6c73
Showing with 180 additions and 125 deletions
tx-fi-tax/app/base/controller/impl/bizchance/fitaxschemeCtl.js
...@@ -23,6 +23,21 @@ class FitaxschemeCtl extends CtlBase { ...@@ -23,6 +23,21 @@ class FitaxschemeCtl extends CtlBase {
return system.getResultError("fitaxschemeCtl/insertInfo 新建方案出错!"); return system.getResultError("fitaxschemeCtl/insertInfo 新建方案出错!");
} }
} }
// async findInfoByBizid(pobj,qobj,req){//方案
// try{
// if (pobj.bizId){
// var res = await this.service.findInfoByBizid(pobj);
// return system.getResult(res);
// }
// else{
// return system.getResultError("缺少方案编号");
// }
// }
// catch(error){
// return system.getResultError(error);
// }
// }
} }
module.exports = FitaxschemeCtl; module.exports = FitaxschemeCtl;
......
tx-fi-tax/app/base/db/dao.base.js
...@@ -16,7 +16,7 @@ class Dao { ...@@ -16,7 +16,7 @@ class Dao {
var u2 = this.preCreate(u); var u2 = this.preCreate(u);
if (t) { if (t) {
console.log(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"); console.log(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>");
//console.log( this.model); console.log( this.model);
return this.model.create(u2, { transaction: t }).then(u => { return this.model.create(u2, { transaction: t }).then(u => {
return u; return u;
}); });
......
tx-fi-tax/app/base/db/impl/bizchance/deliverybillDao.js
...@@ -94,120 +94,120 @@ class DeliverybillDao extends Dao { ...@@ -94,120 +94,120 @@ class DeliverybillDao extends Dao {
return qw; return qw;
} }
async insertInfo(qobj, t) { // async insertInfo(qobj, t) {
var obj = { // var obj = {
"delivery_code": qobj.orderId, // "delivery_code": qobj.orderId,
"product_code": qobj.product_code, // "product_code": qobj.product_code,
"product_name": qobj.product_name, // "product_name": qobj.product_name,
"service_address": qobj.service_address, // "service_address": qobj.area,
"delivery_status": qobj.delivery_status, // "delivery_status": qobj.delivery_status,
"facilitator_id": qobj.facilitator_id, // "facilitator_id": qobj.facilitator_id,
"biz_id": qobj.bizId // "biz_id": qobj.bizId
}; // };
// source_number // // source_number
if (qobj.source_number && qobj.source_number != 'undefined') { // if (qobj.source_number && qobj.source_number != 'undefined') {
obj.source_number = qobj.source_number; // obj.source_number = qobj.source_number;
delete qobj.source_number; // delete qobj.source_number;
} // }
// demand_code // // demand_code
if (qobj.demand_code && qobj.demand_code != 'undefined') { // if (qobj.demand_code && qobj.demand_code != 'undefined') {
obj.demand_code = qobj.demand_code; // obj.demand_code = qobj.demand_code;
delete qobj.demand_code; // delete qobj.demand_code;
} // }
// sku_code // // sku_code
if (qobj.sku_code && qobj.sku_code != 'undefined') { // if (qobj.sku_code && qobj.sku_code != 'undefined') {
obj.sku_code = qobj.sku_code; // obj.sku_code = qobj.sku_code;
delete qobj.sku_code; // delete qobj.sku_code;
} // }
// scheme_number // // scheme_number
if (qobj.solutionBizId && qobj.solutionBizId != 'undefined') { // if (qobj.solutionBizId && qobj.solutionBizId != 'undefined') {
obj.scheme_number = qobj.solutionBizId; // obj.scheme_number = qobj.solutionBizId;
delete qobj.solutionBizId; // delete qobj.solutionBizId;
} // }
// selling_price // // selling_price
if (qobj.selling_price && qobj.selling_price != 'undefined') { // if (qobj.selling_price && qobj.selling_price != 'undefined') {
obj.selling_price = qobj.selling_price; // obj.selling_price = qobj.selling_price;
delete qobj.selling_price; // delete qobj.selling_price;
} // }
// cost_price // // cost_price
if (qobj.cost_price && qobj.cost_price != 'undefined') { // if (qobj.cost_price && qobj.cost_price != 'undefined') {
obj.cost_price = qobj.cost_price; // obj.cost_price = qobj.cost_price;
delete qobj.cost_price; // delete qobj.cost_price;
} // }
// close_reason // // close_reason
if (qobj.close_reason && qobj.close_reason != 'undefined') { // if (qobj.close_reason && qobj.close_reason != 'undefined') {
obj.close_reason = qobj.close_reason; // obj.close_reason = qobj.close_reason;
delete qobj.close_reason; // delete qobj.close_reason;
} // }
// facilitator_name // // facilitator_name
if (qobj.facilitator_name && qobj.facilitator_name != 'undefined') { // if (qobj.facilitator_name && qobj.facilitator_name != 'undefined') {
obj.facilitator_name = qobj.facilitator_name; // obj.facilitator_name = qobj.facilitator_name;
delete qobj.facilitator_name; // delete qobj.facilitator_name;
} // }
// salesman_opcode // // salesman_opcode
if (qobj.salesman_opcode && qobj.salesman_opcode != 'undefined') { // if (qobj.salesman_opcode && qobj.salesman_opcode != 'undefined') {
obj.salesman_opcode = qobj.salesman_opcode; // obj.salesman_opcode = qobj.salesman_opcode;
delete qobj.salesman_opcode; // delete qobj.salesman_opcode;
} // }
// salesman_id // // salesman_id
if (qobj.salesman_id && qobj.salesman_id != 'undefined') { // if (qobj.salesman_id && qobj.salesman_id != 'undefined') {
obj.salesman_id = qobj.salesman_id; // obj.salesman_id = qobj.salesman_id;
delete qobj.salesman_id; // delete qobj.salesman_id;
} // }
// salesman_name // // salesman_name
if (qobj.salesman_name && qobj.salesman_name != 'undefined') { // if (qobj.salesman_name && qobj.salesman_name != 'undefined') {
obj.salesman_name = qobj.salesman_name; // obj.salesman_name = qobj.salesman_name;
delete qobj.salesman_name; // delete qobj.salesman_name;
} // }
// salesman_phone // // salesman_phone
if (qobj.salesman_phone && qobj.salesman_phone != 'undefined') { // if (qobj.salesman_phone && qobj.salesman_phone != 'undefined') {
obj.salesman_phone = qobj.salesman_phone; // obj.salesman_phone = qobj.salesman_phone;
delete qobj.salesman_phone; // delete qobj.salesman_phone;
} // }
// source_name // // source_name
if (qobj.source_name && qobj.source_name != 'undefined') { // if (qobj.source_name && qobj.source_name != 'undefined') {
obj.source_name = qobj.source_name; // obj.source_name = qobj.source_name;
delete qobj.source_name; // delete qobj.source_name;
} // }
// master_source_number // // master_source_number
if (qobj.master_source_number && qobj.master_source_number != 'undefined') { // if (qobj.master_source_number && qobj.master_source_number != 'undefined') {
obj.master_source_number = qobj.master_source_number; // obj.master_source_number = qobj.master_source_number;
delete qobj.master_source_number; // delete qobj.master_source_number;
} // }
// settle_status // // settle_status
if (qobj.settle_status && qobj.settle_status != 'undefined') { // if (qobj.settle_status && qobj.settle_status != 'undefined') {
obj.settle_status = qobj.settle_status; // obj.settle_status = qobj.settle_status;
delete qobj.settle_status; // delete qobj.settle_status;
} // }
// settlebill_id // // settlebill_id
if (qobj.settlebill_id && qobj.settlebill_id != 'undefined') { // if (qobj.settlebill_id && qobj.settlebill_id != 'undefined') {
obj.settlebill_id = qobj.settlebill_id; // obj.settlebill_id = qobj.settlebill_id;
delete qobj.settlebill_id; // delete qobj.settlebill_id;
} // }
// delivery_man_id // // delivery_man_id
if (qobj.delivery_man_id && qobj.delivery_man_id != 'undefined') { // if (qobj.delivery_man_id && qobj.delivery_man_id != 'undefined') {
obj.delivery_man_id = qobj.delivery_man_id; // obj.delivery_man_id = qobj.delivery_man_id;
delete qobj.delivery_man_id; // delete qobj.delivery_man_id;
} // }
// delivery_man_name // // delivery_man_name
if (qobj.delivery_man_name && qobj.delivery_man_name != 'undefined') { // if (qobj.delivery_man_name && qobj.delivery_man_name != 'undefined') {
obj.delivery_man_name = qobj.delivery_man_name; // obj.delivery_man_name = qobj.delivery_man_name;
delete qobj.delivery_man_name; // delete qobj.delivery_man_name;
} // }
// delivery_man_opcode // // delivery_man_opcode
if (qobj.delivery_man_opcode && qobj.delivery_man_opcode != 'undefined') { // if (qobj.delivery_man_opcode && qobj.delivery_man_opcode != 'undefined') {
obj.delivery_man_opcode = qobj.delivery_man_opcode; // obj.delivery_man_opcode = qobj.delivery_man_opcode;
delete qobj.delivery_man_opcode; // delete qobj.delivery_man_opcode;
} // }
delete qobj.orderId; // delete qobj.orderId;
delete qobj.product_code; // delete qobj.product_code;
delete qobj.product_name; // delete qobj.product_name;
delete qobj.service_address; // delete qobj.service_address;
delete qobj.delivery_status; // delete qobj.delivery_status;
delete qobj.facilitator_id; // delete qobj.facilitator_id;
obj.delivery_info = qobj; // obj.delivery_info = qobj;
return await this.create(obj, t); // return await this.create(obj, t);
} // }
async updateServer(qobj, whereobj, t) { async updateServer(qobj, whereobj, t) {
return await this.updateByWhere(qobj, whereobj, t); return await this.updateByWhere(qobj, whereobj, t);
......
tx-fi-tax/app/base/db/impl/bizchance/fitaxschemeDao.js
...@@ -67,5 +67,12 @@ class FitaxschemeDao extends Dao { ...@@ -67,5 +67,12 @@ class FitaxschemeDao extends Dao {
} }
return obj; return obj;
} }
// async findInfoByBizid(qobj){
// let obj = {
// "solution_bizid": qobj.bizId
// }
// return await this.findOne(obj);
// }
} }
module.exports = FitaxschemeDao; module.exports = FitaxschemeDao;
tx-fi-tax/app/base/db/metadata/app/platform.js
...@@ -160,6 +160,33 @@ module.exports = { ...@@ -160,6 +160,33 @@ module.exports = {
"inservice": "已交付", "inservice": "已交付",
"expired": "已到期" "expired": "已到期"
}, },
"bookAreaDict":{//代帐服务地区
"620100":"兰州市" ,
"510100":"成都市" ,
"350100":"福州市" ,
"430100":"长沙市" ,
"130100":"石家庄市" ,
"500100":"重庆市" ,
"330100":"杭州市" ,
"350200":"厦门市" ,
"330300":"温州市" ,
"440100":"广州市" ,
"440300":"深圳市" ,
"410100":"郑州市" ,
"420100":"武汉市" ,
"610100":"西安市" ,
"320100":"南京市" ,
"340100":"合肥市" ,
"330200":"宁波市" ,
"370100":"济南市" ,
"370200":"青岛市" ,
"320500":"苏州市" ,
"120100":"天津市" ,
"210200":"大连市" ,
"520100":"贵阳市" ,
"110100":"北京市" ,
"310100":"上海市" ,
},
"registeredAreaDict": {//注册地区 "registeredAreaDict": {//注册地区
"110100": "北京", "110100": "北京",
......
tx-fi-tax/app/base/service/impl/bizchance/deliverybillSve.js
...@@ -235,12 +235,12 @@ class DeliverybillService extends ServiceBase { ...@@ -235,12 +235,12 @@ class DeliverybillService extends ServiceBase {
} }
async insertInfo(qobj) { // async insertInfo(qobj) {
var self = this; // var self = this;
return self.db.transaction(async function (t) { // return self.db.transaction(async function (t) {
return await self.dao.insertInfo(qobj, t); // return await self.dao.insertInfo(qobj, t);
}); // });
} // }
async updateServer(qobj) { async updateServer(qobj) {
var self = this; var self = this;
...@@ -380,7 +380,7 @@ class DeliverybillService extends ServiceBase { ...@@ -380,7 +380,7 @@ class DeliverybillService extends ServiceBase {
async getInfo(pobj){ async getInfo(pobj){
let result={}; let result={};
let deliveryBillInfo = await this.dao.findByBizId(pobj); let deliveryBillInfo = await this.dao.findByBizId(pobj);
//console.log("gggg"+deliveryBillInfo+pobj.bizId) // console.log("gggg"+deliveryBillInfo+pobj.bizId)
if(!deliveryBillInfo){ if(!deliveryBillInfo){
throw new Error("没有服务信息"); throw new Error("没有服务信息");
} }
......
tx-fi-tax/app/base/service/impl/bizchance/fitaxschemeSve.js
...@@ -18,5 +18,9 @@ class FitaxschemeService extends ServiceBase { ...@@ -18,5 +18,9 @@ class FitaxschemeService extends ServiceBase {
var self = this; var self = this;
return await self.dao.findInfo(qobj); return await self.dao.findInfo(qobj);
} }
// async findInfoByBizid(qobj){
// return await this.dao.findInfoByBizid(qobj);
// }
} }
module.exports = FitaxschemeService; module.exports = FitaxschemeService;
\ No newline at end of file
tx-fi-tax/app/base/system.js
...@@ -220,7 +220,8 @@ class System { ...@@ -220,7 +220,8 @@ class System {
try { try {
ClassObj = require(objabspath); ClassObj = require(objabspath);
} catch (e) { } catch (e) {
// console.log(e) console.log("eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee");
console.log(e);
let fname = objsettings[packageName + "base"]; let fname = objsettings[packageName + "base"];
ClassObj = require(fname); ClassObj = require(fname);
} }
...@@ -402,7 +403,7 @@ System.FLOWCODE = { ...@@ -402,7 +403,7 @@ System.FLOWCODE = {
SCHEME: "SCHEME",//方案表 SCHEME: "SCHEME",//方案表
DELIVERY: "DELIVERY",//服务单表 DELIVERY: "DELIVERY",//服务单表
} }
// 服务名称 // 服务名称c
System.SERVICECODE = { System.SERVICECODE = {
FT: 'bookkeeping' // 财税项目 FT: 'bookkeeping' // 财税项目
} }
......
tx-fi-tax/app/base/utils/execClient.js
...@@ -30,7 +30,7 @@ class ExecClient { ...@@ -30,7 +30,7 @@ class ExecClient {
async execPost(subData, url) { async execPost(subData, url) {
let cmd = this.FetchPostCmd(subData, url); let cmd = this.FetchPostCmd(subData, url);
//console.log("__________________" + cmd); console.log("__________________" + cmd);
var result = await this.exec(cmd); var result = await this.exec(cmd);
return result; return result;
} }
......
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