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
a9a437b9
Commit
a9a437b9
authored
Sep 30, 2020
by
linboxuan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update 2.4
parent
ea8805bf
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
6 deletions
+16
-6
center-channel/app/base/api/impl/opreceive/edi.js
+4
-1
center-channel/app/base/service/impl/utilsSve/utilsNeedSve.js
+12
-5
No files found.
center-channel/app/base/api/impl/opreceive/edi.js
View file @
a9a437b9
...
...
@@ -38,7 +38,10 @@ class edi extends APIBase {
}
break
;
case
"soulutionFeebackAliEsp"
:
opResult
=
await
this
.
utilsNeedSve
.
soulutionFeebackAliEsp
(
pobj
,
pobj
.
actionBody
);
// opResult = await this.utilsNeedSve.ediNotify(pobj, pobj.actionBody);
// opResult = await this.utilsNeedSve.soulutionFeebackAliEsp(pobj,pobj.actionBody);
pobj
.
actionType
=
"receiveFeedback"
opResult
=
await
this
.
centerorderSve
.
reqCenterOrderApi
(
pobj
);
break
;
default
:
opResult
=
system
.
getResult
(
null
,
"action_type参数错误"
);
...
...
center-channel/app/base/service/impl/utilsSve/utilsNeedSve.js
View file @
a9a437b9
...
...
@@ -1039,7 +1039,7 @@ class UtilsNeedService extends AppServiceBase {
actionBody
:
{
area
:
needInfoResult
.
data
.
city
,
city
:
needInfoResult
.
data
.
city
,
// regType: pobj.actionBody.regType
,//1
regType
:
"esp.wangwen"
,
//1
orderNo
:
actionBody
.
bizId
,
orderPrice
:
Number
(
pobj
.
actionBody
.
orderPrice
/
100
),
phone
:
needInfoResult
.
data
.
publishMobile
,
...
...
@@ -1126,8 +1126,9 @@ class UtilsNeedService extends AppServiceBase {
},
appInfo
:
pobj
.
appInfo
}
console
.
log
(
deliveryObj
)
this
.
utilsPushSve
.
aliBusiness2Delivery
(
deliveryObj
,
"pushDeliveryOrder"
);
if
(
rtn
.
status
==
0
&&
actionBody
.
status
!=
1
&&
actionBody
.
status
!=
2
&&
rtn
.
data
)
{
if
(
rtn
.
status
==
0
&&
actionBody
.
operationType
!=
""
&&
actionBody
.
status
!=
2
&&
rtn
.
data
)
{
var
tmpObj
=
{
actionBody
:
{
orderNo
:
rtn
.
data
.
orderNo
,
...
...
@@ -1136,6 +1137,7 @@ class UtilsNeedService extends AppServiceBase {
},
appInfo
:
pobj
.
appInfo
}
console
.
log
(
tmpObj
)
this
.
utilsPushSve
.
aliBusiness2Delivery
(
tmpObj
,
"pushDeliveryStatusNotify"
);
pobj
.
actionBody
.
orderNo
=
rtn
.
data
.
orderNo
;
if
(
actionBody
.
operationType
==
"ABC_CLOSE_PRODUCE"
)
{
...
...
@@ -1151,15 +1153,20 @@ class UtilsNeedService extends AppServiceBase {
}
/**
* 2020 0928 lin 新增 阿里文网文 服务商侧提供接口2.
2 关闭需求
通知服务商
* 2020 0928 lin 新增 阿里文网文 服务商侧提供接口2.
4 ⽤户⽅案反馈
通知服务商
* @param {*} pobj
* @param {*} actionBody
*/
async
soulutionFeebackAliEsp
(
pobj
,
actionBody
)
{
// 待定
return
system
.
getResultSuccess
();
solutionBizId
note
if
(
actionBody
.
operateType
==
"INVALID"
)
{
var
url
=
settings
.
centerOrderUrl
()
+
"action/ediApi/springBoard"
;
var
rtn
=
await
this
.
restPostUrl
(
pobj
,
url
);
}
return
rtn
}
}
module
.
exports
=
UtilsNeedService
;
...
...
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