Skip to content

Z
zhichan
Commit 157cae4e by 王勇飞
Options

gyq

parent 15dacbe0
Showing with 103 additions and 31 deletions
ic-deliver/app/base/controller/impl/bizchance/bizoptCtl.js
......@@ -41,8 +41,8 @@ class BizOptCtl extends CtlBase {
robj.business_type = element.business_type;//商机类型
robj.business_info_person = element.business_info.contactsName;//联系人
robj.v_coname = element.v_coname;//联系人-shousuo
robj.business_info_phone = element.business_info.contactsPhone;//联系电话
robj.v_cophone = element.v_cophone;//联系电话-shousuo
robj.business_info_phone = system.decryptStr(element.business_info.contactsPhone);//联系电话
robj.v_cophone = system.decryptStr(element.v_cophone);//联系电话-shousuo
robj.business_status = element.business_status;//商机当前状态
if (element.business_info.serviceName && element.business_info.serviceName != 'undefined'){
robj.serviceName = element.business_info.serviceName;//服务地区
......@@ -97,7 +97,7 @@ class BizOptCtl extends CtlBase {
businessInfo.statusReason = rs.close_reason;//商机关闭原因
businessInfo.memoInfo = rs.business_info.memoInfo;//备注信息
businessInfo.contactsName = rs.business_info.contactsName;//联系人名称
businessInfo.contactsPhone = rs.business_info.contactsPhone;//联系人联系方式
businessInfo.contactsPhone = system.decryptStr(rs.business_info.contactsPhone);//联系人联系方式
businessInfo.createdTime = this.timeFormat(rs.created_at);//商机创建时间
rarr.statusInfo = statusInfo;
rarr.businessInfo = businessInfo;
......@@ -233,7 +233,7 @@ class BizOptCtl extends CtlBase {
var pobj = nobj.d;
if (pobj.businessMode && pobj.businessMode != 'undefined' && pobj.businessType && pobj.businessType != 'undefined') {
try {
pobj.currentStatus = "beforeSubmission";//加上当前状态为待提交方案
//pobj.currentStatus = "beforeSubmission";//加上当前状态为待提交方案
// pobj.channelSource = "tencentCloud";//目前渠道只有腾讯
// pobj.sourceNumber = "1111111";
pobj.businessType = appconfig.pdict.dyDict[pobj.businessType];
......
ic-deliver/app/base/controller/impl/bizchance/deliverybillCtl.js
......@@ -89,11 +89,12 @@ class DeliverybillCtl extends CtlBase {
robj.deliverStatus = element.delivery_status;//交付单状态
robj.delivery_status = element.delivery_status;//交付单状态-shousuo
robj.contactsName = robj.baseInfo.contactsName;//联系人
robj.contactsPhone = robj.baseInfo.contactsPhone;//联系电话
robj.contactsPhone = system.decryptStr(robj.baseInfo.contactsPhone);//联系电话
robj.v_coname = element.v_coname;//联系人-shousuo
robj.v_cophone = element.v_cophone;//联系电话-shousuo
robj.v_cophone = system.decryptStr(element.v_cophone);//联系电话-shousuo
robj.clerkName = element.salesman_name;//业务员名称
robj.clerkPhone = element.salesman_phone;//业务员电话
robj.deliveryName = element.delivery_man_name;//交付人员名称
robj.createdTime = this.timeFormat(element.created_at);//交付单创建时间
robj.created_at = this.timeFormat(element.created_at);//交付单创建时间-shousuo
rarr.push(robj);
......@@ -161,6 +162,7 @@ class DeliverybillCtl extends CtlBase {
rarr.baseInfo.servicerName = rs.facilitator_name;//服务商名称
rarr.baseInfo.clerkName = rs.salesman_name;//业务员名称
rarr.baseInfo.clerkPhone = rs.salesman_phone;//业务员电话
rarr.deliveryName = rs.delivery_man_name;//交付人员名称
rarr.baseInfo.sellingPrice = this.FenToYuan(rs.selling_price);//价格
rarr.baseInfo.costPrice = this.FenToYuan(rs.cost_price);//成本价
rarr.baseInfo.deliverStatus = rs.delivery_status;//状态
......@@ -177,8 +179,8 @@ class DeliverybillCtl extends CtlBase {
rarr.baseInfo.contactsName = rs.delivery_info.contactsName;//联系人信息
}
if (rs.delivery_info.contactsPhone && rs.delivery_info.contactsPhone != 'undefined') {
rarr.contactsInfo.contactsPhone = rs.delivery_info.contactsPhone;//联系电话信息
rarr.baseInfo.contactsPhone = rs.delivery_info.contactsPhone;//联系电话信息
rarr.contactsInfo.contactsPhone =system.decryptStr(rs.delivery_info.contactsPhone);//联系电话信息
rarr.baseInfo.contactsPhone = rarr.contactsInfo.contactsPhone;//联系电话信息
}
if (rs.delivery_info.isWhether && rs.delivery_info.isWhether != 'undefined') {
......@@ -379,7 +381,9 @@ class DeliverybillCtl extends CtlBase {
"flowId": pInfo.id,
"statusCode": pobj.deliverStatus,
"clerkName": pInfo.salesman_name,
"clerkId": pInfo.salesman_id
"clerkId": pInfo.salesman_id,
"deliveryId" : pInfo.delivery_man_id,
"deliveryName": pInfo.delivery_man_name
}
if (pInfo.statusReason && pInfo.statusReason != 'undefined') {
logInfo.statusReason = pInfo.statusReason;
......@@ -525,16 +529,16 @@ class DeliverybillCtl extends CtlBase {
"flowId": res.id,
"flowCode": pobj.deliverNumber,
"salesmanInfo": {
"oldOpcode": res.salesman_opcode,
"oldClerkName": res.salesman_name,
"oldClerkId": res.salesman_id,
"oldClerkPhone": res.salesman_phone,
"oldOpcode": res.delivery_man_opcode,
"oldClerkName": res.delivery_man_name,
"oldClerkId": res.delivery_man_id,
//"oldClerkPhone": res.salesman_phone,
"oldFacilitatorId": res.facilitator_id,
"oldFacilitatorName": res.facilitator_name,
"newOpcode": pobj.salesmanOpcode,
"newClerkName": pobj.salesmanName,
"newClerkId": pobj.salesmanId,
"newClerkPhone": pobj.salesmanPhone,
//"newClerkPhone": pobj.salesmanPhone,
"newFacilitatorId": pobj.facilitatorId,
"newFacilitatorName": pobj.facilitatorName
}
......@@ -569,7 +573,7 @@ class DeliverybillCtl extends CtlBase {
baseInfo.contactsName = pobj.contactsInfo.contactsName;
}
if (pobj.contactsInfo.contactsPhone && pobj.contactsInfo.contactsPhone != 'undefined') {
baseInfo.contactsPhone = pobj.contactsInfo.contactsPhone;
baseInfo.contactsPhone = system.encryptStr(pobj.contactsInfo.contactsPhone);
}
var parms = {
"deliverNumber": pobj.deliverNumber
......@@ -590,6 +594,7 @@ class DeliverybillCtl extends CtlBase {
//传给庄冰，tongbu
baseInfo.clerkName = rs.salesman_name;//业务员名称
baseInfo.clerkPhone = rs.salesman_phone;
baseInfo.deliveryName = rs.delivery_man_name;//交付人员名称
pobj.baseInfo = baseInfo;
var rc = system.getObject("util.execClient");
var requrl = this.receiveUrl;
......@@ -682,6 +687,10 @@ class DeliverybillCtl extends CtlBase {
}
}
pobj.schemeNumber = "";
pobj.salesmanOpcode = "";
pobj.salesmanName = "";
pobj.salesmanId = "";
pobj.salesmanPhone = "";
// pobj.channelSource = "tencentCloud";//目前渠道只有腾讯
// pobj.channelNumber = "1111111";
pobj.cacheInfo = {
......@@ -692,6 +701,10 @@ class DeliverybillCtl extends CtlBase {
var schemeInfo = await this.schemeService.findInfoByDemandCode(pobj);
if (schemeInfo && schemeInfo != 'undefined') {
pobj.schemeNumber = schemeInfo.scheme_number;
pobj.salesmanOpcode = schemeInfo.salesman_opcode;
pobj.salesmanName = schemeInfo.salesman_name;
pobj.salesmanId = schemeInfo.salesman_id;
pobj.salesmanPhone = schemeInfo.salesman_phone;
pobj.cacheInfo.cmpDeliverInfo = schemeInfo.scheme_info;//获取方案中的缓存信息
}
}
......@@ -756,6 +769,7 @@ class DeliverybillCtl extends CtlBase {
}
if (pobj.baseInfo.contactsPhone && pobj.baseInfo.contactsPhone != 'undefined') {
pobj.baseInfo.contactsPhone = system.encryptStr(pobj.baseInfo.contactsPhone);
pobj.cacheInfo.cmpContactInfo.contactsPhone = pobj.baseInfo.contactsPhone;
}
if (pobj.baseInfo.virtualPrice && pobj.baseInfo.virtualPrice != 'undefined') {//虚拟地址价格
......
ic-deliver/app/base/db/impl/bizchance/bizoptDao.js
......@@ -104,7 +104,7 @@ class BizoptDao extends Dao {
obj.business_info.contactsName = qobj.contactsName;
}
if (qobj.contactsPhone && qobj.contactsPhone != 'undefined') {
obj.business_info.contactsPhone = qobj.contactsPhone;
obj.business_info.contactsPhone = system.encryptStr(qobj.contactsPhone);
}
if (qobj.serviceName && qobj.serviceName != 'undefined') {
obj.business_info.serviceName = qobj.serviceName;
......
ic-deliver/app/base/db/impl/bizchance/deliverybillDao.js
......@@ -29,7 +29,7 @@ class DeliverybillDao extends Dao {
qw["facilitator_id"] = Number(qobj.company_id)
// 为空说明是管理员,不需设置组织结构过滤
if (qobj.opath && qobj.opath != "") {
qw["salesman_opcode"] = { [this.db.Op.like]: `%${qobj.opath}%` }
qw["delivery_man_opcode"] = { [this.db.Op.like]: `%${qobj.opath}%` }
} else {//说明是租户管理员，给租户自己核销结算的功能，
if (qobj.bizpath.indexOf("pmxdeliverrequest") > 0) {//说明是结算核销路由过来的
qw["delivery_status"] = "success";
......@@ -44,7 +44,7 @@ class DeliverybillDao extends Dao {
}
if (qobj.bizpath && qobj.bizpath != "") {
if (qobj.bizpath.indexOf("myDeliver") > 0) {//说明是从商机列表过来的
qw["salesman_id"] = qobj.userid;
qw["delivery_man_id"] = qobj.userid;
}
}
}
......@@ -88,17 +88,17 @@ class DeliverybillDao extends Dao {
async updateSalesmanInfoByDeliverCode(qobj, t) {
var setobj = {};
if (qobj.salesmanId && qobj.salesmanId != 'undefined') {
setobj.salesman_id = qobj.salesmanId;
setobj.delivery_man_id = qobj.salesmanId;
};
if (qobj.salesmanName && qobj.salesmanName != 'undefined') {
setobj.salesman_name = qobj.salesmanName;
setobj.delivery_man_name = qobj.salesmanName;
};
if (qobj.salesmanOpcode && qobj.salesmanOpcode != 'undefined') {
setobj.salesman_opcode = qobj.salesmanOpcode;
};
if (qobj.salesmanPhone && qobj.salesmanPhone != 'undefined') {
setobj.salesman_phone = qobj.salesmanPhone;
setobj.delivery_man_opcode = qobj.salesmanOpcode;
};
// if (qobj.salesmanPhone && qobj.salesmanPhone != 'undefined') {
// setobj.salesman_phone = qobj.salesmanPhone;
// };
if (qobj.facilitatorId && qobj.facilitatorId != 'undefined') {
setobj.facilitator_id = qobj.facilitatorId;
};
......@@ -167,16 +167,25 @@ class DeliverybillDao extends Dao {
obj.facilitator_name = qobj.servicerName;
}
if (qobj.clerkName && qobj.clerkName != 'undefined') {
obj.salesman_name = qobj.clerkName;
obj.delivery_man_name = qobj.clerkName;
}
if (qobj.salesmanName && qobj.salesmanName != undefined){
obj.salesman_name = qobj.salesmanName;
}
if (qobj.salesmanPhone && qobj.salesmanPhone != 'undefined') {
obj.salesman_phone = qobj.salesmanPhone
}
if (qobj.clerkPhone && qobj.clerkPhone != 'undefined') {
obj.salesman_phone = qobj.clerkPhone
if (qobj.salesmanOpcode && qobj.salesmanOpcode != 'undefined') {
obj.salesman_opcode = qobj.salesmanOpcode;
}
if (qobj.clerkOpcode && qobj.clerkOpcode != 'undefined') {
obj.salesman_opcode = qobj.clerkOpcode;
obj.delivery_man_opcode = qobj.clerkOpcode;
}
if (qobj.salesmanId && qobj.salesmanId != 'undefined') {
obj.salesman_id = qobj.salesmanId;
}
if (qobj.clerkId && qobj.clerkId != 'undefined') {
obj.salesman_id = qobj.clerkId;
obj.delivery_man_id = qobj.clerkId;
}
if (qobj.sellingPrice && qobj.sellingPrice != 'undefined') {
obj.selling_price = qobj.sellingPrice;
......
ic-deliver/app/base/db/models/delivery/delivery_bill.js
......@@ -106,7 +106,19 @@ module.exports = (db, DataTypes) => {
salesman_phone: { // 业务员联系方式
allowNull: true,
type: DataTypes.STRING
}
},
delivery_man_id: {// 交付员id
allowNull: true,
type: DataTypes.STRING
},
delivery_man_name: {// 交付员姓名
allowNull: true,
type: DataTypes.STRING
},
delivery_man_opcode: {// 交付员opcode
allowNull: true,
type: DataTypes.STRING
},
}, {
paranoid: false,//假的删除
......
ic-deliver/app/base/system.js
......@@ -2,6 +2,8 @@ var fs = require("fs");
var objsettings = require("../config/objsettings");
var settings = require("../config/settings");
const request = require('request');
const cryptoJS = require('crypto-js');
class System {
static declare(ns) {
var ar = ns.split('.');
......@@ -298,6 +300,37 @@ class System {
}
/**
* 加密信息
* @param {*} opStr
*/
static encryptStr(opStr) {
if (!opStr) {
return "opStr is empty";
}
let keyHex = cryptoJS.enc.Utf8.parse(settings.encrypt_key);
let ivHex = cryptoJS.enc.Utf8.parse(settings.encrypt_secret.substring(0, 8));
var cipherStr = cryptoJS.TripleDES.encrypt(opStr, keyHex, { iv: ivHex }).toString();
return cipherStr;
}
/**
* 解密信息
* @param {*} opStr
*/
static decryptStr(opStr) {
if (!opStr) {
return "opStr is empty";
}
let keyHex = cryptoJS.enc.Utf8.parse(settings.encrypt_key);
let ivHex = cryptoJS.enc.Utf8.parse(settings.encrypt_secret.substring(0, 8));
var bytes = cryptoJS.TripleDES.decrypt(opStr, keyHex, {
iv: ivHex
});
var plaintext = bytes.toString(cryptoJS.enc.Utf8);
return plaintext;
}
}
Date.prototype.Format = function (fmt) { //author: meizz
var o = {
......
ic-deliver/app/config/settings.js
......@@ -9,10 +9,14 @@ var ENVINPUT = {
REDIS_PORT: process.env.REDIS_PORT,
REDIS_PWD: process.env.REDIS_PWD,
REDIS_DB: process.env.PAAS_REDIS_DB,
APP_ENV: process.env.APP_ENV ? process.env.APP_ENV : "dev"
APP_ENV: process.env.APP_ENV ? process.env.APP_ENV : "dev",
ENCRYPT_KEY: process.env.ENCRYPT_KEY ? process.env.ENCRYPT_KEY : "202007211106",
ENCRYPT_SECRET: process.env.ENCRYPT_SECRET ? process.env.ENCRYPT_SECRET : "scbb846246874887b5c7e01cd0816c66"
};
var settings = {
env: ENVINPUT.APP_ENV,
encrypt_key: ENVINPUT.ENCRYPT_KEY,
encrypt_secret: ENVINPUT.ENCRYPT_SECRET,
salt: "%iatpD1gcxz7iF#B",
defaultpwd: "gsb2020",
basepath: path.normalize(path.join(__dirname, '../..')),
......
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