呵呵商城改版part5

src/main/java/com/caimei/controller/CouponApi.java

@@ -98,7 +98,7 @@ public class CouponApi {
         return couponService.receiveCount(userId);
     }
 
-    @ApiOperation("优惠券部分商品数据")
+    /*@ApiOperation("优惠券部分商品数据")
     @ApiImplicitParams({
             @ApiImplicitParam(required = true, name = "couponId", value = "优惠券id"),
             @ApiImplicitParam(required = true, name = "userId", value = "用户id"),
@@ -114,7 +114,7 @@ public class CouponApi {
             return ResponseJson.error("参数异常", null);
         }
         return couponService.productPage(couponId, userId, productName, pageNum, pageSize);
-    }
+    }*/
 
     @ApiOperation("根据商品id获取相关优惠券")
     @ApiImplicitParams({

src/main/java/com/caimei/service/CouponService.java

@@ -60,7 +60,7 @@ public interface CouponService {
      * @param pageSize  每页数量
      * @return
      */
-    ResponseJson<PageInfo<ProductVo>> productPage(Integer couponId, Integer userId, String productName, int pageNum, int pageSize);
+//    ResponseJson<PageInfo<ProductVo>> productPage(Integer couponId, Integer userId, String productName, int pageNum, int pageSize);
 
     /**
      * 领取优惠券

src/main/java/com/caimei/service/ProductService.java

@@ -99,5 +99,5 @@ public interface ProductService {
     /**
      * 设置商品详情
      */
-    void setProductDetails(ProductVo product, Integer userId);
+//    void setProductDetails(ProductVo product, Integer userId);
 }

src/main/java/com/caimei/service/impl/CouponServiceImpl.java

@@ -115,7 +115,7 @@ public class CouponServiceImpl implements CouponService {
         return ResponseJson.success(map);
     }
 
-    @Override
+    /*@Override
     public ResponseJson<PageInfo<ProductVo>> productPage(Integer couponId, Integer userId, String productName, int pageNum, int pageSize) {
         PageHelper.startPage(pageNum, pageSize);
         List<ProductVo> productList = couponMapper.getCouponProduct(couponId, productName);
@@ -136,7 +136,7 @@ public class CouponServiceImpl implements CouponService {
         productList.forEach(product -> productService.setProductDetails(product,userId));
         PageInfo<ProductVo> pageInfo = new PageInfo<>(productList);
         return ResponseJson.success(pageInfo);
-    }
+    }*/
 
     @Override
     public ResponseJson<String> collarCoupons(CouponsDto couponsDto) {

src/main/java/com/caimei/service/impl/ProductServiceImpl.java

@@ -57,7 +57,7 @@ public class ProductServiceImpl implements ProductService {
         return ResponseJson.success(pageInfo);
     }*/
 
-    @Override
+    /*@Override
     public void setProductDetails(ProductVo product, Integer userId) {
         product.setMainImage(ProductUtils.getImageURL("product", product.getMainImage(), 0, domain));
         Integer activityId = productMapper.getActivityIdByProductId(product.getProductId());
@@ -108,7 +108,7 @@ public class ProductServiceImpl implements ProductService {
         if (partCount > 0) {
             product.setCouponsLogo(true);
         }
-    }
+    }*/
 
     /*@Override
     public ResponseJson<ProductVo> productDetails(Integer productId, Integer userId) {

src/main/java/com/caimei/service/impl/ShoppingCartServiceImpl.java

@@ -89,7 +89,8 @@ public class ShoppingCartServiceImpl implements ShoppingCartService {
      * 设置活动价格阶梯
      */
     @Override
-    public void setPrice(CartProductVo product, Integer userId, Integer collageFlag) {// 活动id
+    public void setPrice(CartProductVo product, Integer userId, Integer collageFlag) {
+        // 活动id
         Integer activityId = productMapper.getActivityIdByProductId(product.getProductId());
         // 拼团商品
         CmHeheCollageProductPo collageProduct = productMapper.findCollageProduct(product.getProductId());
@@ -121,7 +122,7 @@ public class ShoppingCartServiceImpl implements ShoppingCartService {
         Integer discount = productMapper.findProductDiscount(product.getProductId(), userId);
         if (null != discount && discount > 0) {
             product.setPrice(MathUtil.div(MathUtil.mul(product.getPrice(), discount), 100, 2));
-            if (null != product.getNormalPrice()) {
+            if (product.getNormalPrice().compareTo(BigDecimal.ZERO) > 0) {
                 product.setNormalPrice(MathUtil.div(MathUtil.mul(product.getNormalPrice(), discount), 100, 2));
             }
             if (null != ladderList) {
@@ -135,7 +136,7 @@ public class ShoppingCartServiceImpl implements ShoppingCartService {
             BigDecimal addedValueTax = MathUtil.div(MathUtil.mul(product.getPrice(), product.getClubTaxPoint()), BigDecimal.valueOf(100), 2);
             BigDecimal price = MathUtil.add(product.getPrice(), addedValueTax);
             product.setPrice(price);
-            if (null != product.getNormalPrice()) {
+            if (product.getNormalPrice().compareTo(BigDecimal.ZERO) > 0) {
                 addedValueTax = MathUtil.div(MathUtil.mul(product.getNormalPrice(), product.getClubTaxPoint()), BigDecimal.valueOf(100), 2);
                 price = MathUtil.add(product.getNormalPrice(), addedValueTax);
                 product.setNormalPrice(price);
@@ -191,6 +192,15 @@ public class ShoppingCartServiceImpl implements ShoppingCartService {
                 product.setCouponInfo("券|满" + smallestCoupon.getTouchPrice() + "元减" + smallestCoupon.getCouponAmount());
             }
         }
+        if (1 == product.getActiveStatus() || 1 == product.getCollageStatus() || 1 == product.getDiscountStatus()) {
+            if (product.getPrice().compareTo(product.getNormalPrice()) == 0) {
+                // 原价与售价相同，不显示原价
+                product.setNormalPrice(BigDecimal.ZERO);
+            }
+        } else if (product.getCouponPrice().compareTo(BigDecimal.ZERO) == 0) {
+            // 不参与任何活动且未使用优惠券，不显示原价
+            product.setNormalPrice(BigDecimal.ZERO);
+        }
     }
 
     @Override

src/main/resources/config/dev/application-dev.yml

@@ -63,6 +63,6 @@ caimei:
   #支付链接重定向地址
   redirectLink: https://mall2c-b.caimei365.com/PayOrder/jumpPage
   #微服务网关地址
-  cloudApi: http://192.168.2.92:18002
+  cloudApi: http://192.168.2.100:18002
   #延时分账异步回调地址
   delayedSplittingUrl: https://mall2c-b.caimei365.com/PayOrder/delayedSplittingCallback

src/main/resources/mapper/ShoppingCartMapper.xml

@@ -79,6 +79,7 @@
           cc.productCount as num,
           cc.heUserId,
           chp.price,
+          chp.price as normalPrice,
           chp.includedTax,
           chp.invoiceType,
           chp.clubTaxPoint,