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
f493c626
Commit
f493c626
authored
Jun 30, 2020
by
xiaoer.li@freemud.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
微信商家券
parent
cb8fc120
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
32 additions
and
0 deletions
+32
-0
order-application-service/src/main/java/cn/freemud/entities/dto/activity/PayGiftCheckAndJoinResponseDto.java
+2
-0
order-application-service/src/main/java/cn/freemud/entities/vo/PayGiftWechatCouponInfoVo.java
+28
-0
order-application-service/src/main/java/cn/freemud/entities/vo/QueryOrderResponseVo.java
+1
-0
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
+1
-0
No files found.
order-application-service/src/main/java/cn/freemud/entities/dto/activity/PayGiftCheckAndJoinResponseDto.java
View file @
f493c626
...
@@ -13,6 +13,7 @@
...
@@ -13,6 +13,7 @@
package
cn
.
freemud
.
entities
.
dto
.
activity
;
package
cn
.
freemud
.
entities
.
dto
.
activity
;
import
cn.freemud.entities.vo.PayGiftCouponVo
;
import
cn.freemud.entities.vo.PayGiftCouponVo
;
import
cn.freemud.entities.vo.PayGiftWechatCouponInfoVo
;
import
lombok.Data
;
import
lombok.Data
;
import
java.util.List
;
import
java.util.List
;
...
@@ -22,4 +23,5 @@ public class PayGiftCheckAndJoinResponseDto {
...
@@ -22,4 +23,5 @@ public class PayGiftCheckAndJoinResponseDto {
private
String
activityName
;
private
String
activityName
;
private
List
<
PayGiftCouponVo
>
coupons
;
private
List
<
PayGiftCouponVo
>
coupons
;
private
List
<
PayGiftWechatCouponInfoVo
>
wechatCouponInfo
;
}
}
order-application-service/src/main/java/cn/freemud/entities/vo/PayGiftWechatCouponInfoVo.java
0 → 100644
View file @
f493c626
package
cn
.
freemud
.
entities
.
vo
;
import
java.util.List
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
@Data
public
class
PayGiftWechatCouponInfoVo
{
// 发券商户号
private
String
send_coupon_merchant
;
//send_coupon_params
private
List
<
sendCouponParams
>
send_coupon_params
;
//签名
private
String
sign
;
@Data
@NoArgsConstructor
static
class
sendCouponParams
{
//批次号
private
String
stock_id
;
//发券凭证
private
String
out_request_no
;
//券code
private
String
couponCode
;
}
}
order-application-service/src/main/java/cn/freemud/entities/vo/QueryOrderResponseVo.java
View file @
f493c626
...
@@ -325,6 +325,7 @@ public class QueryOrderResponseVo {
...
@@ -325,6 +325,7 @@ public class QueryOrderResponseVo {
//支付有礼领券集合
//支付有礼领券集合
private
List
<
PayGiftCouponVo
>
coupons
;
private
List
<
PayGiftCouponVo
>
coupons
;
private
List
<
PayGiftWechatCouponInfoVo
>
wechatCouponInfo
;
/**
/**
* 收件人省份
* 收件人省份
...
...
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
View file @
f493c626
...
@@ -808,6 +808,7 @@ public class OrderServiceImpl implements Orderservice {
...
@@ -808,6 +808,7 @@ public class OrderServiceImpl implements Orderservice {
PayGiftCheckAndJoinResponseDto
payGiftResponse
=
payGiftBaseResponse
.
getResult
();
PayGiftCheckAndJoinResponseDto
payGiftResponse
=
payGiftBaseResponse
.
getResult
();
queryOrderResponseVo
.
setActivityName
(
payGiftResponse
.
getActivityName
());
queryOrderResponseVo
.
setActivityName
(
payGiftResponse
.
getActivityName
());
queryOrderResponseVo
.
setCoupons
(
payGiftResponse
.
getCoupons
());
queryOrderResponseVo
.
setCoupons
(
payGiftResponse
.
getCoupons
());
queryOrderResponseVo
.
setWechatCouponInfo
(
payGiftResponse
.
getWechatCouponInfo
());
}
}
}
}
...
...
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