Commit 17122506 by chongfu.liang

fix

parent 82fdebd8
...@@ -18,6 +18,7 @@ import cn.freemud.enums.*; ...@@ -18,6 +18,7 @@ import cn.freemud.enums.*;
import cn.freemud.interceptor.ServiceException; import cn.freemud.interceptor.ServiceException;
import cn.freemud.redis.RedisCache; import cn.freemud.redis.RedisCache;
import cn.freemud.service.AppOrderService; import cn.freemud.service.AppOrderService;
import cn.freemud.service.thirdparty.CouponClient;
import cn.freemud.service.thirdparty.CouponOnlineClient; import cn.freemud.service.thirdparty.CouponOnlineClient;
import cn.freemud.utils.BeanUtil; import cn.freemud.utils.BeanUtil;
import cn.freemud.utils.RedisUtil; import cn.freemud.utils.RedisUtil;
...@@ -96,7 +97,7 @@ public class AppOrderServiceImpl implements AppOrderService { ...@@ -96,7 +97,7 @@ public class AppOrderServiceImpl implements AppOrderService {
private SellCouponOrderServiceImpl sellCouponOrderService; private SellCouponOrderServiceImpl sellCouponOrderService;
@Autowired @Autowired
private CouponOnlineClient couponOnlineClient; private CouponClient couponClient;
/** /**
* 不支持会员卡 * 不支持会员卡
...@@ -121,7 +122,7 @@ public class AppOrderServiceImpl implements AppOrderService { ...@@ -121,7 +122,7 @@ public class AppOrderServiceImpl implements AppOrderService {
couponList.add(createOrderVo.getCouponCode()); couponList.add(createOrderVo.getCouponCode());
requestDto.setCouponCodes(couponList); requestDto.setCouponCodes(couponList);
requestDto.setPartnerId(Integer.valueOf(createOrderVo.getPartnerId())); requestDto.setPartnerId(Integer.valueOf(createOrderVo.getPartnerId()));
InvalidCouponsResponseDto invalidCouponsResponseDto = couponOnlineClient.invalidCoupons(requestDto); InvalidCouponsResponseDto invalidCouponsResponseDto = couponClient.invalidCoupons(requestDto);
if (invalidCouponsResponseDto.getStatusCode() != 100 || invalidCouponsResponseDto.getData() == null || (invalidCouponsResponseDto.getData() != null && CollectionUtils.isEmpty(invalidCouponsResponseDto.getData().getInvalidCoupons()))){ if (invalidCouponsResponseDto.getStatusCode() != 100 || invalidCouponsResponseDto.getData() == null || (invalidCouponsResponseDto.getData() != null && CollectionUtils.isEmpty(invalidCouponsResponseDto.getData().getInvalidCoupons()))){
return ResponseUtil.error(ShoppingCartConstant.COUPON_INVALID); return ResponseUtil.error(ShoppingCartConstant.COUPON_INVALID);
} }
......
...@@ -13,8 +13,12 @@ ...@@ -13,8 +13,12 @@
package cn.freemud.service.thirdparty; package cn.freemud.service.thirdparty;
import cn.freemud.entities.dto.*; 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.cloud.netflix.feign.FeignClient;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
// 测试http://115.159.65.101:8002 线上http://10.51.0.37:8002 // 测试http://115.159.65.101:8002 线上http://10.51.0.37:8002
...@@ -53,5 +57,10 @@ public interface CouponClient { ...@@ -53,5 +57,10 @@ public interface CouponClient {
@PostMapping("/coupon/verification/notice") @PostMapping("/coupon/verification/notice")
CouponBaseResponseDto verifyNotice(VerifyNoticeRequestDto verifyNoticeRequestDto); CouponBaseResponseDto verifyNotice(VerifyNoticeRequestDto verifyNoticeRequestDto);
/**
* 查询券详情
*/
@PostMapping(value = "/coupon/state/invalid/coupons")
InvalidCouponsResponseDto invalidCoupons(@RequestBody InvalidCouponsRequestDto invalidCouponsRequestDto);
} }
...@@ -25,12 +25,4 @@ public interface CouponOnlineClient { ...@@ -25,12 +25,4 @@ public interface CouponOnlineClient {
GetCouponDetailResponseDto getCouponDetails(@RequestBody Map<String, ?> map); 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);
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment