zhijiezhao 2 years ago
parent
commit
c99635f2fe

+ 6 - 6
src/main/java/com/caimei365/commodity/components/PriceUtilService.java

@@ -156,16 +156,16 @@ public class PriceUtilService {
                     svipDiscountPrice = MathUtil.div(MathUtil.mul(s.getPrice(), s.getDiscount()), 100, 2);
                     s.setSvipPriceTag(MathUtil.div(s.getDiscount(), 10, 1) + "折");
                 } else if (2 == s.getPriceType()) {
+                    s.setPrice(svipDiscountPrice.doubleValue());
+                    if (taxFlag) {
+                        //添加税费
+                        BigDecimal thisTaxFee = MathUtil.div(MathUtil.mul(svipDiscountPrice, price.getTaxRate()), 100, 2);
+                        svipDiscountPrice = MathUtil.add(svipDiscountPrice, thisTaxFee);
+                    }
                     // 直接优惠价
                     // 超级会员用户设置优惠价
                     s.setSvipPriceTag("¥" + svipDiscountPrice.doubleValue());
                 }
-                if (taxFlag) {
-                    //添加税费
-                    BigDecimal thisTaxFee = MathUtil.div(MathUtil.mul(svipDiscountPrice, price.getTaxRate()), 100, 2);
-                    svipDiscountPrice = MathUtil.add(svipDiscountPrice, thisTaxFee);
-                    s.setPrice(svipDiscountPrice.doubleValue());
-                }
             } else if (null != promotions) {
                 // 促销活动
                 price.setActStatus(1);

+ 1 - 1
src/main/java/com/caimei365/commodity/service/impl/PageServiceImpl.java

@@ -1350,7 +1350,7 @@ public class PageServiceImpl implements PageService {
                 }
             }
             product.setImage(ImageUtils.getImageURL("product", product.getImage(), 0, domain));
-            priceUtilService.setProductDetails(userId, product, null);
+            priceUtilService.setProductDetails(userId, product, 0);
         });
         PaginationVo<ProductItemVo> pageData = new PaginationVo(list);
         return ResponseJson.success(pageData);