Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Z
zhichan
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
蒋勇
zhichan
Commits
2957efda
Commit
2957efda
authored
Aug 05, 2020
by
Sxy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: del加密解密
parent
36f6c035
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
23 additions
and
23 deletions
+23
-23
ic-deliver/app/base/controller/impl/bizchance/bizoptCtl.js
+16
-16
ic-deliver/app/base/controller/impl/bizchance/deliverybillCtl.js
+5
-5
ic-deliver/app/base/db/impl/bizchance/bizoptDao.js
+2
-2
No files found.
ic-deliver/app/base/controller/impl/bizchance/bizoptCtl.js
View file @
2957efda
...
@@ -41,13 +41,13 @@ class BizOptCtl extends CtlBase {
...
@@ -41,13 +41,13 @@ class BizOptCtl extends CtlBase {
robj
.
business_type
=
element
.
business_type
;
//商机类型
robj
.
business_type
=
element
.
business_type
;
//商机类型
robj
.
business_info_person
=
element
.
business_info
.
contactsName
;
//联系人
robj
.
business_info_person
=
element
.
business_info
.
contactsName
;
//联系人
robj
.
v_coname
=
element
.
v_coname
;
//联系人-shousuo
robj
.
v_coname
=
element
.
v_coname
;
//联系人-shousuo
robj
.
business_info_phone
=
system
.
decryptStr
(
element
.
business_info
.
contactsPhone
)
;
//联系电话
robj
.
business_info_phone
=
element
.
business_info
.
contactsPhone
;
//联系电话
robj
.
v_cophone
=
system
.
decryptStr
(
element
.
v_cophone
)
;
//联系电话-shousuo
robj
.
v_cophone
=
element
.
v_cophone
;
//联系电话-shousuo
robj
.
business_status
=
element
.
business_status
;
//商机当前状态
robj
.
business_status
=
element
.
business_status
;
//商机当前状态
if
(
element
.
business_info
.
serviceName
&&
element
.
business_info
.
serviceName
!=
'undefined'
){
if
(
element
.
business_info
.
serviceName
&&
element
.
business_info
.
serviceName
!=
'undefined'
)
{
robj
.
serviceName
=
element
.
business_info
.
serviceName
;
//服务地区
robj
.
serviceName
=
element
.
business_info
.
serviceName
;
//服务地区
}
}
else
{
else
{
robj
.
serviceName
=
""
;
robj
.
serviceName
=
""
;
}
}
robj
.
updated_at
=
this
.
timeFormat
(
element
.
updated_at
);
//商机当前状态日期
robj
.
updated_at
=
this
.
timeFormat
(
element
.
updated_at
);
//商机当前状态日期
...
@@ -57,8 +57,8 @@ class BizOptCtl extends CtlBase {
...
@@ -57,8 +57,8 @@ class BizOptCtl extends CtlBase {
robj
.
sourceName
=
element
.
source_name
;
//渠道来源
robj
.
sourceName
=
element
.
source_name
;
//渠道来源
robj
.
source_name
=
element
.
source_name
;
//渠道来源--前端服务
robj
.
source_name
=
element
.
source_name
;
//渠道来源--前端服务
robj
.
salesman_name
=
element
.
salesman_name
robj
.
salesman_name
=
element
.
salesman_name
robj
.
salesman_phone
=
element
.
salesman_phone
robj
.
salesman_phone
=
element
.
salesman_phone
rarr
.
push
(
robj
);
rarr
.
push
(
robj
);
});
});
...
@@ -97,7 +97,7 @@ class BizOptCtl extends CtlBase {
...
@@ -97,7 +97,7 @@ class BizOptCtl extends CtlBase {
businessInfo
.
statusReason
=
rs
.
close_reason
;
//商机关闭原因
businessInfo
.
statusReason
=
rs
.
close_reason
;
//商机关闭原因
businessInfo
.
memoInfo
=
rs
.
business_info
.
memoInfo
;
//备注信息
businessInfo
.
memoInfo
=
rs
.
business_info
.
memoInfo
;
//备注信息
businessInfo
.
contactsName
=
rs
.
business_info
.
contactsName
;
//联系人名称
businessInfo
.
contactsName
=
rs
.
business_info
.
contactsName
;
//联系人名称
businessInfo
.
contactsPhone
=
system
.
decryptStr
(
rs
.
business_info
.
contactsPhone
)
;
//联系人联系方式
businessInfo
.
contactsPhone
=
rs
.
business_info
.
contactsPhone
;
//联系人联系方式
businessInfo
.
createdTime
=
this
.
timeFormat
(
rs
.
created_at
);
//商机创建时间
businessInfo
.
createdTime
=
this
.
timeFormat
(
rs
.
created_at
);
//商机创建时间
rarr
.
statusInfo
=
statusInfo
;
rarr
.
statusInfo
=
statusInfo
;
rarr
.
businessInfo
=
businessInfo
;
rarr
.
businessInfo
=
businessInfo
;
...
@@ -129,17 +129,17 @@ class BizOptCtl extends CtlBase {
...
@@ -129,17 +129,17 @@ class BizOptCtl extends CtlBase {
}
}
/*更新业务员信息*/
/*更新业务员信息*/
async
updateSalesmanInfoByDemandCode
(
mobj
,
qobj
,
req
){
async
updateSalesmanInfoByDemandCode
(
mobj
,
qobj
,
req
)
{
var
pobj
=
mobj
.
d
;
var
pobj
=
mobj
.
d
;
if
(
pobj
.
businessMode
&&
pobj
.
businessMode
!=
'undefined'
){
if
(
pobj
.
businessMode
&&
pobj
.
businessMode
!=
'undefined'
)
{
try
{
try
{
var
res
=
await
this
.
service
.
findInfoByDemandCode
(
pobj
);
var
res
=
await
this
.
service
.
findInfoByDemandCode
(
pobj
);
if
(
res
){
if
(
res
)
{
var
sInfo
=
{
var
sInfo
=
{
"flowType"
:
"BIZ"
,
"flowType"
:
"BIZ"
,
"flowId"
:
res
.
id
,
"flowId"
:
res
.
id
,
"flowCode"
:
pobj
.
businessMode
,
"flowCode"
:
pobj
.
businessMode
,
"salesmanInfo"
:{
"salesmanInfo"
:
{
"oldOpcode"
:
res
.
salesman_opcode
,
"oldOpcode"
:
res
.
salesman_opcode
,
"oldClerkName"
:
res
.
salesman_name
,
"oldClerkName"
:
res
.
salesman_name
,
"oldClerkId"
:
res
.
salesman_id
,
"oldClerkId"
:
res
.
salesman_id
,
...
@@ -158,16 +158,16 @@ class BizOptCtl extends CtlBase {
...
@@ -158,16 +158,16 @@ class BizOptCtl extends CtlBase {
await
this
.
service
.
updateSalesmanInfoByDemandCode
(
pobj
);
//更新业务员信息
await
this
.
service
.
updateSalesmanInfoByDemandCode
(
pobj
);
//更新业务员信息
return
system
.
getResult
(
"操作成功!"
);
return
system
.
getResult
(
"操作成功!"
);
}
}
else
{
else
{
return
system
.
getResultError
(
"未找到相关数据"
);
return
system
.
getResultError
(
"未找到相关数据"
);
}
}
}
}
catch
(
error
)
{
catch
(
error
)
{
return
system
.
getResultError
(
error
);
return
system
.
getResultError
(
error
);
}
}
}
}
else
{
else
{
return
system
.
getResultError
(
"参数错误!"
);
return
system
.
getResultError
(
"参数错误!"
);
}
}
}
}
...
...
ic-deliver/app/base/controller/impl/bizchance/deliverybillCtl.js
View file @
2957efda
...
@@ -89,9 +89,9 @@ class DeliverybillCtl extends CtlBase {
...
@@ -89,9 +89,9 @@ class DeliverybillCtl extends CtlBase {
robj
.
deliverStatus
=
element
.
delivery_status
;
//交付单状态
robj
.
deliverStatus
=
element
.
delivery_status
;
//交付单状态
robj
.
delivery_status
=
element
.
delivery_status
;
//交付单状态-shousuo
robj
.
delivery_status
=
element
.
delivery_status
;
//交付单状态-shousuo
robj
.
contactsName
=
robj
.
baseInfo
.
contactsName
;
//联系人
robj
.
contactsName
=
robj
.
baseInfo
.
contactsName
;
//联系人
robj
.
contactsPhone
=
system
.
decryptStr
(
robj
.
baseInfo
.
contactsPhone
)
;
//联系电话
robj
.
contactsPhone
=
robj
.
baseInfo
.
contactsPhone
;
//联系电话
robj
.
v_coname
=
element
.
v_coname
;
//联系人-shousuo
robj
.
v_coname
=
element
.
v_coname
;
//联系人-shousuo
robj
.
v_cophone
=
system
.
decryptStr
(
element
.
v_cophone
)
;
//联系电话-shousuo
robj
.
v_cophone
=
element
.
v_cophone
;
//联系电话-shousuo
robj
.
clerkName
=
element
.
salesman_name
;
//业务员名称
robj
.
clerkName
=
element
.
salesman_name
;
//业务员名称
robj
.
clerkPhone
=
element
.
salesman_phone
;
//业务员电话
robj
.
clerkPhone
=
element
.
salesman_phone
;
//业务员电话
robj
.
deliveryName
=
element
.
delivery_man_name
;
//交付人员名称
robj
.
deliveryName
=
element
.
delivery_man_name
;
//交付人员名称
...
@@ -179,7 +179,7 @@ class DeliverybillCtl extends CtlBase {
...
@@ -179,7 +179,7 @@ class DeliverybillCtl extends CtlBase {
rarr
.
baseInfo
.
contactsName
=
rs
.
delivery_info
.
contactsName
;
//联系人信息
rarr
.
baseInfo
.
contactsName
=
rs
.
delivery_info
.
contactsName
;
//联系人信息
}
}
if
(
rs
.
delivery_info
.
contactsPhone
&&
rs
.
delivery_info
.
contactsPhone
!=
'undefined'
)
{
if
(
rs
.
delivery_info
.
contactsPhone
&&
rs
.
delivery_info
.
contactsPhone
!=
'undefined'
)
{
rarr
.
contactsInfo
.
contactsPhone
=
system
.
decryptStr
(
rs
.
delivery_info
.
contactsPhone
)
;
//联系电话信息
rarr
.
contactsInfo
.
contactsPhone
=
rs
.
delivery_info
.
contactsPhone
;
//联系电话信息
rarr
.
baseInfo
.
contactsPhone
=
rarr
.
contactsInfo
.
contactsPhone
;
//联系电话信息
rarr
.
baseInfo
.
contactsPhone
=
rarr
.
contactsInfo
.
contactsPhone
;
//联系电话信息
}
}
...
@@ -614,7 +614,7 @@ class DeliverybillCtl extends CtlBase {
...
@@ -614,7 +614,7 @@ class DeliverybillCtl extends CtlBase {
baseInfo
.
contactsName
=
pobj
.
contactsInfo
.
contactsName
;
baseInfo
.
contactsName
=
pobj
.
contactsInfo
.
contactsName
;
}
}
if
(
pobj
.
contactsInfo
.
contactsPhone
&&
pobj
.
contactsInfo
.
contactsPhone
!=
'undefined'
)
{
if
(
pobj
.
contactsInfo
.
contactsPhone
&&
pobj
.
contactsInfo
.
contactsPhone
!=
'undefined'
)
{
baseInfo
.
contactsPhone
=
system
.
encryptStr
(
pobj
.
contactsInfo
.
contactsPhone
)
;
baseInfo
.
contactsPhone
=
pobj
.
contactsInfo
.
contactsPhone
;
}
}
var
parms
=
{
var
parms
=
{
"deliverNumber"
:
pobj
.
deliverNumber
"deliverNumber"
:
pobj
.
deliverNumber
...
@@ -835,7 +835,7 @@ class DeliverybillCtl extends CtlBase {
...
@@ -835,7 +835,7 @@ class DeliverybillCtl extends CtlBase {
}
}
if
(
pobj
.
baseInfo
.
contactsPhone
&&
pobj
.
baseInfo
.
contactsPhone
!=
'undefined'
)
{
if
(
pobj
.
baseInfo
.
contactsPhone
&&
pobj
.
baseInfo
.
contactsPhone
!=
'undefined'
)
{
pobj
.
baseInfo
.
contactsPhone
=
system
.
encryptStr
(
pobj
.
baseInfo
.
contactsPhone
)
;
pobj
.
baseInfo
.
contactsPhone
=
pobj
.
baseInfo
.
contactsPhone
;
pobj
.
cacheInfo
.
cmpContactInfo
.
contactsPhone
=
pobj
.
baseInfo
.
contactsPhone
;
pobj
.
cacheInfo
.
cmpContactInfo
.
contactsPhone
=
pobj
.
baseInfo
.
contactsPhone
;
}
}
if
(
pobj
.
baseInfo
.
virtualPrice
&&
pobj
.
baseInfo
.
virtualPrice
!=
'undefined'
)
{
//虚拟地址价格
if
(
pobj
.
baseInfo
.
virtualPrice
&&
pobj
.
baseInfo
.
virtualPrice
!=
'undefined'
)
{
//虚拟地址价格
...
...
ic-deliver/app/base/db/impl/bizchance/bizoptDao.js
View file @
2957efda
...
@@ -53,7 +53,7 @@ class BizoptDao extends Dao {
...
@@ -53,7 +53,7 @@ class BizoptDao extends Dao {
}
}
/*更新业务员信息*/
/*更新业务员信息*/
async
updateSalesmanInfoByDemandCode
(
qobj
,
t
)
{
async
updateSalesmanInfoByDemandCode
(
qobj
,
t
)
{
var
setobj
=
{};
var
setobj
=
{};
if
(
qobj
.
salesmanId
&&
qobj
.
salesmanId
!=
'undefined'
)
{
if
(
qobj
.
salesmanId
&&
qobj
.
salesmanId
!=
'undefined'
)
{
setobj
.
salesman_id
=
qobj
.
salesmanId
;
setobj
.
salesman_id
=
qobj
.
salesmanId
;
...
@@ -104,7 +104,7 @@ class BizoptDao extends Dao {
...
@@ -104,7 +104,7 @@ class BizoptDao extends Dao {
obj
.
business_info
.
contactsName
=
qobj
.
contactsName
;
obj
.
business_info
.
contactsName
=
qobj
.
contactsName
;
}
}
if
(
qobj
.
contactsPhone
&&
qobj
.
contactsPhone
!=
'undefined'
)
{
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'
)
{
if
(
qobj
.
serviceName
&&
qobj
.
serviceName
!=
'undefined'
)
{
obj
.
business_info
.
serviceName
=
qobj
.
serviceName
;
obj
.
business_info
.
serviceName
=
qobj
.
serviceName
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment