Commit f6f012e7 by 周晓航

运费券核销问题

Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
parent a5f4e219
...@@ -64,8 +64,9 @@ public class PlatformCouponRelationServiceImpl implements CouponRelationService ...@@ -64,8 +64,9 @@ public class PlatformCouponRelationServiceImpl implements CouponRelationService
@Override @Override
public BaseResponse verificationCoupon(List<QueryOrdersResponseDto.DataBean.OrderBean.AccountBean> accountList, QueryOrdersResponseDto.DataBean.OrderBean orderBean, CouponReqType couponReqType) { public BaseResponse verificationCoupon(List<QueryOrdersResponseDto.DataBean.OrderBean.AccountBean> accountList, QueryOrdersResponseDto.DataBean.OrderBean orderBean, CouponReqType couponReqType) {
if (accountList.size() > 1) { if (accountList.size() > 1) {
Integer code = OrderAccountType.FREIGHT_COUPON.getCode();
// 运费券 塞进 核销接口里面, 这里真的是贼恶心 逻辑不敢动 // 运费券 塞进 核销接口里面, 这里真的是贼恶心 逻辑不敢动
QueryOrdersResponseDto.DataBean.OrderBean.AccountBean freightCouponAccountBean = accountList.stream().filter(accountBean -> OrderAccountType.DISCOUNT_COUPON.getCode().equals(accountBean.getType())).findFirst().orElse(null); QueryOrdersResponseDto.DataBean.OrderBean.AccountBean freightCouponAccountBean = accountList.stream().filter(accountBean -> code.equals(accountBean.getType())).findFirst().orElse(null);
CouponCodeVerificationTransDto couponCodeVerificationTransDto = null; CouponCodeVerificationTransDto couponCodeVerificationTransDto = null;
if (!Objects.isNull(freightCouponAccountBean)) { if (!Objects.isNull(freightCouponAccountBean)) {
couponCodeVerificationTransDto = new CouponCodeVerificationTransDto(); couponCodeVerificationTransDto = new CouponCodeVerificationTransDto();
...@@ -73,7 +74,7 @@ public class PlatformCouponRelationServiceImpl implements CouponRelationService ...@@ -73,7 +74,7 @@ public class PlatformCouponRelationServiceImpl implements CouponRelationService
couponCodeVerificationTransDto.setTotalAmount(freightCouponAccountBean.getPrice().intValue()); couponCodeVerificationTransDto.setTotalAmount(freightCouponAccountBean.getPrice().intValue());
} }
// 过滤出配送券 // 过滤出配送券
List<QueryOrdersResponseDto.DataBean.OrderBean.AccountBean> collect = accountList.stream().filter(accountBean -> !OrderAccountType.DISCOUNT_COUPON.getCode().equals(accountBean.getType())).collect(Collectors.toList()); List<QueryOrdersResponseDto.DataBean.OrderBean.AccountBean> collect = accountList.stream().filter(accountBean -> code.equals(accountBean.getType())).collect(Collectors.toList());
return commonMethodVerification(couponCodeVerificationTransDto, collect, orderBean, couponReqType); return commonMethodVerification(couponCodeVerificationTransDto, collect, orderBean, couponReqType);
} else { } else {
return commonMethodVerification(null, accountList, orderBean, couponReqType); return commonMethodVerification(null, accountList, orderBean, couponReqType);
......
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