记得上下班打卡 | git大法好,push需谨慎

Commit e23487b0 authored by 胡佳晨's avatar 胡佳晨

修改 订单详情bug

parent d7b6f79a
...@@ -34,10 +34,15 @@ public class GoblinStoreOrderListVo implements Cloneable { ...@@ -34,10 +34,15 @@ public class GoblinStoreOrderListVo implements Cloneable {
private String platformUcouponId; private String platformUcouponId;
@ApiModelProperty(value = " 平台券名称") @ApiModelProperty(value = " 平台券名称")
private String platformUcouponName; private String platformUcouponName;
@ApiModelProperty(value = " 平台券价格")
private BigDecimal platformUcouponPrice;
@ApiModelProperty(value = " 店铺券id") @ApiModelProperty(value = " 店铺券id")
private String storeUcouponId; private String storeUcouponId;
@ApiModelProperty(value = " 店铺券名称") @ApiModelProperty(value = " 店铺券名称")
private String storeUcouponName; private String storeUcouponName;
@ApiModelProperty(value = " 店铺券价格")
private BigDecimal storeUcouponPrice;
@ApiModelProperty(value = " 付款金额") @ApiModelProperty(value = " 付款金额")
private BigDecimal priceActual; private BigDecimal priceActual;
......
...@@ -132,9 +132,11 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService { ...@@ -132,9 +132,11 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
CandyCouponVo candyCouponVo = orderUtils.getCouponDetails(orderVo.getUcouponId()); CandyCouponVo candyCouponVo = orderUtils.getCouponDetails(orderVo.getUcouponId());
vo.setPlatformUcouponId(candyCouponVo.getUcouponId()); vo.setPlatformUcouponId(candyCouponVo.getUcouponId());
vo.setPlatformUcouponName(candyCouponVo.getTitle()); vo.setPlatformUcouponName(candyCouponVo.getTitle());
vo.setPlatformUcouponPrice(orderVo.getPriceCoupon());
} else { } else {
vo.setPlatformUcouponId(""); vo.setPlatformUcouponId("");
vo.setPlatformUcouponName(""); vo.setPlatformUcouponName("");
vo.setPlatformUcouponPrice(BigDecimal.ZERO);
} }
if (!(orderVo.getStoreCouponId() == null || orderVo.getStoreCouponId().equals(""))) { if (!(orderVo.getStoreCouponId() == null || orderVo.getStoreCouponId().equals(""))) {
List<GoblinUserCouponVo> voList = redisUtils.getUserCouponVos(orderVo.getUserId()); List<GoblinUserCouponVo> voList = redisUtils.getUserCouponVos(orderVo.getUserId());
...@@ -142,6 +144,7 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService { ...@@ -142,6 +144,7 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
if (goblinUserCouponVo.getUcouponId().equals(orderVo.getStoreCouponId())) { if (goblinUserCouponVo.getUcouponId().equals(orderVo.getStoreCouponId())) {
vo.setStoreUcouponId(goblinUserCouponVo.getStoreCouponId()); vo.setStoreUcouponId(goblinUserCouponVo.getStoreCouponId());
vo.setStoreUcouponName(goblinUserCouponVo.getTitle()); vo.setStoreUcouponName(goblinUserCouponVo.getTitle());
vo.setStoreUcouponPrice(orderVo.getStorePriceCoupon());
break; break;
} }
} }
...@@ -149,6 +152,7 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService { ...@@ -149,6 +152,7 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
} else { } else {
vo.setStoreUcouponId(""); vo.setStoreUcouponId("");
vo.setStoreUcouponName(""); vo.setStoreUcouponName("");
vo.setStoreUcouponPrice(BigDecimal.ZERO);
} }
if (orderVo.getMarketId() == null || orderVo.getMarketId().equals("")) { if (orderVo.getMarketId() == null || orderVo.getMarketId().equals("")) {
vo.setMarketName(""); vo.setMarketName("");
......
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