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
b3fc1390
Commit
b3fc1390
authored
Aug 03, 2020
by
王勇飞
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
gyq
parent
a0283552
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
12 deletions
+12
-12
center-manage/app/base/service/impl/common/channelhandlers/ali.js
+3
-3
center-manage/app/base/service/impl/common/channelhandlers/tx.js
+9
-9
No files found.
center-manage/app/base/service/impl/common/channelhandlers/ali.js
View file @
b3fc1390
...
@@ -517,8 +517,8 @@ class AliHandler {
...
@@ -517,8 +517,8 @@ class AliHandler {
}
}
//
客户
状态处理
//
交付单
状态处理
async
deliveryNotify
(
dtajson
)
{
async
deliveryNotify
(
d
a
tajson
)
{
try
{
try
{
var
cachestr
=
sha235
(
JSON
.
stringify
(
datajson
));
var
cachestr
=
sha235
(
JSON
.
stringify
(
datajson
));
var
cacheInfo
=
await
this
.
cacheManager
[
"AliCache"
].
getCache
(
cachestr
);
var
cacheInfo
=
await
this
.
cacheManager
[
"AliCache"
].
getCache
(
cachestr
);
...
@@ -535,7 +535,7 @@ class AliHandler {
...
@@ -535,7 +535,7 @@ class AliHandler {
var
requrl
=
this
.
icUrl
+
"/deliverybillCtl/updateFileAndStatusByDelivertCode"
;
var
requrl
=
this
.
icUrl
+
"/deliverybillCtl/updateFileAndStatusByDelivertCode"
;
var
params
=
{
var
params
=
{
"d"
:
{
"d"
:
{
"deliverNumber"
:
datajson
.
actionBody
.
orderN
um
,
"deliverNumber"
:
datajson
.
actionBody
.
orderN
o
,
"baseInfo"
:
{}
"baseInfo"
:
{}
// "deliverStatus": "closed",
// "deliverStatus": "closed",
// "statusReason": datajson.actionBody.refusalContent
// "statusReason": datajson.actionBody.refusalContent
...
...
center-manage/app/base/service/impl/common/channelhandlers/tx.js
View file @
b3fc1390
...
@@ -245,15 +245,15 @@ class TxHandler {
...
@@ -245,15 +245,15 @@ class TxHandler {
params
.
clerkOpcode
=
salesmanInfo
.
opath
;
params
.
clerkOpcode
=
salesmanInfo
.
opath
;
params
.
clerkId
=
salesmanInfo
.
userId
;
params
.
clerkId
=
salesmanInfo
.
userId
;
params
.
clerkName
=
salesmanInfo
.
userName
;
params
.
clerkName
=
salesmanInfo
.
userName
;
params
.
clerkPhone
=
salesmanInfo
.
mobile
;
//
params.clerkPhone = salesmanInfo.mobile;
params
.
costPrice
=
salesmanInfo
.
cost
;
params
.
costPrice
=
salesmanInfo
.
cost
;
params
.
servicerCode
=
salesmanInfo
.
compId
;
params
.
servicerCode
=
salesmanInfo
.
compId
;
params
.
baseInfo
.
clerkName
=
salesmanInfo
.
userName
;
params
.
baseInfo
.
clerkName
=
salesmanInfo
.
userName
;
params
.
baseInfo
.
clerkPhone
=
salesmanInfo
.
mobile
params
.
baseInfo
.
clerkPhone
=
salesmanInfo
.
mobile
}
}
if
(
!
params
.
service
Code
||
params
.
service
Code
==
'undefined'
)
{
if
(
!
params
.
service
rCode
||
params
.
servicer
Code
==
'undefined'
)
{
if
(
datajson
.
actionBody
.
orderSnapshot
.
servicerCode
&&
datajson
.
actionBody
.
orderSnapshot
.
servicerCode
!=
'undefined'
)
{
if
(
datajson
.
actionBody
.
orderSnapshot
.
servicerCode
&&
datajson
.
actionBody
.
orderSnapshot
.
servicerCode
!=
'undefined'
)
{
params
.
serviceCode
=
datajson
.
actionBody
.
orderSnapshot
.
servicerCode
;
//fuwushang id
params
.
service
r
Code
=
datajson
.
actionBody
.
orderSnapshot
.
servicerCode
;
//fuwushang id
}
}
}
}
if
(
datajson
.
actionBody
.
orderSnapshot
.
needNum
&&
datajson
.
actionBody
.
orderSnapshot
.
needNum
!=
'undefined'
)
{
if
(
datajson
.
actionBody
.
orderSnapshot
.
needNum
&&
datajson
.
actionBody
.
orderSnapshot
.
needNum
!=
'undefined'
)
{
...
@@ -262,12 +262,12 @@ class TxHandler {
...
@@ -262,12 +262,12 @@ class TxHandler {
if
(
datajson
.
actionBody
.
realTotalCost
&&
datajson
.
actionBody
.
realTotalCost
!=
'undefined'
)
{
if
(
datajson
.
actionBody
.
realTotalCost
&&
datajson
.
actionBody
.
realTotalCost
!=
'undefined'
)
{
params
.
sellingPrice
=
datajson
.
actionBody
.
realTotalCost
;
//价格
params
.
sellingPrice
=
datajson
.
actionBody
.
realTotalCost
;
//价格
}
}
if
(
datajson
.
actionBody
.
orderSnapshot
.
channelSource
&&
datajson
.
actionBody
.
orderSnapshot
.
channelSource
!=
'undefined'
)
{
//
if (datajson.actionBody.orderSnapshot.channelSource && datajson.actionBody.orderSnapshot.channelSource != 'undefined') {
params
.
channelSource
=
datajson
.
actionBody
.
orderSnapshot
.
channelSource
;
//渠道名称
//
params.channelSource = datajson.actionBody.orderSnapshot.channelSource;//渠道名称
}
//
}
if
(
datajson
.
actionBody
.
orderSnapshot
.
channelNumber
&&
datajson
.
actionBody
.
orderSnapshot
.
channelNumber
!=
'undefined'
)
{
//
if (datajson.actionBody.orderSnapshot.channelNumber && datajson.actionBody.orderSnapshot.channelNumber != 'undefined') {
params
.
channelNumber
=
datajson
.
actionBody
.
orderSnapshot
.
channelNumber
;
//渠道编码
//
params.channelNumber = datajson.actionBody.orderSnapshot.channelNumber;//渠道编码
}
//
}
if
(
datajson
.
actionBody
.
orderSnapshot
.
hasOwnProperty
(
"isWhether"
))
{
if
(
datajson
.
actionBody
.
orderSnapshot
.
hasOwnProperty
(
"isWhether"
))
{
if
(
datajson
.
actionBody
.
orderSnapshot
.
isWhether
===
true
||
datajson
.
actionBody
.
orderSnapshot
.
isWhether
===
"yes"
)
{
if
(
datajson
.
actionBody
.
orderSnapshot
.
isWhether
===
true
||
datajson
.
actionBody
.
orderSnapshot
.
isWhether
===
"yes"
)
{
params
.
baseInfo
.
isWhether
=
"yes"
;
//是否刻章
params
.
baseInfo
.
isWhether
=
"yes"
;
//是否刻章
...
...
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