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
17122506
Commit
17122506
authored
Mar 04, 2021
by
chongfu.liang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
82fdebd8
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
10 deletions
+12
-10
order-application-service/src/main/java/cn/freemud/service/impl/AppOrderServiceImpl.java
+3
-2
order-application-service/src/main/java/cn/freemud/service/thirdparty/CouponClient.java
+9
-0
order-application-service/src/main/java/cn/freemud/service/thirdparty/CouponOnlineClient.java
+0
-8
No files found.
order-application-service/src/main/java/cn/freemud/service/impl/AppOrderServiceImpl.java
View file @
17122506
...
...
@@ -18,6 +18,7 @@ import cn.freemud.enums.*;
import
cn.freemud.interceptor.ServiceException
;
import
cn.freemud.redis.RedisCache
;
import
cn.freemud.service.AppOrderService
;
import
cn.freemud.service.thirdparty.CouponClient
;
import
cn.freemud.service.thirdparty.CouponOnlineClient
;
import
cn.freemud.utils.BeanUtil
;
import
cn.freemud.utils.RedisUtil
;
...
...
@@ -96,7 +97,7 @@ public class AppOrderServiceImpl implements AppOrderService {
private
SellCouponOrderServiceImpl
sellCouponOrderService
;
@Autowired
private
Coupon
OnlineClient
couponOnline
Client
;
private
Coupon
Client
coupon
Client
;
/**
* 不支持会员卡
...
...
@@ -121,7 +122,7 @@ public class AppOrderServiceImpl implements AppOrderService {
couponList
.
add
(
createOrderVo
.
getCouponCode
());
requestDto
.
setCouponCodes
(
couponList
);
requestDto
.
setPartnerId
(
Integer
.
valueOf
(
createOrderVo
.
getPartnerId
()));
InvalidCouponsResponseDto
invalidCouponsResponseDto
=
coupon
Online
Client
.
invalidCoupons
(
requestDto
);
InvalidCouponsResponseDto
invalidCouponsResponseDto
=
couponClient
.
invalidCoupons
(
requestDto
);
if
(
invalidCouponsResponseDto
.
getStatusCode
()
!=
100
||
invalidCouponsResponseDto
.
getData
()
==
null
||
(
invalidCouponsResponseDto
.
getData
()
!=
null
&&
CollectionUtils
.
isEmpty
(
invalidCouponsResponseDto
.
getData
().
getInvalidCoupons
()))){
return
ResponseUtil
.
error
(
ShoppingCartConstant
.
COUPON_INVALID
);
}
...
...
order-application-service/src/main/java/cn/freemud/service/thirdparty/CouponClient.java
View file @
17122506
...
...
@@ -13,8 +13,12 @@
package
cn
.
freemud
.
service
.
thirdparty
;
import
cn.freemud.entities.dto.*
;
import
cn.freemud.entities.dto.coupon.InvalidCouponsRequestDto
;
import
cn.freemud.entities.dto.coupon.InvalidCouponsResponseDto
;
import
org.springframework.cloud.netflix.feign.FeignClient
;
import
org.springframework.http.MediaType
;
import
org.springframework.web.bind.annotation.PostMapping
;
import
org.springframework.web.bind.annotation.RequestBody
;
import
org.springframework.web.bind.annotation.RequestMapping
;
// 测试http://115.159.65.101:8002 线上http://10.51.0.37:8002
...
...
@@ -53,5 +57,10 @@ public interface CouponClient {
@PostMapping
(
"/coupon/verification/notice"
)
CouponBaseResponseDto
verifyNotice
(
VerifyNoticeRequestDto
verifyNoticeRequestDto
);
/**
* 查询券详情
*/
@PostMapping
(
value
=
"/coupon/state/invalid/coupons"
)
InvalidCouponsResponseDto
invalidCoupons
(
@RequestBody
InvalidCouponsRequestDto
invalidCouponsRequestDto
);
}
order-application-service/src/main/java/cn/freemud/service/thirdparty/CouponOnlineClient.java
View file @
17122506
...
...
@@ -25,12 +25,4 @@ public interface CouponOnlineClient {
GetCouponDetailResponseDto
getCouponDetails
(
@RequestBody
Map
<
String
,
?>
map
);
/**
* 查询券详情
*/
@PostMapping
(
value
=
"/coupon/state/invalid/coupons"
,
produces
=
MediaType
.
APPLICATION_JSON_UTF8_VALUE
,
consumes
=
{
MediaType
.
APPLICATION_JSON_UTF8_VALUE
}
)
InvalidCouponsResponseDto
invalidCoupons
(
@RequestBody
InvalidCouponsRequestDto
invalidCouponsRequestDto
);
}
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