Browse Source

购物车列表bugfix

chao 3 years ago
parent
commit
c41cdfe673

+ 4 - 0
src/main/java/com/caimei365/order/model/vo/CartShopVo.java

@@ -54,4 +54,8 @@ public class CartShopVo implements Serializable {
      * 领券标识
      */
     private Boolean couponsLogo;
+    /**
+     * 前端勾选状态
+     */
+    private Boolean isChecked;
 }

+ 3 - 1
src/main/java/com/caimei365/order/service/impl/CartClubServiceImpl.java

@@ -86,6 +86,8 @@ public class CartClubServiceImpl implements CartClubService {
         if (null != shopInfoList && shopInfoList.size()>0) {
             // 遍历供应商列表
             shopInfoList.forEach(shop -> {
+                // 默认未选中状态(前端要求)
+                shop.setIsChecked(false);
                 // 该供应商下商品种类
                 AtomicInteger shopKindCount = new AtomicInteger(0);
                 // 该供应商总价
@@ -107,7 +109,7 @@ public class CartClubServiceImpl implements CartClubService {
                     if (cartItemVo.getValidFlag() == 2) {
                         // 设置商品有效
                         cartItemVo.setStatus(0);
-                        // 默认所有商品选中状态
+                        // 默认所有商品选中状态(前端要求)
                         cartItemVo.setIsChecked(false);
                         // 价格是否可见
                         boolean priceVisible = (cartItemVo.getPriceFlag() == 0 || (cartItemVo.getPriceFlag() == 2 && userIdentity == 2));

+ 6 - 0
src/main/java/com/caimei365/order/utils/ImageUtil.java

@@ -31,6 +31,12 @@ public class ImageUtil {
         }
         String image;
         if (StringUtils.isNotEmpty(src)){
+            if (src.startsWith("http:")){
+                return src.replace("http:", "https:");
+            }
+            if (src.startsWith("https:")){
+                return src;
+            }
             if (StringUtils.equals(dirName, "product")) {
                 src = src.replace("\\", "/");
             }