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
0b0b22af
Commit
0b0b22af
authored
Nov 05, 2020
by
任晓松
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
1a708ae3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
23 additions
and
10 deletions
+23
-10
center-channel/app/base/service/impl/utilsSve/utilsOrderSve.js
+18
-7
center-channel/app/base/service/impl/utilsSve/utilsPushSve.js
+4
-2
center-channel/app/config/settings.js
+1
-1
No files found.
center-channel/app/base/service/impl/utilsSve/utilsOrderSve.js
View file @
0b0b22af
...
...
@@ -936,7 +936,8 @@ class UtilsOrderService extends AppServiceBase {
uapp_id
:
appInfo
.
uapp_id
,
uapp_key
:
appInfo
.
uapp_key
,
app_code
:
appInfo
.
app_code
,
app_name
:
appInfo
.
app_name
app_name
:
appInfo
.
app_name
,
contact_mobile
:
appInfo
.
contact_mobile
};
opOrderResult
.
data
.
userInfo
=
{
channel_userid
:
opOrderResult
.
data
.
order_info
.
channelUserId
,
...
...
@@ -954,9 +955,18 @@ class UtilsOrderService extends AppServiceBase {
actionBody
:
opOrderResult
.
data
}
// 推送
this
.
utilsPushSve
.
pushBusInfo
(
pobj
,
"pushOrder"
,
0
);
let
yfRet
=
await
this
.
utilsPushSve
.
pushBusInfo
(
pobj
,
"pushOrder"
,
0
);
if
(
yfRet
.
status
!=
0
){
return
yfRet
;
}
if
([
'icpsq'
,
'edisq'
].
includes
(
opOrderResult
.
data
.
product_info
.
channel_item_code
))
{
//创建方案
pobj
.
salesmanInfo
=
{
"salesmanId"
:
yfRet
.
data
.
orderList
[
0
].
operator
||
""
,
"salesmanName"
:
yfRet
.
data
.
orderList
[
0
].
operatorName
||
""
,
"salesmanMobile"
:
yfRet
.
data
.
orderList
[
0
].
phone
||
""
,
"salesmanChannelId"
:
yfRet
.
data
.
orderList
[
0
].
channelUserId
||
""
}
let
pushRet
=
await
this
.
packagingPushData
(
pobj
);
if
(
pushRet
.
status
!=
0
)
{
throw
new
Error
(
'推送失败'
)
...
...
@@ -997,7 +1007,7 @@ class UtilsOrderService extends AppServiceBase {
"CompanyName"
:
""
,
"licenseType"
:
""
,
"solutionCity"
:
ab
.
product_info
.
price_item
.
price_desc
,
"solutionPrice"
:
ab
.
order_info
.
totalSum
,
"solutionPrice"
:
Number
(
ab
.
order_info
.
totalSum
)
*
100
,
"channelTypeCode"
:
ab
.
product_info
.
service_business_code
,
"companyLocation"
:
ab
.
product_info
.
price_item
.
price_desc
}
...
...
@@ -1005,14 +1015,15 @@ class UtilsOrderService extends AppServiceBase {
"status"
:
"USER_PAY_PRODUCE"
,
"bizType"
:
ab
.
product_info
.
channel_item_code
,
"solution"
:
solution
,
"totalSum"
:
ab
.
order_info
.
totalSum
,
"totalSum"
:
Number
(
ab
.
order_info
.
totalSum
)
*
100
,
"typeCode"
:
ab
.
product_info
.
channel_item_code
,
"typeName"
:
ab
.
product_info
.
channel_item_name
,
"statusName"
:
"⽤户⽀付"
,
"customerInfo"
:
{
"publishName"
:
""
,
"publishMobile"
:
""
}
"publishName"
:
ab
.
order_contact
.
contactName
||
""
,
"publishMobile"
:
ab
.
order_contact
.
mobile
||
""
},
"salesmanInfo"
:
pobj
.
salesmanInfo
}
//推送数据
let
pushObj
=
{
...
...
center-channel/app/base/service/impl/utilsSve/utilsPushSve.js
View file @
0b0b22af
...
...
@@ -63,6 +63,7 @@ class UtilsPushService extends AppServiceBase {
return
system
.
getResult
(
null
,
"暂无【"
+
opType
+
"】的推送配置"
);
}
var
self
=
this
;
let
result
;
if
(
interface_list_temp
&&
interface_list_temp
.
length
==
1
){
const
element
=
interface_list_temp
[
0
];
var
reflexActionRes
=
await
self
.
reflexAction
(
element
,
opType
,
pobj
,
isDelProductInfo
);
...
...
@@ -70,10 +71,11 @@ class UtilsPushService extends AppServiceBase {
}
else
{
for
(
let
index
=
0
;
index
<
interface_list_temp
.
length
;
index
++
)
{
const
element
=
interface_list_temp
[
index
];
await
self
.
reflexAction
(
element
,
opType
,
pobj
,
isDelProductInfo
);
result
=
await
self
.
reflexAction
(
element
,
opType
,
pobj
,
isDelProductInfo
);
}
return
result
;
}
}
async
againPushBusInfo
(
pobj
)
{
//再次推送业务总入口-重试
...
...
center-channel/app/config/settings.js
View file @
0b0b22af
...
...
@@ -246,7 +246,7 @@ var settings = {
if
(
this
.
env
==
"dev"
)
{
return
"http://180.163.239.98:38085/"
// 360测试环境
}
else
{
return
"http
://180.163.239.98:38085
/"
//
return
"http
s://console.e.360.cn
/"
//
}
},
aliUappId
:
function
()
{
...
...
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