|
@@ -1644,21 +1644,23 @@ public class OrderServiceImpl extends ServiceImpl<MtOrderMapper, MtOrder> implem
|
|
|
// 储值卡的订单
|
|
|
if (orderInfo.getType().equals(OrderTypeEnum.PRESTORE.getKey())) {
|
|
|
MtCoupon coupon = couponService.queryCouponById(orderInfo.getCouponId());
|
|
|
- String[] paramArr = orderInfo.getParam().split(",");
|
|
|
- for(int i = 0; i < paramArr.length; i++) {
|
|
|
- String[] item = paramArr[i].split("_");
|
|
|
- if (Integer.parseInt(item[2]) > 0) {
|
|
|
- OrderGoodsDto goodsDto = new OrderGoodsDto();
|
|
|
- goodsDto.setId(coupon.getId());
|
|
|
- goodsDto.setType(OrderTypeEnum.PRESTORE.getKey());
|
|
|
- goodsDto.setName("预存¥" + item[0] + "到账¥" + item[1]);
|
|
|
- goodsDto.setNum(Integer.parseInt(item[2]));
|
|
|
- goodsDto.setPrice(item[0]);
|
|
|
- goodsDto.setDiscount("0");
|
|
|
- if (coupon.getImage().indexOf(baseImage) == -1) {
|
|
|
- goodsDto.setImage(baseImage + coupon.getImage());
|
|
|
+ if (coupon != null) {
|
|
|
+ String[] paramArr = orderInfo.getParam().split(",");
|
|
|
+ for (int i = 0; i < paramArr.length; i++) {
|
|
|
+ String[] item = paramArr[i].split("_");
|
|
|
+ if (Integer.parseInt(item[2]) > 0) {
|
|
|
+ OrderGoodsDto goodsDto = new OrderGoodsDto();
|
|
|
+ goodsDto.setId(coupon.getId());
|
|
|
+ goodsDto.setType(OrderTypeEnum.PRESTORE.getKey());
|
|
|
+ goodsDto.setName("预存¥" + item[0] + "到账¥" + item[1]);
|
|
|
+ goodsDto.setNum(Integer.parseInt(item[2]));
|
|
|
+ goodsDto.setPrice(item[0]);
|
|
|
+ goodsDto.setDiscount("0");
|
|
|
+ if (coupon.getImage().indexOf(baseImage) == -1) {
|
|
|
+ goodsDto.setImage(baseImage + coupon.getImage());
|
|
|
+ }
|
|
|
+ goodsList.add(goodsDto);
|
|
|
}
|
|
|
- goodsList.add(goodsDto);
|
|
|
}
|
|
|
}
|
|
|
}
|