Skip to content

Z
zhichan
Commit d4f7f8cf by 王勇飞
Options

gyq

parent 71975ade
Showing with 162 additions and 8 deletions
ic-deliver/app/base/controller/impl/bizchance/bizoptCtl.js
......@@ -57,8 +57,8 @@ class BizOptCtl extends CtlBase {
robj.sourceName = element.source_name;//渠道来源
robj.source_name = element.source_name;//渠道来源--前端服务
robj.salesman_name=element.salesman_name
robj.salesman_phone=element.salesman_phone
robj.salesman_name=element.salesman_name;
robj.salesman_phone=system.decryptStr(element.salesman_phone);
rarr.push(robj);
});
......
ic-deliver/app/base/controller/impl/bizchance/cacheinfoCtl.js
......@@ -22,6 +22,31 @@ class CacheInfoCtl extends CtlBase {
if (rs && rs != 'undefined'){
rarr.deliverNumber = rs.deliver_id;
rarr.cacheInfo = rs.cache_info;
if (rarr.cacheInfo && rarr.cacheInfo != 'undefined'){
if (rarr.cacheInfo.cmpContactInfo.contactsPhone && rarr.cacheInfo.cmpContactInfo.contactsPhone != 'undefined'){
rarr.cacheInfo.cmpContactInfo.contactsPhone = system.decryptStr(rarr.cacheInfo.cmpContactInfo.contactsPhone);
}
if (rarr.cacheInfo.positionData && rarr.cacheInfo.positionData.length > 0){
for (var i =0; i< rarr.cacheInfo.positionData.length;i++){
if (rarr.cacheInfo.positionData[i].fixedPhone && rarr.cacheInfo.positionData[i].fixedPhone != 'undefined'){
rarr.cacheInfo.positionData[i].fixedPhone = system.decryptStr(rarr.cacheInfo.positionData[i].fixedPhone);
}
if (rarr.cacheInfo.positionData[i].mobilePhone && rarr.cacheInfo.positionData[i].mobilePhone != 'undefined'){
rarr.cacheInfo.positionData[i].mobilePhone = system.decryptStr(rarr.cacheInfo.positionData[i].mobilePhone);
}
}
}
if (rarr.cacheInfo.contributionData && rarr.cacheInfo.contributionData.length > 0){
for (var i =0; i< rarr.cacheInfo.contributionData.length;i++){
if (rarr.cacheInfo.contributionData[i].phoneNumber && rarr.cacheInfo.contributionData[i].phoneNumber != 'undefined'){
rarr.cacheInfo.contributionData[i].phoneNumber = system.decryptStr(rarr.cacheInfo.contributionData[i].phoneNumber);
}
if (rarr.cacheInfo.contributionData[i].IdentificationNumber && rarr.cacheInfo.contributionData[i].IdentificationNumber != 'undefined'){
rarr.cacheInfo.contributionData[i].IdentificationNumber = system.decryptStr(rarr.cacheInfo.contributionData[i].IdentificationNumber);
}
}
}
}
rarr.statusInfo = {};
if (divInfo && divInfo != 'undefined'){
rarr.statusInfo.deliverStatus = divInfo.delivery_status;//状态
......@@ -48,6 +73,32 @@ class CacheInfoCtl extends CtlBase {
console.log("cache---------------------------------------" + JSON.stringify(pobj));
if (pobj.deliverNumber && pobj.deliverNumber != 'undefined' && pobj.cacheInfo && pobj.cacheInfo != 'undefined'){
try{
if (pobj.cacheInfo.cmpContactInfo && pobj.cacheInfo.cmpContactInfo != 'undefined'){
if (pobj.cacheInfo.cmpContactInfo.contactsPhone && pobj.cacheInfo.cmpContactInfo.contactsPhone != 'undefined'){
pobj.cacheInfo.cmpContactInfo.contactsPhone = system.encryptStr(pobj.cacheInfo.cmpContactInfo.contactsPhone);
}
}
if (pobj.cacheInfo.positionData && pobj.cacheInfo.positionData.length > 0){
for (var i =0; i< pobj.cacheInfo.positionData.length;i++){
if (pobj.cacheInfo.positionData[i].fixedPhone && pobj.cacheInfo.positionData[i].fixedPhone != 'undefined'){
pobj.cacheInfo.positionData[i].fixedPhone = system.encryptStr(pobj.cacheInfo.positionData[i].fixedPhone);
}
if (pobj.cacheInfo.positionData[i].mobilePhone && pobj.cacheInfo.positionData[i].mobilePhone != 'undefined'){
pobj.cacheInfo.positionData[i].mobilePhone = system.encryptStr(pobj.cacheInfo.positionData[i].mobilePhone);
}
}
}
if (pobj.cacheInfo.contributionData && pobj.cacheInfo.contributionData.length > 0){
for (var i =0; i< pobj.cacheInfo.contributionData.length;i++){
if (pobj.cacheInfo.contributionData[i].phoneNumber && pobj.cacheInfo.contributionData[i].phoneNumber != 'undefined'){
pobj.cacheInfo.contributionData[i].phoneNumber = system.encryptStr(pobj.cacheInfo.contributionData[i].phoneNumber);
}
if (pobj.cacheInfo.contributionData[i].IdentificationNumber && pobj.cacheInfo.contributionData[i].IdentificationNumber != 'undefined'){
pobj.cacheInfo.contributionData[i].IdentificationNumber = system.encryptStr(pobj.cacheInfo.contributionData[i].IdentificationNumber);
}
}
}
var res = await this.service.updateInfoByDeliverId(pobj);
return system.getResult("更新成功！");
}
......@@ -67,6 +118,32 @@ class CacheInfoCtl extends CtlBase {
var pobj = mobj.d;
if (pobj.deliverNumber && pobj.deliverNumber != 'undefined' && pobj.cacheInfo && pobj.cacheInfo != 'undefined'){
try{
if (pobj.cacheInfo.cmpContactInfo && pobj.cacheInfo.cmpContactInfo != 'undefined'){
if (pobj.cacheInfo.cmpContactInfo.contactsPhone && pobj.cacheInfo.cmpContactInfo.contactsPhone != 'undefined'){
pobj.cacheInfo.cmpContactInfo.contactsPhone = system.encryptStr(pobj.cacheInfo.cmpContactInfo.contactsPhone);
}
}
if (pobj.cacheInfo.positionData && pobj.cacheInfo.positionData.length > 0){
for (var i =0; i< pobj.cacheInfo.positionData.length;i++){
if (pobj.cacheInfo.positionData[i].fixedPhone && pobj.cacheInfo.positionData[i].fixedPhone != 'undefined'){
pobj.cacheInfo.positionData[i].fixedPhone = system.encryptStr(pobj.cacheInfo.positionData[i].fixedPhone);
}
if (pobj.cacheInfo.positionData[i].mobilePhone && pobj.cacheInfo.positionData[i].mobilePhone != 'undefined'){
pobj.cacheInfo.positionData[i].mobilePhone = system.encryptStr(pobj.cacheInfo.positionData[i].mobilePhone);
}
}
}
if (pobj.cacheInfo.contributionData && pobj.cacheInfo.contributionData.length > 0){
for (var i =0; i< pobj.cacheInfo.contributionData.length;i++){
if (pobj.cacheInfo.contributionData[i].phoneNumber && pobj.cacheInfo.contributionData[i].phoneNumber != 'undefined'){
pobj.cacheInfo.contributionData[i].phoneNumber = system.encryptStr(pobj.cacheInfo.contributionData[i].phoneNumber);
}
if (pobj.cacheInfo.contributionData[i].IdentificationNumber && pobj.cacheInfo.contributionData[i].IdentificationNumber != 'undefined'){
pobj.cacheInfo.contributionData[i].IdentificationNumber = system.encryptStr(pobj.cacheInfo.contributionData[i].IdentificationNumber);
}
}
}
var rs = await this.service.findInfoByDeliverId(pobj);
if (rs){
await this.service.updateInfoByDeliverId(pobj);
......
ic-deliver/app/base/controller/impl/bizchance/deliverybillCtl.js
......@@ -93,7 +93,7 @@ class DeliverybillCtl extends CtlBase {
robj.v_coname = element.v_coname;//联系人-shousuo
robj.v_cophone = system.decryptStr(element.v_cophone);//联系电话-shousuo
robj.clerkName = element.salesman_name;//业务员名称
robj.clerkPhone = element.salesman_phone;//业务员电话
robj.clerkPhone = system.decryptStr(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
......@@ -161,7 +161,7 @@ class DeliverybillCtl extends CtlBase {
rarr.baseInfo.servicerCode = rs.facilitator_id;//服务商编码
rarr.baseInfo.servicerName = rs.facilitator_name;//服务商名称
rarr.baseInfo.clerkName = rs.salesman_name;//业务员名称
rarr.baseInfo.clerkPhone = rs.salesman_phone;//业务员电话
rarr.baseInfo.clerkPhone = system.decryptStr(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);//成本价
......@@ -240,10 +240,43 @@ class DeliverybillCtl extends CtlBase {
rarr.companyInfo = ms.company_info;//公司详情
rarr.registeredInfo = ms.registered_info;//注册信息
rarr.contributionInfo = ms.contribution_info;//出资比例信息
rarr.positionInfo = ms.position_info;//任职信息；公司注册和个人独资时取该值
rarr.managerInfo = ms.position_info;//经营者信息，个体工商户的经营者信息取该值
if (rarr.contributionInfo && rarr.contributionInfo.contributionData && rarr.contributionInfo.contributionData.length >0){
for (var i =0;i<rarr.contributionInfo.contributionData.length;i++)
{
if (rarr.contributionInfo.contributionData[i].phoneNumber && rarr.contributionInfo.contributionData[i].phoneNumber != 'undefined'){
rarr.contributionInfo.contributionData[i].phoneNumber = system.decryptStr(rarr.contributionInfo.contributionData[i].phoneNumber);
}
if (rarr.contributionInfo.contributionData[i].IdentificationNumber && rarr.contributionInfo.contributionData[i].IdentificationNumber != 'undefined'){
rarr.contributionInfo.contributionData[i].IdentificationNumber = system.decryptStr(rarr.contributionInfo.contributionData[i].IdentificationNumber);
}
}
}
var position_t_info = ms.position_info;
if (position_t_info && position_t_info != 'undefined'){
if (position_t_info.phoneNumber && position_t_info.phoneNumber != 'undefined'){
position_t_info.phoneNumber = system.decryptStr(position_t_info.phoneNumber);
}
if (position_t_info.IdentificationNumber && position_t_info.IdentificationNumber != 'undefined'){
position_t_info.IdentificationNumber = system.decryptStr(position_t_info.IdentificationNumber);
}
if (position_t_info.positionData && position_t_info.positionData.length >0){
for (var i=0;i<pobj.positionInfo.positionData.length;i++){
if (position_t_info.positionData[i].fixedPhone && position_t_info.positionData[i].fixedPhone != 'undefined'){
position_t_info.positionData[i].fixedPhone = system.decryptStr(position_t_info.positionData[i].fixedPhone);
}
if (position_t_info.positionData[i].mobilePhone &&position_t_info.positionData[i].mobilePhone != 'undefined'){
position_t_info.positionData[i].mobilePhone = system.decryptStr(position_t_info.positionData[i].mobilePhone);
}
}
}
rarr.positionInfo = position_t_info;//任职信息；公司注册和个人独资时取该值
rarr.managerInfo = position_t_info;//经营者信息，个体工商户的经营者信息取该值
rarr.regInfo = ms.file_info;//注册文件信息
rarr.expressInfo = ms.express_info;//邮寄信息
if (rarr.expressInfo && rarr.expressInfo.addresseePhone && rarr.expressInfo.addresseePhone != 'undefined'){
rarr.expressInfo.addresseePhone = system.decryptStr(rarr.expressInfo.addresseePhone);
}
}
return system.getResult(rarr);
}
......@@ -471,6 +504,9 @@ class DeliverybillCtl extends CtlBase {
var pobj = mobj.d;
if (pobj.deliverNumber && pobj.deliverNumber != 'undefined' && pobj.expressInfo && pobj.expressInfo != 'undefined') {
try {
if (pobj.expressInfo.addresseePhone && pobj.expressInfo.addresseePhone != 'undefined'){
pobj.expressInfo.addresseePhone = system.encryptStr(pobj.expressInfo.addresseePhone);
}
var deliverInfo = await this.service.findInfoByDeliverCode(pobj)//先得到交付单详情
if (deliverInfo && deliverInfo != 'undefined') {
//回传信息给庄冰，放队列
......@@ -589,6 +625,47 @@ class DeliverybillCtl extends CtlBase {
parms.baseInfo = baseInfo;
await this.service.updateInfoByDeliverCode(parms);
//更新材料信息
//相关数据加密
if (pobj.expressInfo && pobj.expressInfo.addresseePhone && pobj.expressInfo.addresseePhone != 'undefined'){
pobj.expressInfo.addresseePhone = system.encryptStr(pobj.expressInfo.addresseePhone);
}
if (pobj.contributionInfo){
if (pobj.contributionInfo.contributionData && pobj.contributionInfo.contributionData.length >0){
for (var i =0;i<pobj.contributionInfo.contributionData.length;i++)
{
if (pobj.contributionInfo.contributionData[i].phoneNumber && pobj.contributionInfo.contributionData[i].phoneNumber != 'undefined'){
pobj.contributionInfo.contributionData[i].phoneNumber = system.encryptStr(pobj.contributionInfo.contributionData[i].phoneNumber);
}
if (pobj.contributionInfo.contributionData[i].IdentificationNumber && pobj.contributionInfo.contributionData[i].IdentificationNumber != 'undefined'){
pobj.contributionInfo.contributionData[i].IdentificationNumber = system.encryptStr(pobj.contributionInfo.contributionData[i].IdentificationNumber);
}
}
}
}
if (pobj.positionInfo){
if (pobj.positionInfo.positionData && pobj.positionInfo.positionData.length >0){
for (var i=0;i<pobj.positionInfo.positionData.length;i++){
if (pobj.positionInfo.positionData[i].fixedPhone && pobj.positionInfo.positionData[i].fixedPhone != 'undefined'){
pobj.positionInfo.positionData[i].fixedPhone = system.encryptStr(pobj.positionInfo.positionData[i].fixedPhone);
}
if (pobj.positionInfo.positionData[i].mobilePhone && pobj.positionInfo.positionData[i].mobilePhone != 'undefined'){
pobj.positionInfo.positionData[i].mobilePhone = system.encryptStr(pobj.positionInfo.positionData[i].mobilePhone);
}
}
}
}
if (pobj.managerInfo && pobj.managerInfo != 'undefined'){
if (pobj.managerInfo.phoneNumber && pobj.managerInfo.phoneNumber != 'undefined'){
pobj.managerInfo.phoneNumber = system.encryptStr(pobj.managerInfo.phoneNumber);
}
if (pobj.managerInfo.IdentificationNumber && pobj.managerInfo.IdentificationNumber != 'undefined'){
pobj.managerInfo.IdentificationNumber = system.encryptStr(pobj.managerInfo.IdentificationNumber);
}
}
await this.materialService.updateInfoByDeliverNumber(pobj);
//return system.getResult("操作成功！");
//传给庄冰，tongbu
......@@ -769,7 +846,7 @@ class DeliverybillCtl extends CtlBase {
}
if (pobj.baseInfo.contactsPhone && pobj.baseInfo.contactsPhone != 'undefined') {
pobj.baseInfo.contactsPhone = system.encryptStr(pobj.baseInfo.contactsPhone);
// 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 = system.encryptStr(qobj.contactsPhone);
obj.business_info.contactsPhone = qobj.contactsPhone;//已经加密
}
if (qobj.serviceName && qobj.serviceName != 'undefined') {
obj.business_info.serviceName = qobj.serviceName;
......
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