Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
O
order-group
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
jenkins
order-group
Commits
22bb1769
Commit
22bb1769
authored
Jan 09, 2020
by
shuhu.hou@freemud.cn
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
微信订阅消息版本升级
parent
c76c89be
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
10 deletions
+10
-10
order-application-service/pom.xml
+2
-2
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
+8
-8
No files found.
order-application-service/pom.xml
View file @
22bb1769
...
@@ -65,7 +65,7 @@
...
@@ -65,7 +65,7 @@
<dependency>
<dependency>
<groupId>
com.freemud.sdk.api.assortment
</groupId>
<groupId>
com.freemud.sdk.api.assortment
</groupId>
<artifactId>
assortment-messagepush-sdk
</artifactId>
<artifactId>
assortment-messagepush-sdk
</artifactId>
<version>
2.5.
1-SNAPSHOT
</version>
<version>
2.5.
2.RELEASE
</version>
<exclusions>
<exclusions>
<exclusion>
<exclusion>
<groupId>
cn.freemud.commons
</groupId>
<groupId>
cn.freemud.commons
</groupId>
...
@@ -109,7 +109,7 @@
...
@@ -109,7 +109,7 @@
<dependency>
<dependency>
<artifactId>
assortment-data-manager
</artifactId>
<artifactId>
assortment-data-manager
</artifactId>
<groupId>
com.freemud.sdk.api.assortment
</groupId>
<groupId>
com.freemud.sdk.api.assortment
</groupId>
<version>
3.
5.RELEASE
</version>
<version>
3.
9.7-SNAPSHOT
</version>
</dependency>
</dependency>
<dependency>
<dependency>
<groupId>
cn.freemud.commons
</groupId>
<groupId>
cn.freemud.commons
</groupId>
...
...
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
View file @
22bb1769
...
@@ -85,7 +85,7 @@ import com.freemud.application.sdk.api.structure.request.PushMessageNoticeDto;
...
@@ -85,7 +85,7 @@ import com.freemud.application.sdk.api.structure.request.PushMessageNoticeDto;
import
com.freemud.application.sdk.api.structure.service.MessageCenterClient
;
import
com.freemud.application.sdk.api.structure.service.MessageCenterClient
;
import
com.freemud.sdk.api.assortment.message.config.MessageOfficialRefundPushMqConfig
;
import
com.freemud.sdk.api.assortment.message.config.MessageOfficialRefundPushMqConfig
;
import
com.freemud.sdk.api.assortment.message.entity.MpTemplateMsg
;
import
com.freemud.sdk.api.assortment.message.entity.MpTemplateMsg
;
import
com.freemud.sdk.api.assortment.message.entity.
TemplateKeyword
;
import
com.freemud.sdk.api.assortment.message.entity.
MpTemplateMsgDataValue
;
import
com.freemud.sdk.api.assortment.message.enums.MessageEventType
;
import
com.freemud.sdk.api.assortment.message.enums.MessageEventType
;
import
com.freemud.sdk.api.assortment.message.request.MessagePushOrderTemplateRequest
;
import
com.freemud.sdk.api.assortment.message.request.MessagePushOrderTemplateRequest
;
import
com.freemud.sdk.api.assortment.message.request.MessageTemplateRequest
;
import
com.freemud.sdk.api.assortment.message.request.MessageTemplateRequest
;
...
@@ -2085,20 +2085,20 @@ public class OrderServiceImpl implements Orderservice {
...
@@ -2085,20 +2085,20 @@ public class OrderServiceImpl implements Orderservice {
String
orderId
=
orderBean
.
getOid
();
String
orderId
=
orderBean
.
getOid
();
MpTemplateMsg
template
=
new
MpTemplateMsg
();
MpTemplateMsg
template
=
new
MpTemplateMsg
();
MpTemplateMsg
.
TemplateMsgData
data
=
new
MpTemplateMsg
.
TemplateMsgData
();
MpTemplateMsg
.
TemplateMsgData
data
=
new
MpTemplateMsg
.
TemplateMsgData
();
TemplateKeyword
first
=
new
TemplateKeyword
();
MpTemplateMsgDataValue
first
=
new
MpTemplateMsgDataValue
();
first
.
setValue
(
"用户申请退款"
);
first
.
setValue
(
"用户申请退款"
);
TemplateKeyword
keyword1
=
new
TemplateKeyword
();
MpTemplateMsgDataValue
keyword1
=
new
MpTemplateMsgDataValue
();
keyword1
.
setValue
(
orderId
);
keyword1
.
setValue
(
orderId
);
TemplateKeyword
keyword2
=
new
TemplateKeyword
();
MpTemplateMsgDataValue
keyword2
=
new
MpTemplateMsgDataValue
();
Double
amount
=
orderBean
.
getAmount
()
/
100.0
D
;
Double
amount
=
orderBean
.
getAmount
()
/
100.0
D
;
keyword2
.
setValue
(
amount
.
toString
()+
" 元"
);
keyword2
.
setValue
(
amount
.
toString
()+
" 元"
);
TemplateKeyword
keyword3
=
new
TemplateKeyword
();
MpTemplateMsgDataValue
keyword3
=
new
MpTemplateMsgDataValue
();
keyword3
.
setValue
(
orderBean
.
getGmtPay
()
==
null
?
""
:
DateUtil
.
convert2String
(
new
Date
(
orderBean
.
getGmtPay
()),
"yyyy-MM-dd HH:mm:ss"
));
keyword3
.
setValue
(
orderBean
.
getGmtPay
()
==
null
?
""
:
DateUtil
.
convert2String
(
new
Date
(
orderBean
.
getGmtPay
()),
"yyyy-MM-dd HH:mm:ss"
));
TemplateKeyword
keyword4
=
new
TemplateKeyword
();
MpTemplateMsgDataValue
keyword4
=
new
MpTemplateMsgDataValue
();
keyword4
.
setValue
(
orderBean
.
getUserName
());
keyword4
.
setValue
(
orderBean
.
getUserName
());
TemplateKeyword
keyword5
=
new
TemplateKeyword
();
MpTemplateMsgDataValue
keyword5
=
new
MpTemplateMsgDataValue
();
keyword5
.
setValue
(
orderBean
.
getPhone
());
keyword5
.
setValue
(
orderBean
.
getPhone
());
TemplateKeyword
remark
=
new
TemplateKeyword
();
MpTemplateMsgDataValue
remark
=
new
MpTemplateMsgDataValue
();
remark
.
setValue
(
request
.
getReason
()+
","
+
request
.
getRemark
());
remark
.
setValue
(
request
.
getReason
()+
","
+
request
.
getRemark
());
data
.
setFirst
(
first
);
data
.
setFirst
(
first
);
data
.
setKeyword1
(
keyword1
);
data
.
setKeyword1
(
keyword1
);
...
...
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