From be03c197a17a3aa4cfdf107ca1cf982fff67f52d Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Thu, 1 Feb 2024 14:30:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yxt/yythmall/biz/shoppingcart/ShoppingCartMapper.xml    | 1 +
 .../yxt/yythmall/biz/shoppingcart/ShoppingCartService.java  | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/yxt/yythmall/biz/shoppingcart/ShoppingCartMapper.xml b/src/main/java/com/yxt/yythmall/biz/shoppingcart/ShoppingCartMapper.xml
index 101b2b8..fc345df 100644
--- a/src/main/java/com/yxt/yythmall/biz/shoppingcart/ShoppingCartMapper.xml
+++ b/src/main/java/com/yxt/yythmall/biz/shoppingcart/ShoppingCartMapper.xml
@@ -17,6 +17,7 @@
         left join lpk_goods s on s.sid=r.goodsSid
         <where>
             r.customerSid =#{customerSid} and r.affiliation=#{brandId}
+            and s.isAppletGrounding=1 and s.useTo=1
         </where>
     </select>
 </mapper>
\ No newline at end of file
diff --git a/src/main/java/com/yxt/yythmall/biz/shoppingcart/ShoppingCartService.java b/src/main/java/com/yxt/yythmall/biz/shoppingcart/ShoppingCartService.java
index 9167f45..6d7a421 100644
--- a/src/main/java/com/yxt/yythmall/biz/shoppingcart/ShoppingCartService.java
+++ b/src/main/java/com/yxt/yythmall/biz/shoppingcart/ShoppingCartService.java
@@ -188,7 +188,7 @@ public class ShoppingCartService extends MybatisBaseService<ShoppingCartMapper,
                 double d = Double.valueOf(vo.getTotalPrice());
                 double t = Double.valueOf(vo.getTotalPrice()) * a;
                 BigDecimal bg = new BigDecimal(t);
-                vo.setTotalPrice(String.valueOf(bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue()));
+                vo.setTotalPrice(removeZeros(String.valueOf(bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue())));
 //                String c =String.valueOf(Double.valueOf(vo.getTotalPrice())-d);
                 double f = Double.valueOf(vo.getTotalPrice()) - d;
                 BigDecimal bgd = new BigDecimal(f);
@@ -199,7 +199,7 @@ public class ShoppingCartService extends MybatisBaseService<ShoppingCartMapper,
                 double d = Double.valueOf(vo.getTotalPrice());
                 double t = Double.valueOf(vo.getTotalPrice()) * a;
                 BigDecimal bg = new BigDecimal(t);
-                vo.setTotalPrice(String.valueOf(bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue()));
+                vo.setTotalPrice(removeZeros(String.valueOf(bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue())));
 //                String c =String.valueOf(Double.valueOf(vo.getTotalPrice())-d);
                 double f = Double.valueOf(vo.getTotalPrice()) - d;
                 BigDecimal bgd = new BigDecimal(f);
@@ -211,7 +211,7 @@ public class ShoppingCartService extends MybatisBaseService<ShoppingCartMapper,
             double d = Double.valueOf(vo.getTotalPrice());
             double t = Double.valueOf(vo.getTotalPrice()) * a;
             BigDecimal bg = new BigDecimal(t);
-            vo.setTotalPrice(String.valueOf(bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue()));
+            vo.setTotalPrice(removeZeros(String.valueOf(bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue())));
 //            String c =String.valueOf(Double.valueOf(vo.getTotalPrice())-d);
             double f = Double.valueOf(vo.getTotalPrice()) - d;
             BigDecimal bgd = new BigDecimal(f);