积分兑换,结算页面积分支付展示问题处理。
店铺商品变更店铺商品数量展示同步。
This commit is contained in:
@@ -27,7 +27,7 @@ public class PriceDetailVO implements Serializable {
|
||||
private Double discountPrice;
|
||||
|
||||
@ApiModelProperty(value = "支付积分")
|
||||
private Integer payPoint;
|
||||
private Long payPoint;
|
||||
|
||||
@ApiModelProperty(value = "最终成交金额")
|
||||
private Double finalePrice;
|
||||
|
||||
@@ -67,16 +67,32 @@ public class SkuPromotionRender implements CartRenderStep {
|
||||
*/
|
||||
private void renderSkuPromotion(TradeDTO tradeDTO) {
|
||||
|
||||
|
||||
switch (tradeDTO.getCartTypeEnum()) {
|
||||
case POINTS:
|
||||
for (CartVO cartVO : tradeDTO.getCartList()) {
|
||||
for (CartSkuVO cartSkuVO : cartVO.getSkuList()) {
|
||||
cartSkuVO.getPriceDetailDTO().setPayPoint(cartSkuVO.getPoint());
|
||||
}
|
||||
}
|
||||
case CART:
|
||||
case BUY_NOW:
|
||||
case VIRTUAL:
|
||||
for (CartVO cartVO : tradeDTO.getCartList()) {
|
||||
for (CartSkuVO cartSkuVO : cartVO.getSkuList()) {
|
||||
promotionGoodsService.updatePromotion(cartSkuVO);
|
||||
}
|
||||
}
|
||||
return;
|
||||
default:
|
||||
}
|
||||
|
||||
//非积分商品、拼团、砍价商品可渲染满优惠活动
|
||||
//这里普通购物车也只渲染满优惠,其他优惠都是商品级别的,都写在商品属性里
|
||||
if (!tradeDTO.getCartTypeEnum().equals(CartTypeEnum.POINTS)
|
||||
&& !tradeDTO.getCartTypeEnum().equals(CartTypeEnum.PINTUAN)
|
||||
&& !tradeDTO.getCartTypeEnum().equals(CartTypeEnum.KANJIA)) {
|
||||
for (CartVO cartVO : tradeDTO.getCartList()) {
|
||||
for (CartSkuVO cartSkuVO : cartVO.getSkuList()) {
|
||||
promotionGoodsService.updatePromotion(cartSkuVO);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -37,7 +37,7 @@ public class PriceDetailDTO implements Serializable {
|
||||
//============discount price============
|
||||
|
||||
@ApiModelProperty(value = "支付积分")
|
||||
private Integer payPoint;
|
||||
private Long payPoint;
|
||||
|
||||
@ApiModelProperty(value = "优惠金额")
|
||||
private Double discountPrice;
|
||||
@@ -113,7 +113,7 @@ public class PriceDetailDTO implements Serializable {
|
||||
goodsPrice = 0d;
|
||||
freightPrice = 0d;
|
||||
|
||||
payPoint = 0;
|
||||
payPoint = 0L;
|
||||
discountPrice = 0d;
|
||||
couponPrice = 0d;
|
||||
|
||||
@@ -230,9 +230,9 @@ public class PriceDetailDTO implements Serializable {
|
||||
return freightPrice;
|
||||
}
|
||||
|
||||
public Integer getPayPoint() {
|
||||
public Long getPayPoint() {
|
||||
if (payPoint == null || payPoint <= 0) {
|
||||
return 0;
|
||||
return 0L;
|
||||
}
|
||||
return payPoint;
|
||||
}
|
||||
@@ -343,7 +343,7 @@ public class PriceDetailDTO implements Serializable {
|
||||
this.recount();
|
||||
}
|
||||
|
||||
public void setPayPoint(Integer payPoint) {
|
||||
public void setPayPoint(Long payPoint) {
|
||||
this.payPoint = payPoint;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user