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
order-group-application
order-group
Commits
dacd03b5
Commit
dacd03b5
authored
Aug 12, 2021
by
周晓航
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'KA-支付有礼新增积分提示-20210728-IDID1033907-zxh'
parents
c7e58b31
1cf7f91c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
2 deletions
+12
-2
order-application-service/src/main/java/cn/freemud/entities/dto/activity/PayGiftCheckAndJoinResponseDto.java
+6
-1
order-application-service/src/main/java/cn/freemud/entities/dto/activity/PayGiftCheckAndJoinResponseDtoNew.java
+6
-1
No files found.
order-application-service/src/main/java/cn/freemud/entities/dto/activity/PayGiftCheckAndJoinResponseDto.java
View file @
dacd03b5
...
...
@@ -44,7 +44,7 @@ public class PayGiftCheckAndJoinResponseDto {
private
PayGiftWechatCouponInfoVo
wechatCouponInfo
;
/**
* 奖励类型:
1-非码券,2-微信商家券,3-弹窗奖励
* 奖励类型:
0-非码券,2-微信商家券,3-弹窗奖励 ,4-送积分
*/
private
String
syncWechat
;
...
...
@@ -72,4 +72,9 @@ public class PayGiftCheckAndJoinResponseDto {
* 跳转页面5和20跳转外部H5对应的路径或者URL
*/
private
String
redirectPage
;
/**
* 参与支付有礼活动已获得50积分
*/
private
String
sendScore
;
}
order-application-service/src/main/java/cn/freemud/entities/dto/activity/PayGiftCheckAndJoinResponseDtoNew.java
View file @
dacd03b5
...
...
@@ -29,7 +29,7 @@ public class PayGiftCheckAndJoinResponseDtoNew {
/**
* 奖励类型:0-非码券,2-微信商家券,3-弹窗奖励
* 奖励类型:0-非码券,2-微信商家券,3-弹窗奖励
,4-送积分
*/
private
String
syncWechat
;
...
...
@@ -47,4 +47,9 @@ public class PayGiftCheckAndJoinResponseDtoNew {
*活动及弹窗奖励的集合
*/
private
List
<
ActivitysDtoNew
>
activitys
;
/**
* 参与支付有礼活动已获得50积分
*/
private
String
sendScore
;
}
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