Skip to content

Z
zhichan
Commit b8c3a50b by 王勇飞
Options

Merge branch 'tx-fi-tax' of gitlab.gongsibao.com:jiangyong/zhichan into tx-fi-tax

parents 9373bb5d 07446d4b
Showing with 107 additions and 182 deletions
tx-fi-tax/app/base/controller/impl/bizchance/deliverybillCtl.js
...@@ -145,10 +145,9 @@ class DeliverybillCtl extends CtlBase { ...@@ -145,10 +145,9 @@ class DeliverybillCtl extends CtlBase {
} }
// 创建融易算服务实例 // 创建融易算服务实例
async insertInfo(obj, qobj, req) { async insertInfo(mobj, qobj, req) {
console.log("GGGGGGG----------------------------------------------" + JSON.stringify(obj));
try { try {
var pobj = obj.actionBody.messageBody; var pobj = mobj.actionBody.messageBody;
var cachestr = sha235(JSON.stringify(pobj)); var cachestr = sha235(JSON.stringify(pobj));
var cacheInfo = await this.cacheManager["TxCache"].getCache(cachestr); var cacheInfo = await this.cacheManager["TxCache"].getCache(cachestr);
if (cacheInfo && cacheInfo != 'undefined') { if (cacheInfo && cacheInfo != 'undefined') {
...@@ -158,31 +157,36 @@ class DeliverybillCtl extends CtlBase { ...@@ -158,31 +157,36 @@ class DeliverybillCtl extends CtlBase {
"data": "", "data": "",
"requestId": "" "requestId": ""
} }
} }
else { else {
pobj.orderId = pobj.orderId + "_book"; var obj = {};
pobj.contactsPhone = pobj.contactsMobile; obj.delivery_code = pobj.orderId + "_book";
pobj.product_code = "bookkeeping"; obj.source_number = "tx";
pobj.product_name = "代帐服务"; if (pobj.solutionBizId) {
pobj.delivery_status = "received"; obj.scheme_number = pobj.solutionBizId;
pobj.facilitator_id = "10"; var scheme = await this.fitaxschemeService.findInfoByBizid({ "bizId": pobj.solutionBizId });
pobj.facilitator_name = "公司宝"; if (scheme) {
pobj.source_number = "tx";
pobj.source_name = "tencentCloud";
pobj.taxpayerName = pobj.taxpayerType;
if (pobj.taxpayerType == 1){
pobj.taxpayerType = "generalTaxpayer";
}
else if (pobj.taxpayerType == 2){
pobj.taxpayerType = "smallScaleTaxpayer";
}
if (pobj.solutionBizId){
var scheme = await this.fitaxschemeService.findInfoByBizid({"bizId":pobj.solutionBizId});
if (scheme){
pobj.demand_code = scheme.demand_code; pobj.demand_code = scheme.demand_code;
} }
} }
var buInfo = await this.service.insertInfo(pobj); obj.product_code = "bookkeeping";
obj.product_name = "代帐服务";
obj.service_address = pobj.area;
obj.delivery_status = "received";
obj.facilitator_id = "10";
obj.facilitator_name = "公司宝";
obj.source_name = "tencentCloud";
pobj.contactsPhone = pobj.contactMobile;
delete pobj.contactMobile;
// if (pobj.taxpayerType == 1) {
// pobj.taxpayerName = "generalTaxpayer";
// }
// else if (pobj.taxpayerType == 2) {
// pobj.taxpayerName = "smallScaleTaxpayer";
// }
obj.delivery_info = pobj;
obj.biz_id = pobj.bizId;
var buInfo = await this.service.insertInfo(obj);
if (buInfo) { if (buInfo) {
await this.cacheManager["TxCache"].cache(cachestr, JSON.stringify({ cachestr: cachestr }), 180);//插入redis缓存 await this.cacheManager["TxCache"].cache(cachestr, JSON.stringify({ cachestr: cachestr }), 180);//插入redis缓存
return { return {
...@@ -191,7 +195,7 @@ class DeliverybillCtl extends CtlBase { ...@@ -191,7 +195,7 @@ class DeliverybillCtl extends CtlBase {
"data": buInfo, "data": buInfo,
"requestId": "" "requestId": ""
} }
} }
else { else {
return system.getResultFail(buInfo); return system.getResultFail(buInfo);
} }
...@@ -203,12 +207,11 @@ class DeliverybillCtl extends CtlBase { ...@@ -203,12 +207,11 @@ class DeliverybillCtl extends CtlBase {
} }
//更新融易算服务实例 //更新融易算服务实例
async updateServer(obj, qobj, req) { async updateServer(mobj, qobj, req) {
try { try {
var pobj = obj.actionBody.messageBody; var pobj = mobj.actionBody.messageBody;
var cachestr = sha235(JSON.stringify(pobj)); var cachestr = sha235(JSON.stringify(pobj));
var cacheInfo = await this.cacheManager["TxCache"].getCache(cachestr); var cacheInfo = await this.cacheManager["TxCache"].getCache(cachestr);
var cacheInfo;
if (cacheInfo && cacheInfo != 'undefined') { if (cacheInfo && cacheInfo != 'undefined') {
return { return {
"status": 1, //1代表成功，否则失败 "status": 1, //1代表成功，否则失败
...@@ -217,31 +220,22 @@ class DeliverybillCtl extends CtlBase { ...@@ -217,31 +220,22 @@ class DeliverybillCtl extends CtlBase {
"requestId": "" "requestId": ""
} }
} else { } else {
if (!pobj.requestId || pobj.requestId == 'undefined') { if (pobj.contactMobile && pobj.contactMobile != 'undefined') {
throw new Error("requestId 不能为空"); pobj.contactsPhone = pobj.contactMobile;
} delete pobj.contactMobile;
if (!pobj.bizId || pobj.bizId == 'undefined') {
throw new Error("bizId 不能为空");
}
if (!pobj.orderId || pobj.orderId == 'undefined') {
throw new Error("orderId 不能为空");
} }
if (!pobj.topOrgCode || pobj.topOrgCode == 'undefined') { pobj.contactsName = pobj.contactName;
throw new Error("topOrgCode 不能为空"); delete pobj.contactName;
} pobj.companyType = pobj.companyBizType;
if (!pobj.companyName || pobj.companyName == 'undefined') { delete pobj.companyBizType;
throw new Error("companyName 不能为空"); pobj.creditCode = pobj.uscc;
} delete pobj.uscc;
if (!pobj.contactName || pobj.contactName == 'undefined') { obj = {
throw new Error("contactName 不能为空"); "delivery_code": pobj.orderId + "_book",
} "delivery_info": pobj,
if (!pobj.companyBizType || pobj.companyBizType == 'undefined') { "biz_id": pobj.bizId
throw new Error("companyBizType 不能为空"); };
} const rs = await this.service.updateServer(obj);
if (!pobj.uscc || pobj.uscc == 'undefined') {
throw new Error("uscc 不能为空");
}
const rs = await this.service.updateServer(pobj);
if (rs) { if (rs) {
await this.cacheManager["TxCache"].cache(cachestr, JSON.stringify({ cachestr: cachestr }), 180);//插入redis缓存 await this.cacheManager["TxCache"].cache(cachestr, JSON.stringify({ cachestr: cachestr }), 180);//插入redis缓存
return { return {
...@@ -284,23 +278,41 @@ module.exports = DeliverybillCtl; ...@@ -284,23 +278,41 @@ module.exports = DeliverybillCtl;
// "actionType": "insertInfo", // "actionType": "insertInfo",
// "identifyCode": "book-manage", // "identifyCode": "book-manage",
// "messageBody": { // "messageBody": {
// "requestId": "825da0a74432-738f-4bed-b48d-d51aa808", // "requestId": "825da0a74432-738f-4bed-468d-d51aa880",
// "bizId": "5892748825", // "bizId": "2292748809",
// "contactsPhone": "18510669321", // "userId": "24173452443103825",
// "userId": "10973452443103825", // "orderId": "235184456620496",
// "orderId": "341184456620496_book",
// "areatype": "city", // "areatype": "city",
// "area": "100010", // "area": "100010",
// "topOrgCode": "rong_yi_suan", // "topOrgCode": "rong_yi_suan",
// "taxpayerType": 1, // "taxpayerType": 1,
// "product_code": "bookkeeping", // "contactMobile": "18510669321"
// "product_name": "代账服务",
// "service_address": "110100",
// "delivery_status": "waituserconfirm",
// "facilitator_id": "10"
// } // }
// } // }
// } // }
// task.insertInfo(obj, {}, {}).then(d => { // task.insertInfo(obj, {}, {}).then(d => {
// console.log(JSON.stringify(d)); // console.log(JSON.stringify(d));
// }) // })
// var obj = {
// "actionType": "produceData",
// "actionBody": {
// "pushUrl": "http://ic.com:8000/web/bizchance/deliverybillCtl",
// "actionType": "insertInfo",
// "identifyCode": "book-manage",
// "messageBody": {
// "requestId": "825da0a74432-738f-4bed-468d-d51aa880",
// "bizId": "2292748809",
// "orderId": "235184456620496",
// "companyName": "北京融易算",
// "contactName": "JAMES7",
// "taxpayerType": 5,
// "contactMobile": "18510669367",
// "companyBizType": 1,
// "uscc": "911101053516460817K"
// }
// }
// }
// task.updateServer(obj, {}, {}).then(d => {
// console.log(JSON.stringify(d));
// })
tx-fi-tax/app/base/db/impl/bizchance/deliverybillDao.js
...@@ -90,139 +90,44 @@ class DeliverybillDao extends Dao { ...@@ -90,139 +90,44 @@ class DeliverybillDao extends Dao {
delete qc.where.deliveryNumber; delete qc.where.deliveryNumber;
} }
if (qc.where.deliveryStatus) {
filters.push({
delivery_status: qc.where.deliveryStatus
});
delete qc.where.deliveryStatus;
}
if (qc.where.setupStatus) {
filters.push({
v_setup_status: qc.where.setupStatus
});
delete qc.where.setupStatus;
}
qc.where["$and"] = filters; qc.where["$and"] = filters;
return qw; return qw;
} }
async insertInfo(qobj, t) { async insertInfo(qobj, t) {
var obj = { return await this.create(qobj, t);
"delivery_code": qobj.orderId,
"product_code": qobj.product_code,
"product_name": qobj.product_name,
"service_address": qobj.area,
"delivery_status": qobj.delivery_status,
"facilitator_id": qobj.facilitator_id,
"biz_id": qobj.bizId
};
// source_number
if (qobj.source_number && qobj.source_number != 'undefined') {
obj.source_number = qobj.source_number;
delete qobj.source_number;
}
// demand_code
if (qobj.demand_code && qobj.demand_code != 'undefined') {
obj.demand_code = qobj.demand_code;
delete qobj.demand_code;
}
// sku_code
if (qobj.sku_code && qobj.sku_code != 'undefined') {
obj.sku_code = qobj.sku_code;
delete qobj.sku_code;
}
// scheme_number
if (qobj.solutionBizId && qobj.solutionBizId != 'undefined') {
obj.scheme_number = qobj.solutionBizId;
delete qobj.solutionBizId;
}
// selling_price
if (qobj.selling_price && qobj.selling_price != 'undefined') {
obj.selling_price = qobj.selling_price;
delete qobj.selling_price;
}
// cost_price
if (qobj.cost_price && qobj.cost_price != 'undefined') {
obj.cost_price = qobj.cost_price;
delete qobj.cost_price;
}
// close_reason
if (qobj.close_reason && qobj.close_reason != 'undefined') {
obj.close_reason = qobj.close_reason;
delete qobj.close_reason;
}
// facilitator_name
if (qobj.facilitator_name && qobj.facilitator_name != 'undefined') {
obj.facilitator_name = qobj.facilitator_name;
delete qobj.facilitator_name;
}
// salesman_opcode
if (qobj.salesman_opcode && qobj.salesman_opcode != 'undefined') {
obj.salesman_opcode = qobj.salesman_opcode;
delete qobj.salesman_opcode;
}
// salesman_id
if (qobj.salesman_id && qobj.salesman_id != 'undefined') {
obj.salesman_id = qobj.salesman_id;
delete qobj.salesman_id;
}
// salesman_name
if (qobj.salesman_name && qobj.salesman_name != 'undefined') {
obj.salesman_name = qobj.salesman_name;
delete qobj.salesman_name;
}
// salesman_phone
if (qobj.salesman_phone && qobj.salesman_phone != 'undefined') {
obj.salesman_phone = qobj.salesman_phone;
delete qobj.salesman_phone;
}
// source_name
if (qobj.source_name && qobj.source_name != 'undefined') {
obj.source_name = qobj.source_name;
delete qobj.source_name;
}
// master_source_number
if (qobj.master_source_number && qobj.master_source_number != 'undefined') {
obj.master_source_number = qobj.master_source_number;
delete qobj.master_source_number;
}
// settle_status
if (qobj.settle_status && qobj.settle_status != 'undefined') {
obj.settle_status = qobj.settle_status;
delete qobj.settle_status;
}
// settlebill_id
if (qobj.settlebill_id && qobj.settlebill_id != 'undefined') {
obj.settlebill_id = qobj.settlebill_id;
delete qobj.settlebill_id;
}
// delivery_man_id
if (qobj.delivery_man_id && qobj.delivery_man_id != 'undefined') {
obj.delivery_man_id = qobj.delivery_man_id;
delete qobj.delivery_man_id;
}
// delivery_man_name
if (qobj.delivery_man_name && qobj.delivery_man_name != 'undefined') {
obj.delivery_man_name = qobj.delivery_man_name;
delete qobj.delivery_man_name;
}
// delivery_man_opcode
if (qobj.delivery_man_opcode && qobj.delivery_man_opcode != 'undefined') {
obj.delivery_man_opcode = qobj.delivery_man_opcode;
delete qobj.delivery_man_opcode;
}
delete qobj.orderId;
delete qobj.product_code;
delete qobj.product_name;
delete qobj.service_address;
delete qobj.delivery_status;
delete qobj.facilitator_id;
obj.delivery_info = qobj;
return await this.create(obj, t);
} }
async updateServer(qobj, whereobj, t) { async updateServer(qobj, t) {
return await this.updateByWhere(qobj, whereobj, t); var setobj = { "delivery_info": qobj.delivery_info };
var whereobj = { "delivery_code": qobj.delivery_code, "biz_id": qobj.biz_id };
return await this.updateByWhere(setobj, whereobj, t);
} }
async findOneByDeliveryCodeAndBizId(qobj) { async findOneByDeliveryCodeAndBizId(qobj) {
var qcwhere = { "delivery_code": qobj.orderId, "biz_id": qobj.bizId }; var qcwhere = { "delivery_code": qobj.delivery_code, "biz_id": qobj.biz_id };
return await this.findOne(qcwhere); return await this.findOne(qcwhere);
} }
/** /**
* 根据服务实例id查找服务所有信息 * 根据服务实例id查找服务所有信息
*/ */
async findByBizId(pobj){ async findByBizId(pobj) {
var oid=pobj.bizId; var oid = pobj.bizId;
return await this.findOne({biz_id:oid}); return await this.findOne({ biz_id: oid });
} }
} }
module.exports = DeliverybillDao; module.exports = DeliverybillDao;
tx-fi-tax/app/base/db/models/delivery/delivery_bill.js
...@@ -22,6 +22,10 @@ module.exports = (db, DataTypes) => { ...@@ -22,6 +22,10 @@ module.exports = (db, DataTypes) => {
allowNull: true, allowNull: true,
type: DataTypes.STRING type: DataTypes.STRING
}, },
company_name: { // 公司名称-虚拟字段
allowNull: true,
type: DataTypes.STRING
},
v_coname: { // 联系人-虚拟字段 v_coname: { // 联系人-虚拟字段
allowNull: true, allowNull: true,
type: DataTypes.STRING type: DataTypes.STRING
...@@ -30,6 +34,10 @@ module.exports = (db, DataTypes) => { ...@@ -30,6 +34,10 @@ module.exports = (db, DataTypes) => {
allowNull: true, allowNull: true,
type: DataTypes.STRING type: DataTypes.STRING
}, },
v_setup_status: {// 公司名称-建账状态
allowNull: true,
type: DataTypes.STRING
},
demand_code: {// 商机编号 demand_code: {// 商机编号
allowNull: true, allowNull: true,
type: DataTypes.STRING type: DataTypes.STRING
...@@ -62,14 +70,14 @@ module.exports = (db, DataTypes) => { ...@@ -62,14 +70,14 @@ module.exports = (db, DataTypes) => {
allowNull: false, allowNull: false,
type: DataTypes.STRING type: DataTypes.STRING
}, },
master_source_number:{//主订单号 master_source_number: {//主订单号
allowNull: true, allowNull: true,
type: DataTypes.STRING type: DataTypes.STRING
}, },
settle_status: {// 服务单流转状态 settle_status: {// 服务单流转状态
allowNull: false, allowNull: false,
type: DataTypes.STRING, type: DataTypes.STRING,
defaultValue:'waittosettle' defaultValue: 'waittosettle'
}, },
selling_price: {//售价 selling_price: {//售价
allowNull: true, allowNull: true,
......
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