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
da2d0454
Commit
da2d0454
authored
Jun 08, 2022
by
宋毅
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
注释去除
parent
6bdce20b
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
21 deletions
+17
-21
center-channel/app/base/service/impl/common/gatewaypushlogSve.js
+7
-4
center-channel/app/base/service/impl/receiveSve/icpNeedSve.js
+2
-2
center-channel/app/base/service/impl/receiveSve/icpOrderSve.js
+8
-15
No files found.
center-channel/app/base/service/impl/common/gatewaypushlogSve.js
View file @
da2d0454
...
...
@@ -62,7 +62,7 @@ class GatewaypushlogService extends ServiceBase {
}
}
}
return
system
.
getResultSuccess
();
return
system
.
getResultSuccess
(
null
);
}
catch
(
error
)
{
this
.
dingClient
.
gatewayPushError
({
message
:
"Exception"
,
api
:
"center-channel/taskAliIcapi"
,
error
})
...
...
@@ -79,13 +79,16 @@ class GatewaypushlogService extends ServiceBase {
return
system
.
getResult
(
null
,
"接口对应的interface_method方法解析有误"
);
}
let
params
=
[
JSON
.
parse
(
item
.
requestjson
)];
console
.
log
(
"params.............................................."
,
JSON
.
stringify
(
params
))
//
console.log("params..............................................", JSON.stringify(params))
let
doRes
=
await
invokeObj
[
item
.
interface_method
].
apply
(
invokeObj
,
params
);
console
.
log
(
"newTaskHandle.............................................."
,
JSON
.
stringify
(
doRes
))
//
console.log("newTaskHandle..............................................", JSON.stringify(doRes))
if
(
doRes
.
status
==
0
)
{
item
.
pushStatus
=
"yts"
;
this
.
update
(
item
);
}
else
{
item
.
error
=
JSON
.
stringify
(
doRes
);
item
.
pushtimes
+=
1
;
}
this
.
update
(
item
);
return
doRes
;
}
...
...
center-channel/app/base/service/impl/receiveSve/icpNeedSve.js
View file @
da2d0454
...
...
@@ -9,7 +9,7 @@ class IcpNeedService extends AppServiceBase {
}
async
submitNeed
(
pobj
)
{
console
.
log
(
"pobj+++++++++++++++++++++++++"
,
JSON
.
stringify
(
pobj
))
//
console.log("pobj+++++++++++++++++++++++++", JSON.stringify(pobj))
if
(
!
pobj
.
intentionBizId
)
{
return
system
.
getResult
(
null
,
"actionBody.intentionBizId can not be empty,6000001"
);
}
...
...
@@ -99,7 +99,7 @@ class IcpNeedService extends AppServiceBase {
level
:
"A"
}
}
console
.
log
(
"submitNeed--------------------------submitNeedParams----"
,
JSON
.
stringify
(
submitNeedParams
));
//
console.log("submitNeed--------------------------submitNeedParams----", JSON.stringify(submitNeedParams));
let
reqUrl
=
settings
.
centerOrderUrl
()
+
"action/need/springBoard"
;
let
result
=
await
this
.
restPostUrl
(
submitNeedParams
,
reqUrl
);
if
(
result
.
status
==
0
)
{
...
...
center-channel/app/base/service/impl/receiveSve/icpOrderSve.js
View file @
da2d0454
...
...
@@ -36,7 +36,7 @@ class IcpOrderService extends AppServiceBase {
if
(
productItem
.
status
!=
0
)
{
return
system
.
getResultFail
(
-
5010
,
"产品查询失败,6100002"
);
}
console
.
log
(
"productItem......................"
,
JSON
.
stringify
(
productItem
))
//
console.log("productItem......................", JSON.stringify(productItem))
pobj
.
userInfo
=
{
channel_userid
:
pobj
.
userName
||
pobj
.
phone
,
mobile
:
pobj
.
phone
||
pobj
.
mobile
}
pobj
.
actionBody
=
{
...
...
@@ -58,7 +58,7 @@ class IcpOrderService extends AppServiceBase {
}
}
let
orderItem
=
await
this
.
utilsOrderSve
.
addOrder
(
pobj
,
pobj
.
actionBody
);
console
.
log
(
"orderItem........................................................."
,
JSON
.
stringify
(
orderItem
))
//
console.log("orderItem.........................................................", JSON.stringify(orderItem))
if
(
orderItem
.
status
!=
0
&&
orderItem
.
status
!=
-
1
)
{
return
system
.
getResultFail
(
-
5010
,
"订单创建失败,6100003"
);
}
...
...
@@ -69,7 +69,7 @@ class IcpOrderService extends AppServiceBase {
pobj
.
actionBody
.
companyName
=
pobj
.
CompanyName
||
''
;
pobj
.
actionBody
.
channelSolutionNo
=
pobj
.
actionBody
.
channelOrder
.
channelOrderNo
;
pobj
.
actionBody
.
channelSolutionNo
=
pobj
.
actionBody
.
channelOrder
.
channelOrderNo
;
console
.
log
(
"receiveSolutionPayInfoNew..............................pobj........................"
,
JSON
.
stringify
(
pobj
))
//
console.log("receiveSolutionPayInfoNew..............................pobj........................", JSON.stringify(pobj))
pobj
.
actionType
=
"receiveSolutionPayInfoNew"
;
let
url
=
settings
.
centerOrderUrl
()
+
"action/icapi/springBoard"
;
let
solutionRes
=
await
this
.
execClient
.
execPost
(
pobj
,
url
);
...
...
@@ -130,7 +130,7 @@ class IcpOrderService extends AppServiceBase {
},
appInfo
:
pobj
.
appInfo
}
console
.
log
(
"yfObj......................................................"
,
JSON
.
stringify
(
yfObj
))
//
console.log("yfObj......................................................", JSON.stringify(yfObj))
let
yunfuPushRes
=
await
this
.
utilsPushSve
.
business2Channel
(
yfObj
,
"pushOrderICPBusinessNew"
);
let
deliveryObj
=
{
actionBody
:
{
...
...
@@ -160,7 +160,7 @@ class IcpOrderService extends AppServiceBase {
}
}
if
(
pobj
.
actionBody
.
isDirectBuy
&&
pobj
.
actionBody
.
isDirectBuy
==
1
)
{
console
.
log
(
"deliveryObj......................................................"
,
JSON
.
stringify
(
deliveryObj
))
//
console.log("deliveryObj......................................................", JSON.stringify(deliveryObj))
this
.
utilsPushSve
.
business2Channel
(
deliveryObj
,
"pushDeliveryOrder"
);
}
return
system
.
getResultSuccess
(
null
);
...
...
@@ -174,16 +174,10 @@ class IcpOrderService extends AppServiceBase {
pobj
.
actionType
=
"icpOrderClose"
;
let
url
=
settings
.
centerOrderUrl
()
+
"action/qcapi/springBoard"
;
let
rtn
=
await
this
.
restPostUrl
(
pobj
,
url
);
console
.
log
(
"rtn....................."
,
rtn
)
//
console.log("rtn.....................", rtn)
if
(
rtn
.
status
!=
0
||
!
rtn
.
data
)
{
return
system
.
getResultFail
(
-
5010
,
"订单关闭失败,6100006"
);
}
// if (rtn.status == 0 && rtn.data) {
// pobj.actionType = "channeldelOrder";
// let orderRes = await this.utilsOrderSve.delOrder(pobj, pobj.actionBody);
// if (orderRes.status < 0) {
// return system.getResultFail(-5022, "订单关闭失败,6100007");
// }
let
tmpObj
=
{
actionBody
:
{
orderNo
:
rtn
.
data
.
orderNo
,
...
...
@@ -206,5 +200,4 @@ class IcpOrderService extends AppServiceBase {
}
}
module
.
exports
=
IcpOrderService
;
\ No newline at end of file
module
.
exports
=
IcpOrderService
;
\ No newline at end of file
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