Commit e9557717 by shuhu.hou@freemud.cn

会员卡首单立减金额判空赋值0

parent 03f142e0
...@@ -654,11 +654,11 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService { ...@@ -654,11 +654,11 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
getPaidRuleRequestDto.setRuleId(buyMemberCard.getRuleId()); getPaidRuleRequestDto.setRuleId(buyMemberCard.getRuleId());
BaseResponse<GetPaidRuleResponseDto> baseResponse = customerApplicationClient.getPaidRule(getPaidRuleRequestDto); BaseResponse<GetPaidRuleResponseDto> baseResponse = customerApplicationClient.getPaidRule(getPaidRuleRequestDto);
if (baseResponse == null || baseResponse.getResult() == null || !ResponseResult.SUCCESS.getCode().equals(baseResponse.getCode()) if (baseResponse == null || baseResponse.getResult() == null || !ResponseResult.SUCCESS.getCode().equals(baseResponse.getCode())
|| baseResponse.getResult().getActivityPrice() == null || baseResponse.getResult().getFirstCouponAmount() == null) { || baseResponse.getResult().getActivityPrice() == null) {
return; return;
} }
Integer activityPrice = baseResponse.getResult().getActivityPrice(); Integer activityPrice = baseResponse.getResult().getActivityPrice();
Integer firstCouponAmount = baseResponse.getResult().getFirstCouponAmount(); Integer firstCouponAmount = baseResponse.getResult().getFirstCouponAmount()==null?0: baseResponse.getResult().getFirstCouponAmount();
Integer needCardAmount = activityPrice - firstCouponAmount; Integer needCardAmount = activityPrice - firstCouponAmount;
shoppingCartGoodsDto.setMemberCardAmount(needCardAmount); shoppingCartGoodsDto.setMemberCardAmount(needCardAmount);
shoppingCartGoodsDto.setCardOriginalAmount(baseResponse.getResult().getActivityPrice()); shoppingCartGoodsDto.setCardOriginalAmount(baseResponse.getResult().getActivityPrice());
......
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