From 84d33c1c0cfc6f76d5542bcf7e41ad9b8e9e019b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=E8=80=98=E7=A8=B7?= <18026623439@163.com> Date: Mon, 21 Dec 2020 21:20:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E7=A7=AF=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/service/dto/PriceGroupDto.java | 2 + .../service/impl/YxStoreOrderServiceImpl.java | 42 ++++++++++++++++--- .../yixiang/modules/order/vo/ComputeVo.java | 3 ++ 3 files changed, 41 insertions(+), 6 deletions(-) diff --git a/yshop-mall/src/main/java/co/yixiang/modules/order/service/dto/PriceGroupDto.java b/yshop-mall/src/main/java/co/yixiang/modules/order/service/dto/PriceGroupDto.java index 6acfa48b..c6a593a1 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/order/service/dto/PriceGroupDto.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/order/service/dto/PriceGroupDto.java @@ -29,4 +29,6 @@ public class PriceGroupDto { @JsonSerialize(using = BigDecimalSerializer.class) private BigDecimal vipPrice; + @JsonSerialize(using = BigDecimalSerializer.class) + private BigDecimal payIntegral; } diff --git a/yshop-mall/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java index d6900385..dae486a7 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java @@ -408,6 +408,7 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl cartInfo = cacheDTO.getCartInfo(); @@ -474,12 +478,19 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl0){ + order.setUseIntegral(order.getPayIntegral()); + } if(order.getUseIntegral().compareTo(BigDecimal.ZERO) <= 0) { return; } @@ -1870,13 +1893,15 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl