Commit 5cd522b3 by 王世昌

修复加价购商品价格为空导致的异常

parent 0364a2c8
...@@ -27,6 +27,7 @@ import org.springframework.stereotype.Component; ...@@ -27,6 +27,7 @@ import org.springframework.stereotype.Component;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
import java.util.Optional;
import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toList;
...@@ -106,8 +107,8 @@ public class CalculationSharingAdapter { ...@@ -106,8 +107,8 @@ public class CalculationSharingAdapter {
GetCalculationDiscountBO.CalculationSendGoodsReqVO reqs = new GetCalculationDiscountBO.CalculationSendGoodsReqVO(); GetCalculationDiscountBO.CalculationSendGoodsReqVO reqs = new GetCalculationDiscountBO.CalculationSendGoodsReqVO();
reqs.setGoodsId(send.getGoodsId()); reqs.setGoodsId(send.getGoodsId());
reqs.setGoodsQuantity(send.getQty()); reqs.setGoodsQuantity(send.getQty());
reqs.setOriginalPrice(send.getOriginalPrice().intValue()); reqs.setOriginalPrice(Optional.ofNullable(send.getOriginalPrice()).orElse(0L).intValue());
reqs.setNowPrice(send.getOriginalPrice().intValue()); reqs.setNowPrice(Optional.ofNullable(send.getOriginalPrice()).orElse(0L).intValue());
sends.add(reqs); sends.add(reqs);
activityCode = send.getActivityCode(); activityCode = send.getActivityCode();
} }
......
...@@ -66,7 +66,7 @@ public class KgdCouponServiceImpl implements CouponService { ...@@ -66,7 +66,7 @@ public class KgdCouponServiceImpl implements CouponService {
@Override @Override
public CouponDetailBO getCouponDetail(GetCouponDetailBO getCouponDetailBO) { public CouponDetailBO getCouponDetail(GetCouponDetailBO getCouponDetailBO) {
Map<String, String> map = new TreeMap<String, String>(); Map<String, String> map = new TreeMap<>();
if (StringUtils.isBlank(getCouponDetailBO.getPartnerId()) || StringUtils.isBlank(getCouponDetailBO.getCouponCode())) { if (StringUtils.isBlank(getCouponDetailBO.getPartnerId()) || StringUtils.isBlank(getCouponDetailBO.getCouponCode())) {
return null; return null;
} }
......
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