bug fixes

src/main/java/com/caimei/entity/Club.java

@@ -12,6 +12,7 @@ public class Club implements Serializable {
     private String userMoney;    //保留之后
     private String contactNumber;   //联系我们
     private String introduction;    //关于我们
+    private Integer cartCount;      //购物车数量
 
     public Integer getClubID() {
         return clubID;
@@ -84,4 +85,12 @@ public class Club implements Serializable {
     public void setUserMoney(String userMoney) {
         this.userMoney = userMoney;
     }
+
+    public Integer getCartCount() {
+        return cartCount;
+    }
+
+    public void setCartCount(Integer cartCount) {
+        this.cartCount = cartCount;
+    }
 }

src/main/java/com/caimei/mapper/products/ShoppingMapper.java

@@ -13,7 +13,7 @@ public interface ShoppingMapper {
 
     List<Shop> findAllShop(Integer userID);
 
-    List<CmOrganizeProducts> findAllProducts(Integer shopID);
+    List<CmOrganizeProducts> findAllProducts(@Param("shopID") Integer shopID, @Param("userID") Integer userID);
 
     void updateNumber(CmMallCart cmMallCart);
 

src/main/java/com/caimei/service/products/impl/ShoppingServiceImpl.java

@@ -33,7 +33,7 @@ public class ShoppingServiceImpl implements ShoppingService {
         List<Shop> shopList = shoppingMapper.findAllShop(userID);
         if (shopList != null && shopList.size() > 0) {
             for (Shop shop : shopList) {
-                List<CmOrganizeProducts> productsList = shoppingMapper.findAllProducts(shop.getShopID());
+                List<CmOrganizeProducts> productsList = shoppingMapper.findAllProducts(shop.getShopID(), userID);
                 shop.setProductsList(productsList);
                 Double totalPrice = 0d;
                 for (CmOrganizeProducts products : productsList) {

src/main/java/com/caimei/service/user/impl/PersonalServiceImpl.java

@@ -1,6 +1,7 @@
 package com.caimei.service.user.impl;
 
 import com.caimei.entity.*;
+import com.caimei.mapper.products.HomePageMapper;
 import com.caimei.mapper.user.PersonalMapper;
 import com.caimei.service.user.PersonalService;
 import com.github.pagehelper.PageHelper;
@@ -17,6 +18,8 @@ import java.util.Map;
 public class PersonalServiceImpl implements PersonalService {
     @Autowired
     private PersonalMapper personalMapper;
+    @Autowired
+    private HomePageMapper homePageMapper;
 
     @Override
     public Club myCentre(CmOperationUser operationUser) {
@@ -25,6 +28,9 @@ public class PersonalServiceImpl implements PersonalService {
             Double ableUserMoney = club.getAbleUserMoney();
             String userMoney = String.format("%.2f", ableUserMoney);
             club.setUserMoney(userMoney);
+            //购物车数量
+            Integer count = homePageMapper.cartQuantity(club.getUserID());
+            club.setCartCount(count);
         }
         return club;
     }

src/main/resources/mapper/ShoppingMapper.xml

@@ -17,7 +17,7 @@
         GROUP BY
           s.shopID
         ORDER BY
-          cmc.addTime DESC
+          MAX(cmc.addTime) DESC
     </select>
 
     <select id="findAllProducts" resultType="com.caimei.entity.CmOrganizeProducts" parameterType="int">
@@ -33,6 +33,7 @@
           LEFT JOIN product p ON cmop.productID = p.productID
         WHERE
           p.shopID = #{shopID}
+          AND cmc.userID = #{userID}
           AND cmc.delFlag = '0'
         ORDER BY
           cmc.addTime DESC