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
4fef0782
Commit
4fef0782
authored
Mar 17, 2022
by
宋毅
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
处理百度
parent
932cf2ef
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
16 deletions
+17
-16
center-channel/app/base/service/impl/common/baseCenterOrderSve.js
+0
-1
center-channel/app/base/service/impl/common/regCenterOrderSve.js
+17
-15
No files found.
center-channel/app/base/service/impl/common/baseCenterOrderSve.js
View file @
4fef0782
...
...
@@ -175,7 +175,6 @@ class BaseCenterOrderService extends AppServiceBase {
if
(
needsolution
.
channelSolutionNo
)
{
pushObj
[
"BizId"
]
=
needsolution
.
channelSolutionNo
;
}
console
.
log
(
'pushObj++'
,
pushObj
);
var
pushIcpSolutionRes
=
await
this
.
pushEnameIcpSolution
(
pushObj
,
needsolution
.
solutionNo
,
pobj
.
appInfo
,
self
);
}
this
.
logCtl
.
info
({
...
...
center-channel/app/base/service/impl/common/regCenterOrderSve.js
View file @
4fef0782
...
...
@@ -7,6 +7,7 @@ const regCfg = require("../../../api/impl/ic/regCfg");
class
RegCenterOrderService
extends
AppServiceBase
{
constructor
()
{
super
();
this
.
execClientNew
=
system
.
getObject
(
"util.execClientNew"
);
this
.
centerOrderUrl
=
settings
.
centerOrderUrl
();
this
.
execClient
=
system
.
getObject
(
"util.execClient"
);
this
.
cacheManager
=
system
.
getObject
(
"db.common.cacheManager"
);
...
...
@@ -22,7 +23,7 @@ class RegCenterOrderService extends AppServiceBase {
704
:
'ENGRAVING'
,
//刻章环节
705
:
'SUCCESS'
,
//已完成
706
:
'ACTIVE'
//服务中
}
}
};
//调用center-order
...
...
@@ -162,7 +163,7 @@ class RegCenterOrderService extends AppServiceBase {
var
salesmanObj
=
{
appInfo
:
pobj
.
appInfo
,
actionType
:
"addRegSalesmanInfo"
,
//添加业务员信息
actionBody
:
{
salesmanInfo
:
salesmanInfo
,
orderNo
:
orderrtn
.
data
.
orderNo
}
actionBody
:
{
salesmanInfo
:
salesmanInfo
,
orderNo
:
orderrtn
.
data
.
orderNo
}
};
var
url
=
settings
.
centerOrderUrl
()
+
"action/regapi/springBoard"
;
var
addRes
=
await
this
.
execClient
.
execPost
(
salesmanObj
,
url
);
...
...
@@ -548,7 +549,10 @@ class RegCenterOrderService extends AppServiceBase {
note
:
pobj
.
actionBody
.
note
}
// 推送baidu
var
tmpResult
=
await
this
.
baiduRegClient
.
baiduReqbyget
({
path
:
"/v1/provider/demand?close="
,
reqbody
:
pushObj
});
var
tmpResult
=
await
this
.
baiduRegClient
.
baiduReqbyget
({
path
:
"/v1/provider/demand?close="
,
reqbody
:
pushObj
});
//查看日志
this
.
logCtl
.
info
({
appid
:
pobj
.
appInfo
?
pobj
.
appInfo
.
uapp_id
||
""
:
""
,
...
...
@@ -574,11 +578,11 @@ class RegCenterOrderService extends AppServiceBase {
//提交交付信息/修改订单状态
async
regUpdateOrderStatus
(
pobj
)
{
var
res
=
await
this
.
reqCenterOrderApi
(
pobj
,
"action/regapi/springBoard"
)
;
console
.
log
(
'推送交付信息/修改订单状态res+++++'
,
res
)
console
.
log
(
'推送交付信息/修改订单状态++pobj+++'
,
pobj
)
var
deliverContent
=
{}
var
pushObj
=
{}
let
self
=
this
;
let
res
=
await
this
.
reqCenterOrderApi
(
pobj
,
"action/regapi/springBoard"
);
this
.
execClientNew
.
execLogs
(
"regUpdateOrderStatus-reqCenterOrderApi:"
,
pobj
,
"center-channel-regUpdateOrderStatus"
,
res
,
null
);
let
deliverContent
=
{}
let
pushObj
=
{}
if
(
res
&&
res
.
status
==
0
&&
res
.
data
)
{
if
(
pobj
.
actionBody
.
deliverContent
)
{
if
(
pobj
.
actionBody
.
deliverContent
.
companyInfo
&&
pobj
.
actionBody
.
deliverContent
.
companyInfo
.
serviceArea
)
{
...
...
@@ -624,7 +628,7 @@ class RegCenterOrderService extends AppServiceBase {
consultType
:
pobj
.
actionBody
.
consultType
,
//需求类型: GSREG:正常原始公司注册; QYJYTC1:企业经营套餐1; QYJYTC2:企业经营套餐2;
productType
:
pobj
.
actionBody
.
productType
,
//套餐包含业的务类型: 不传为原始公司注册
startTime
:
pobj
.
actionBody
.
startTime
||
null
,
//开始时间
endTime
:
pobj
.
actionBody
.
endTime
||
null
//结束时间
endTime
:
pobj
.
actionBody
.
endTime
||
null
//结束时间
};
}
else
{
pushObj
=
{
...
...
@@ -636,18 +640,16 @@ class RegCenterOrderService extends AppServiceBase {
};
}
}
var
self
=
this
;
let
baiduParams
=
{
path
:
"/v1/provider/comreg"
,
reqbody
:
pushObj
}
//推送交付信息/修改订单状态
var
baidu
=
await
self
.
baiduRegClient
.
baiduReqbyget
({
path
:
"/v1/provider/comreg"
,
reqbody
:
pushObj
});
console
.
log
(
'推送交付信息/修改订单状态baidu+++'
,
baidu
)
console
.
log
(
'推送交付信息/修改订单状态pushObj+++'
,
pushObj
)
let
baidu
=
await
self
.
baiduRegClient
.
baiduReqbyget
(
baiduParams
);
this
.
execClientNew
.
execLogs
(
"regUpdateOrderStatus-baiduReqbyget:"
,
baiduParams
,
"center-channel-regUpdateOrderStatus"
,
baidu
,
null
);
//todo 推送云服订单所有交付单状态为完成时订单状态为完成的判断
// if(res.data.deliveryFlag && res.data.deliveryFlag2 && 200 == res.data.deliveryFlag == res.data.deliveryFlag2){
// await this.utilsPushSve.business2Channel("蜂擎参数", "更新订单完成状态的方法");
// }
return
baidu
.
data
}
console
.
log
(
'rsrsr++++------------++++'
,
res
)
}
return
res
}
...
...
@@ -672,7 +674,7 @@ class RegCenterOrderService extends AppServiceBase {
reqbody
:
pushObj
});
if
(
ress
.
data
.
status
!=
0
)
{
return
system
.
getResultFail
(
-
1
,
ress
.
data
.
msg
)
return
system
.
getResultFail
(
-
1
,
ress
.
data
.
msg
)
}
console
.
log
(
"regWriteCommunicationLog---------"
,
ress
)
}
...
...
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