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
5256b5ce
Commit
5256b5ce
authored
Jul 15, 2020
by
宋毅
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
tj
parent
a648f236
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
39 additions
and
1 deletions
+39
-1
brg-user-center/app/base/service/impl/order/orderDeliverySve.js
+39
-1
brg-user-center/app/config/platform.js
+0
-0
No files found.
brg-user-center/app/base/service/impl/order/orderDeliverySve.js
View file @
5256b5ce
...
...
@@ -184,6 +184,15 @@ class OrderDeliveryService extends ServiceBase {
smsMessageBody
=
smsMessageBody
.
replace
(
/{timeRemaining}/g
,
days
);
}
}
if
(
orderdetail
.
user_id
){
//用户账号
smsMessageBody
=
smsMessageBody
.
replace
(
/{userId}/g
,
orderdetail
.
user_id
);
}
if
(
orderdetail
.
user_name
){
//用户昵称
smsMessageBody
=
smsMessageBody
.
replace
(
/{userName}/g
,
orderdetail
.
user_name
);
}
if
(
orderdetail
.
region_name
){
//地区
smsMessageBody
=
smsMessageBody
.
replace
(
/{area}/g
,
orderdetail
.
region_name
);
}
var
deliverContent
=
orderdetail
.
deliver_content
;
if
(
deliverContent
){
//注册园区
...
...
@@ -215,6 +224,15 @@ class OrderDeliveryService extends ServiceBase {
if
(
productTypeOne
){
//产品一类名称
smsMessageBody
=
smsMessageBody
.
replace
(
/{productType}/g
,
productTypeOne
);
}
if
(
orderdetail
.
end_time
){
//过期时间
smsMessageBody
=
smsMessageBody
.
replace
(
/{expirationDate}/g
,
orderdetail
.
end_time
);
var
m1
=
moment
(
new
Date
());
var
m2
=
moment
(
new
Date
(
orderdetail
.
end_time
));
var
days
=
m2
.
diff
(
m1
,
'day'
);
if
(
days
&&
days
>=
0
){
//剩余天数
smsMessageBody
=
smsMessageBody
.
replace
(
/{timeRemaining}/g
,
days
);
}
}
var
deliverContent
=
orderdetail
.
deliver_content
;
if
(
deliverContent
){
//邮寄信息
...
...
@@ -274,6 +292,15 @@ class OrderDeliveryService extends ServiceBase {
webinfoMessageBody
=
webinfoMessageBody
.
replace
(
/{timeRemaining}/g
,
days
);
}
}
if
(
orderdetail
.
user_id
){
//用户账号
webinfoMessageBody
=
webinfoMessageBody
.
replace
(
/{userId}/g
,
orderdetail
.
user_id
);
}
if
(
orderdetail
.
user_name
){
//用户昵称
webinfoMessageBody
=
webinfoMessageBody
.
replace
(
/{userName}/g
,
orderdetail
.
user_name
);
}
if
(
orderdetail
.
region_name
){
//地区
webinfoMessageBody
=
webinfoMessageBody
.
replace
(
/{area}/g
,
orderdetail
.
region_name
);
}
var
deliverContent
=
orderdetail
.
deliver_content
;
if
(
deliverContent
){
//注册园区
...
...
@@ -298,6 +325,15 @@ class OrderDeliveryService extends ServiceBase {
}
if
(
webinfoMessageBody
){
webinfoMessageBody
=
webinfoMessageBody
.
replace
(
/{productName}/g
,
productTypeName
);
if
(
orderdetail
.
end_time
){
//过期时间
webinfoMessageBody
=
webinfoMessageBody
.
replace
(
/{expirationDate}/g
,
orderdetail
.
end_time
);
var
m1
=
moment
(
new
Date
());
var
m2
=
moment
(
new
Date
(
orderdetail
.
end_time
));
var
days
=
m2
.
diff
(
m1
,
'day'
);
if
(
days
&&
days
>=
0
){
//剩余天数
webinfoMessageBody
=
webinfoMessageBody
.
replace
(
/{timeRemaining}/g
,
days
);
}
}
if
(
orderdetail
.
user_id
){
//用户账号
webinfoMessageBody
=
webinfoMessageBody
.
replace
(
/{userId}/g
,
orderdetail
.
user_id
);
}
...
...
@@ -364,7 +400,9 @@ class OrderDeliveryService extends ServiceBase {
var
smsParams
=
await
this
.
packageSmsTemplates
(
orderdetail
,
status
,
productType
,
product_type_name
,
product_type_one_name
);
var
webinfoParams
=
await
this
.
packageWebinfoTemplates
(
orderdetail
,
status
,
productType
,
product_type_name
,
product_type_one_name
);
if
(
smsParams
&&
webinfoParams
){
await
this
.
utilsMsgSendSve
.
sendMessageVerify
({
phoneList
:[
smsParams
],
subAccountList
:[
webinfoParams
]});
//发送消息通知
console
.
log
(
JSON
.
stringify
(
smsParams
),
"smsParams++++++++++++++++++++++++++++++"
);
console
.
log
(
JSON
.
stringify
(
webinfoParams
),
"webinfoParams------------------------"
);
// await this.utilsMsgSendSve.sendMessageVerify({phoneList:[smsParams],subAccountList:[webinfoParams]});//发送消息通知
}
return
;
}
...
...
brg-user-center/app/config/platform.js
View file @
5256b5ce
This diff is collapsed.
Click to expand it.
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