页面结构调整2

src/main/java/com/caimei/www/controller/BaseController.java

@@ -1,7 +1,7 @@
 package com.caimei.www.controller;
 
-import com.caimei.www.pojo.base.BaseLink;
-import com.caimei.www.pojo.base.TopMenu;
+import com.caimei.www.pojo.page.BaseLink;
+import com.caimei.www.pojo.page.TopMenu;
 import com.caimei.www.service.BaseService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;

src/main/java/com/caimei/www/controller/authorized/ShoppingCartController.java

@@ -2,7 +2,8 @@ package com.caimei.www.controller.authorized;
 
 import com.caimei.www.controller.BaseController;
 import com.caimei.www.pojo.JsonModel;
-import com.caimei.www.pojo.base.ShoppingCart;
+import com.caimei.www.pojo.order.CartItem;
+import com.caimei.www.pojo.order.CartSupplier;
 import com.caimei.www.service.ShoppingCartService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -32,7 +33,7 @@ public class ShoppingCartController extends BaseController {
      */
     @GetMapping("/header/cart")
     @ResponseBody
-    public JsonModel<List<ShoppingCart>> getHeadCarts(Integer userId) {
+    public JsonModel<List<CartItem>> getHeadCarts(Integer userId) {
         return shoppingCartService.getHeaderCart(userId);
     }
 
@@ -42,7 +43,7 @@ public class ShoppingCartController extends BaseController {
      */
     @GetMapping("/cart/list")
     @ResponseBody
-    public JsonModel<List<ShoppingCart>> getShoppingCarts(Integer userId) {
+    public JsonModel<List<CartSupplier>> getShoppingCarts(Integer userId) {
         return shoppingCartService.getShoppingCarts(userId);
     }
 

src/main/java/com/caimei/www/controller/unlimited/HomeController.java

@@ -1,10 +1,10 @@
 package com.caimei.www.controller.unlimited;
 
 import com.caimei.www.controller.BaseController;
-import com.caimei.www.pojo.content.ImageLink;
+import com.caimei.www.pojo.page.ImageLink;
 import com.caimei.www.pojo.JsonModel;
-import com.caimei.www.pojo.content.PageFloor;
-import com.caimei.www.pojo.content.ProductList;
+import com.caimei.www.pojo.page.PageFloor;
+import com.caimei.www.pojo.page.ProductList;
 import com.caimei.www.service.HomeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;

src/main/java/com/caimei/www/controller/unlimited/InstrumentController.java

@@ -2,8 +2,8 @@ package com.caimei.www.controller.unlimited;
 
 import com.caimei.www.controller.BaseController;
 import com.caimei.www.pojo.JsonModel;
-import com.caimei.www.pojo.content.PageContent;
-import com.caimei.www.pojo.content.PageFloor;
+import com.caimei.www.pojo.page.PageContent;
+import com.caimei.www.pojo.page.PageFloor;
 import com.caimei.www.service.InstrumentService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;

src/main/java/com/caimei/www/controller/unlimited/ProductController.java

@@ -2,9 +2,9 @@ package com.caimei.www.controller.unlimited;
 
 import com.caimei.www.controller.BaseController;
 import com.caimei.www.pojo.JsonModel;
-import com.caimei.www.pojo.content.ProductDetail;
-import com.caimei.www.pojo.content.ProductList;
-import com.caimei.www.pojo.content.Parameter;
+import com.caimei.www.pojo.page.ProductDetail;
+import com.caimei.www.pojo.page.ProductList;
+import com.caimei.www.pojo.page.Parameter;
 import com.caimei.www.service.ProductService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;

src/main/java/com/caimei/www/controller/unlimited/SinglePageController.java

@@ -2,9 +2,9 @@ package com.caimei.www.controller.unlimited;
 
 import com.caimei.www.controller.BaseController;
 import com.caimei.www.pojo.JsonModel;
-import com.caimei.www.pojo.content.ImageLink;
-import com.caimei.www.pojo.content.PageContent;
-import com.caimei.www.pojo.content.PageFloor;
+import com.caimei.www.pojo.page.ImageLink;
+import com.caimei.www.pojo.page.PageContent;
+import com.caimei.www.pojo.page.PageFloor;
 import com.caimei.www.service.SinglePageService;
 import com.github.pagehelper.PageInfo;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/caimei/www/controller/unlimited/SupplierController.java

@@ -2,8 +2,8 @@ package com.caimei.www.controller.unlimited;
 
 import com.caimei.www.controller.BaseController;
 import com.caimei.www.pojo.JsonModel;
-import com.caimei.www.pojo.content.ProductList;
-import com.caimei.www.pojo.content.SupplierDetail;
+import com.caimei.www.pojo.page.ProductList;
+import com.caimei.www.pojo.page.SupplierDetail;
 import com.caimei.www.service.SupplierService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;

src/main/java/com/caimei/www/mapper/BaseDao.java

@@ -1,6 +1,6 @@
 package com.caimei.www.mapper;
 
-import com.caimei.www.pojo.base.*;
+import com.caimei.www.pojo.page.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

src/main/java/com/caimei/www/mapper/HomeDao.java

@@ -1,8 +1,8 @@
 package com.caimei.www.mapper;
 
-import com.caimei.www.pojo.content.PageFloor;
-import com.caimei.www.pojo.content.ImageLink;
-import com.caimei.www.pojo.content.ProductList;
+import com.caimei.www.pojo.page.PageFloor;
+import com.caimei.www.pojo.page.ImageLink;
+import com.caimei.www.pojo.page.ProductList;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

src/main/java/com/caimei/www/mapper/InstrumentDao.java

@@ -1,9 +1,7 @@
 package com.caimei.www.mapper;
 
-import com.caimei.www.pojo.content.ImageLink;
-import com.caimei.www.pojo.content.PageContent;
-import com.caimei.www.pojo.content.PageFloor;
-import com.caimei.www.pojo.content.Parameter;
+import com.caimei.www.pojo.page.PageContent;
+import com.caimei.www.pojo.page.Parameter;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

src/main/java/com/caimei/www/mapper/ProductDao.java

@@ -1,8 +1,8 @@
 package com.caimei.www.mapper;
 
-import com.caimei.www.pojo.content.ProductDetail;
-import com.caimei.www.pojo.content.ProductList;
-import com.caimei.www.pojo.content.Parameter;
+import com.caimei.www.pojo.page.ProductDetail;
+import com.caimei.www.pojo.page.ProductList;
+import com.caimei.www.pojo.page.Parameter;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

src/main/java/com/caimei/www/mapper/ShoppingCartDao.java

@@ -1,7 +1,9 @@
 package com.caimei.www.mapper;
 
-import com.caimei.www.pojo.base.ShoppingCart;
+import com.caimei.www.pojo.order.CartItem;
+import com.caimei.www.pojo.order.CartSupplier;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -16,5 +18,19 @@ public interface ShoppingCartDao {
     /**
      * 顶部购物车数据
      */
-    List<ShoppingCart> getHeadCarts(Integer userId);
+    List<CartItem> getHeadCarts(Integer userId);
+
+    /**
+     * 购物车列表-供应商
+     * @param userId
+     * @return
+     */
+    List<CartSupplier> getCartSuppliers(Integer userId);
+
+    /**
+     * 根据供应商ID查询购物车列表
+     * @param supplierId
+     * @return
+     */
+    List<CartItem> getShoppingCartBySupplierId(@Param("supplierId") Integer supplierId, @Param("userId") Integer userId);
 }

src/main/java/com/caimei/www/mapper/SinglePageDao.java

@@ -1,8 +1,8 @@
 package com.caimei.www.mapper;
 
-import com.caimei.www.pojo.content.ImageLink;
-import com.caimei.www.pojo.content.PageContent;
-import com.caimei.www.pojo.content.PageFloor;
+import com.caimei.www.pojo.page.ImageLink;
+import com.caimei.www.pojo.page.PageContent;
+import com.caimei.www.pojo.page.PageFloor;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

src/main/java/com/caimei/www/mapper/SupplierDao.java

@@ -1,7 +1,7 @@
 package com.caimei.www.mapper;
 
-import com.caimei.www.pojo.content.ProductList;
-import com.caimei.www.pojo.content.SupplierDetail;
+import com.caimei.www.pojo.page.ProductList;
+import com.caimei.www.pojo.page.SupplierDetail;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

src/main/java/com/caimei/www/pojo/base/ShoppingCart.java → src/main/java/com/caimei/www/pojo/order/CartItem.java

@@ -1,7 +1,9 @@
-package com.caimei.www.pojo.base;
+package com.caimei.www.pojo.order;
 
 import lombok.Data;
 
+import java.io.Serializable;
+
 /**
  * 顶部购物车数据（简洁数据）
  *
@@ -9,11 +11,14 @@ import lombok.Data;
  * @date : 2020/7/1
  */
 @Data
-public class ShoppingCart {
+public class CartItem implements Serializable {
 	private Integer id;
 	private String name;
 	private String image;
 	private Double price;
 	private String unit;
+	private Integer step;
 	private Integer number;
+
+    private static final long serialVersionUID = 1L;
 }

src/main/java/com/caimei/www/pojo/order/CartSupplier.java

@@ -0,0 +1,23 @@
+package com.caimei.www.pojo.order;
+
+import com.caimei.www.pojo.page.BaseLink;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * Description
+ *
+ * @author : Charles
+ * @date : 2020/7/23
+ */
+@Data
+public class CartSupplier implements Serializable {
+	private Integer id;
+	private String name;
+	private String logo;
+	private List<CartItem> cartList;
+
+    private static final long serialVersionUID = 1L;
+}

src/main/java/com/caimei/www/pojo/base/BaseLink.java → src/main/java/com/caimei/www/pojo/page/BaseLink.java

@@ -1,7 +1,8 @@
-package com.caimei.www.pojo.base;
+package com.caimei.www.pojo.page;
 
 import lombok.Data;
 
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -11,11 +12,12 @@ import java.util.List;
  * @date : 2020/6/19
  */
 @Data
-public class BaseLink {
-	private static final long serialVersionUID = 1L;
+public class BaseLink implements Serializable {
 	private Integer id;
 	private Integer typeId;
 	private String name;
 	private String link;
 	private List<BaseLink> linkList;
+
+    private static final long serialVersionUID = 1L;
 }

src/main/java/com/caimei/www/pojo/content/ImageLink.java → src/main/java/com/caimei/www/pojo/page/ImageLink.java

@@ -1,7 +1,8 @@
-package com.caimei.www.pojo.content;
+package com.caimei.www.pojo.page;
 
 import lombok.Data;
 
+import java.io.Serializable;
 import java.util.Date;
 
 /**
@@ -11,7 +12,7 @@ import java.util.Date;
  * @date : 2020/6/22
  */
 @Data
-public class ImageLink {
+public class ImageLink implements Serializable {
 	private Integer id;
 	private Integer status;
 	private String title;
@@ -22,4 +23,6 @@ public class ImageLink {
 	private Date beginTime;
 	/** 活动开始时间 */
 	private Date endTime;
+
+    private static final long serialVersionUID = 1L;
 }

src/main/java/com/caimei/www/pojo/content/PageContent.java → src/main/java/com/caimei/www/pojo/page/PageContent.java

@@ -1,4 +1,4 @@
-package com.caimei.www.pojo.content;
+package com.caimei.www.pojo.page;
 
 import lombok.Data;
 

src/main/java/com/caimei/www/pojo/content/PageFloor.java → src/main/java/com/caimei/www/pojo/page/PageFloor.java

@@ -1,7 +1,8 @@
-package com.caimei.www.pojo.content;
+package com.caimei.www.pojo.page;
 
 import lombok.Data;
 
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -11,7 +12,7 @@ import java.util.List;
  * @date : 2020/6/22
  */
 @Data
-public class PageFloor {
+public class PageFloor implements Serializable {
 	private Integer id;
 	private Integer type;
 	private String title;
@@ -19,4 +20,6 @@ public class PageFloor {
 	private String link;
 	private List<PageFloor> subFloors;
 	private List<ImageLink> floorData;
+
+    private static final long serialVersionUID = 1L;
 }

src/main/java/com/caimei/www/pojo/content/Parameter.java → src/main/java/com/caimei/www/pojo/page/Parameter.java

@@ -1,4 +1,4 @@
-package com.caimei.www.pojo.content;
+package com.caimei.www.pojo.page;
 
 import lombok.Data;
 

src/main/java/com/caimei/www/pojo/content/ProductDetail.java → src/main/java/com/caimei/www/pojo/page/ProductDetail.java

@@ -1,4 +1,4 @@
-package com.caimei.www.pojo.content;
+package com.caimei.www.pojo.page;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

src/main/java/com/caimei/www/pojo/content/ProductList.java → src/main/java/com/caimei/www/pojo/page/ProductList.java

@@ -1,4 +1,4 @@
-package com.caimei.www.pojo.content;
+package com.caimei.www.pojo.page;
 
 import lombok.Data;
 

src/main/java/com/caimei/www/pojo/base/SubMenu.java → src/main/java/com/caimei/www/pojo/page/SubMenu.java

@@ -1,7 +1,9 @@
-package com.caimei.www.pojo.base;
+package com.caimei.www.pojo.page;
 
 import lombok.Data;
 
+import java.io.Serializable;
+
 /**
  * 二级导航栏
  *
@@ -9,8 +11,7 @@ import lombok.Data;
  * @date : 2020/6/18
  */
 @Data
-public class SubMenu {
-	private static final long serialVersionUID = 1L;
+public class SubMenu implements Serializable {
 	private Integer id;
 	/** 一级导航栏ID */
 	private Integer topId;
@@ -22,4 +23,6 @@ public class SubMenu {
 	private String link;
 	/** 排序 */
 	private String sort;
+
+	private static final long serialVersionUID = 1L;
 }

src/main/java/com/caimei/www/pojo/content/SupplierDetail.java → src/main/java/com/caimei/www/pojo/page/SupplierDetail.java

@@ -1,4 +1,4 @@
-package com.caimei.www.pojo.content;
+package com.caimei.www.pojo.page;
 
 import lombok.Data;
 

src/main/java/com/caimei/www/pojo/base/TopMenu.java → src/main/java/com/caimei/www/pojo/page/TopMenu.java

@@ -1,7 +1,8 @@
-package com.caimei.www.pojo.base;
+package com.caimei.www.pojo.page;
 
 import lombok.Data;
 
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -11,8 +12,7 @@ import java.util.List;
  * @date : 2020/6/18
  */
 @Data
-public class TopMenu {
-	private static final long serialVersionUID = 1L;
+public class TopMenu implements Serializable {
 	private Integer id;
     /** 一级导航栏名称 */
 	private String name;
@@ -24,4 +24,6 @@ public class TopMenu {
 	private String sort;
 	/** 二级导航列表 */
 	private List<SubMenu> subMenus;
+
+	private static final long serialVersionUID = 1L;
 }

src/main/java/com/caimei/www/service/BaseService.java

@@ -1,7 +1,7 @@
 package com.caimei.www.service;
 
-import com.caimei.www.pojo.base.BaseLink;
-import com.caimei.www.pojo.base.TopMenu;
+import com.caimei.www.pojo.page.BaseLink;
+import com.caimei.www.pojo.page.TopMenu;
 
 import java.util.List;
 

src/main/java/com/caimei/www/service/HomeService.java

@@ -1,9 +1,9 @@
 package com.caimei.www.service;
 
-import com.caimei.www.pojo.content.ImageLink;
+import com.caimei.www.pojo.page.ImageLink;
 import com.caimei.www.pojo.JsonModel;
-import com.caimei.www.pojo.content.PageFloor;
-import com.caimei.www.pojo.content.ProductList;
+import com.caimei.www.pojo.page.PageFloor;
+import com.caimei.www.pojo.page.ProductList;
 
 import java.util.List;
 import java.util.Map;

src/main/java/com/caimei/www/service/InstrumentService.java

@@ -1,8 +1,8 @@
 package com.caimei.www.service;
 
 import com.caimei.www.pojo.JsonModel;
-import com.caimei.www.pojo.content.PageContent;
-import com.caimei.www.pojo.content.PageFloor;
+import com.caimei.www.pojo.page.PageContent;
+import com.caimei.www.pojo.page.PageFloor;
 
 import java.util.List;
 

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

@@ -1,9 +1,9 @@
 package com.caimei.www.service;
 
 import com.caimei.www.pojo.JsonModel;
-import com.caimei.www.pojo.content.ProductDetail;
-import com.caimei.www.pojo.content.ProductList;
-import com.caimei.www.pojo.content.Parameter;
+import com.caimei.www.pojo.page.ProductDetail;
+import com.caimei.www.pojo.page.ProductList;
+import com.caimei.www.pojo.page.Parameter;
 
 import java.util.List;
 

src/main/java/com/caimei/www/service/ShoppingCartService.java

@@ -1,7 +1,8 @@
 package com.caimei.www.service;
 
 import com.caimei.www.pojo.JsonModel;
-import com.caimei.www.pojo.base.ShoppingCart;
+import com.caimei.www.pojo.order.CartItem;
+import com.caimei.www.pojo.order.CartSupplier;
 
 import java.util.List;
 
@@ -17,11 +18,11 @@ public interface ShoppingCartService {
      * @param userId
      * @return
      */
-    JsonModel<List<ShoppingCart>> getHeaderCart(Integer userId);
+    JsonModel<List<CartItem>> getHeaderCart(Integer userId);
     /**
      * 购物车列表
      * @param userId
      * @return
      */
-    JsonModel<List<ShoppingCart>> getShoppingCarts(Integer userId);
+    JsonModel<List<CartSupplier>> getShoppingCarts(Integer userId);
 }

src/main/java/com/caimei/www/service/SinglePageService.java

@@ -1,9 +1,9 @@
 package com.caimei.www.service;
 
 import com.caimei.www.pojo.JsonModel;
-import com.caimei.www.pojo.content.ImageLink;
-import com.caimei.www.pojo.content.PageContent;
-import com.caimei.www.pojo.content.PageFloor;
+import com.caimei.www.pojo.page.ImageLink;
+import com.caimei.www.pojo.page.PageContent;
+import com.caimei.www.pojo.page.PageFloor;
 import com.github.pagehelper.PageInfo;
 import org.springframework.http.server.reactive.ServerHttpResponse;
 import reactor.core.publisher.Mono;

src/main/java/com/caimei/www/service/SupplierService.java

@@ -1,8 +1,8 @@
 package com.caimei.www.service;
 
 import com.caimei.www.pojo.JsonModel;
-import com.caimei.www.pojo.content.ProductList;
-import com.caimei.www.pojo.content.SupplierDetail;
+import com.caimei.www.pojo.page.ProductList;
+import com.caimei.www.pojo.page.SupplierDetail;
 
 import java.util.List;
 

src/main/java/com/caimei/www/service/impl/BaseServiceImpl.java

@@ -2,7 +2,7 @@ package com.caimei.www.service.impl;
 
 
 import com.caimei.www.mapper.BaseDao;
-import com.caimei.www.pojo.base.*;
+import com.caimei.www.pojo.page.*;
 import com.caimei.www.service.BaseService;
 import com.caimei.www.utils.ImageUtil;
 import org.springframework.beans.factory.annotation.Value;

src/main/java/com/caimei/www/service/impl/HomeServiceImpl.java

@@ -2,9 +2,9 @@ package com.caimei.www.service.impl;
 
 import com.caimei.www.pojo.JsonModel;
 import com.caimei.www.mapper.HomeDao;
-import com.caimei.www.pojo.content.PageFloor;
-import com.caimei.www.pojo.content.ImageLink;
-import com.caimei.www.pojo.content.ProductList;
+import com.caimei.www.pojo.page.PageFloor;
+import com.caimei.www.pojo.page.ImageLink;
+import com.caimei.www.pojo.page.ProductList;
 import com.caimei.www.service.HomeService;
 import com.caimei.www.utils.ImageUtil;
 import com.caimei.www.utils.PriceUtil;

src/main/java/com/caimei/www/service/impl/InstrumentServiceImpl.java

@@ -3,10 +3,10 @@ package com.caimei.www.service.impl;
 import com.caimei.www.mapper.InstrumentDao;
 import com.caimei.www.mapper.SinglePageDao;
 import com.caimei.www.pojo.JsonModel;
-import com.caimei.www.pojo.content.ImageLink;
-import com.caimei.www.pojo.content.PageContent;
-import com.caimei.www.pojo.content.PageFloor;
-import com.caimei.www.pojo.content.Parameter;
+import com.caimei.www.pojo.page.ImageLink;
+import com.caimei.www.pojo.page.PageContent;
+import com.caimei.www.pojo.page.PageFloor;
+import com.caimei.www.pojo.page.Parameter;
 import com.caimei.www.service.InstrumentService;
 import com.caimei.www.utils.ImageUtil;
 import org.springframework.beans.factory.annotation.Value;

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

@@ -2,9 +2,9 @@ package com.caimei.www.service.impl;
 
 import com.caimei.www.pojo.JsonModel;
 import com.caimei.www.mapper.ProductDao;
-import com.caimei.www.pojo.content.ProductDetail;
-import com.caimei.www.pojo.content.ProductList;
-import com.caimei.www.pojo.content.Parameter;
+import com.caimei.www.pojo.page.ProductDetail;
+import com.caimei.www.pojo.page.ProductList;
+import com.caimei.www.pojo.page.Parameter;
 import com.caimei.www.service.ProductService;
 import com.caimei.www.utils.ImageUtil;
 import io.netty.util.internal.StringUtil;
@@ -12,7 +12,6 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
 import java.util.List;
 
 /**

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

@@ -2,13 +2,15 @@ package com.caimei.www.service.impl;
 
 import com.caimei.www.mapper.ShoppingCartDao;
 import com.caimei.www.pojo.JsonModel;
-import com.caimei.www.pojo.base.ShoppingCart;
+import com.caimei.www.pojo.order.CartItem;
+import com.caimei.www.pojo.order.CartSupplier;
 import com.caimei.www.service.ShoppingCartService;
+import com.caimei.www.utils.ImageUtil;
+import com.caimei.www.utils.PriceUtil;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -31,9 +33,9 @@ public class ShoppingCartServiceImpl implements ShoppingCartService {
      * @return
      */
     @Override
-    public JsonModel<List<ShoppingCart>> getHeaderCart(Integer userId) {
+    public JsonModel<List<CartItem>> getHeaderCart(Integer userId) {
         if (userId == null || userId == 0) { return JsonModel.error("参数异常", null);}
-        List<ShoppingCart> headCarts = shoppingCartDao.getHeadCarts(userId);
+        List<CartItem> headCarts = shoppingCartDao.getHeadCarts(userId);
         return JsonModel.success(headCarts);
     }
 
@@ -44,10 +46,13 @@ public class ShoppingCartServiceImpl implements ShoppingCartService {
      * @return
      */
     @Override
-    public JsonModel<List<ShoppingCart>> getShoppingCarts(Integer userId) {
+    public JsonModel<List<CartSupplier>> getShoppingCarts(Integer userId) {
         if (userId == null || userId == 0) { return JsonModel.error("参数异常", null);}
-        /*List<ShoppingCart> shoppingCarts = shoppingCartDao.getShoppingCarts(userId);
-        return JsonModel.success(shoppingCarts);*/
-        return null;
+        List<CartSupplier> cartSuppliers = shoppingCartDao.getCartSuppliers(userId);
+        cartSuppliers.forEach(supplier -> {
+            List<CartItem> cartItems = shoppingCartDao.getShoppingCartBySupplierId(supplier.getId(), userId);
+            supplier.setCartList(null);
+        });
+        return JsonModel.success(cartSuppliers);
     }
 }

src/main/java/com/caimei/www/service/impl/SinglePageServiceImpl.java

@@ -2,9 +2,9 @@ package com.caimei.www.service.impl;
 
 import com.caimei.www.mapper.SinglePageDao;
 import com.caimei.www.pojo.JsonModel;
-import com.caimei.www.pojo.content.ImageLink;
-import com.caimei.www.pojo.content.PageContent;
-import com.caimei.www.pojo.content.PageFloor;
+import com.caimei.www.pojo.page.ImageLink;
+import com.caimei.www.pojo.page.PageContent;
+import com.caimei.www.pojo.page.PageFloor;
 import com.caimei.www.service.SinglePageService;
 import com.caimei.www.utils.ImageUtil;
 import com.github.pagehelper.PageHelper;
@@ -22,7 +22,6 @@ import javax.annotation.Resource;
 import java.io.*;
 import java.net.URLEncoder;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
 import java.util.List;
 
 /**

src/main/java/com/caimei/www/service/impl/SupplierServiceImpl.java

@@ -2,8 +2,8 @@ package com.caimei.www.service.impl;
 
 import com.caimei.www.mapper.SupplierDao;
 import com.caimei.www.pojo.JsonModel;
-import com.caimei.www.pojo.content.ProductList;
-import com.caimei.www.pojo.content.SupplierDetail;
+import com.caimei.www.pojo.page.ProductList;
+import com.caimei.www.pojo.page.SupplierDetail;
 import com.caimei.www.service.SupplierService;
 import com.caimei.www.utils.ImageUtil;
 import com.caimei.www.utils.PriceUtil;
@@ -11,7 +11,6 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
 import java.util.List;
 
 /**

src/main/resources/mapper/BaseMapper.xml

@@ -6,7 +6,7 @@
         where validFlag=1
         order by sortIndex desc
     </select>
-    <select id="getTopMenus" resultType="com.caimei.www.pojo.base.TopMenu">
+    <select id="getTopMenus" resultType="com.caimei.www.pojo.page.TopMenu">
 		select
             id,
             navigationName as name,
@@ -18,7 +18,7 @@
 		order by sort desc,createDate desc
 		limit 7
     </select>
-    <select id="getSubMenus" resultType="com.caimei.www.pojo.base.SubMenu">
+    <select id="getSubMenus" resultType="com.caimei.www.pojo.page.SubMenu">
 		select
             id,
             firstNavigationId as topId,
@@ -31,13 +31,13 @@
 		and firstNavigationId = #{topId}
 		order by sort desc,createDate desc
     </select>
-    <select id="getHelpPageTypes" resultType="com.caimei.www.pojo.base.BaseLink">
+    <select id="getHelpPageTypes" resultType="com.caimei.www.pojo.page.BaseLink">
 		SELECT
 		c_helpPageTypeID as id,
 		c_helpPageTypeName as name
 		FROM c_helpPageType
     </select>
-    <select id="getHelpPagesByType" resultType="com.caimei.www.pojo.base.BaseLink">
+    <select id="getHelpPagesByType" resultType="com.caimei.www.pojo.page.BaseLink">
 		select
             helpPageID as id,
             helpPageTypeID as typeId,
@@ -47,7 +47,7 @@
 		and helpPageTypeID = #{typeId}
 		order by sortIndex
     </select>
-    <select id="getFriendLinks" resultType="com.caimei.www.pojo.base.BaseLink">
+    <select id="getFriendLinks" resultType="com.caimei.www.pojo.page.BaseLink">
 		select id,name,link
 		from new_page_friendship_link
 		where delFlag = 0 order by id

src/main/resources/mapper/HomeMapper.xml

@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.caimei.www.mapper.HomeDao">
-	<select id="getHomePageFloor" resultType="com.caimei.www.pojo.content.PageFloor">
+	<select id="getHomePageFloor" resultType="com.caimei.www.pojo.page.PageFloor">
 		select id, type, floorTitle as title, floorDetail as detail
 		from new_page_floor
 		where delFlag = 0 and wwwEnabledStatus = '1'
 		order by sort
 	</select>
-	<select id="getHomeBigTopicFloor" resultType="com.caimei.www.pojo.content.PageFloor">
+	<select id="getHomeBigTopicFloor" resultType="com.caimei.www.pojo.page.PageFloor">
 		select id, title, description as detail
 		from cm_page_big_topic
 		where delFlag = 0 and enabledStatus = '1'
 		order by sort
 	</select>
-    <select id="getHomeBanners" resultType="com.caimei.www.pojo.content.ImageLink">
+    <select id="getHomeBanners" resultType="com.caimei.www.pojo.page.ImageLink">
 		select id, title, link, image
 		from new_page_homeImage
 		where wwwEnabledStatus = 1
 		order by sort desc, createDate desc
     </select>
-	<select id="getAdvertising" resultType="com.caimei.www.pojo.content.ImageLink">
+	<select id="getAdvertising" resultType="com.caimei.www.pojo.page.ImageLink">
 		select id, adTitle as title, link, adImage as image
 		from new_page_advertising
 		where delFlag = 0
 		order by sort, createDate desc
 	</select>
-	<select id="getRecommendeds" resultType="com.caimei.www.pojo.content.ProductList">
+	<select id="getRecommendeds" resultType="com.caimei.www.pojo.page.ProductList">
 		select
 			p.productID as pid,
 			p.`name` as `name`,
@@ -41,7 +41,7 @@
 		and p.shopID not in (SELECT s.`value` FROM `sys_dict` s WHERE s.type='heheShopID')
 		order by p.actSort
 	</select>
-	<select id="getBigTopicData" resultType="com.caimei.www.pojo.content.ImageLink">
+	<select id="getBigTopicData" resultType="com.caimei.www.pojo.page.ImageLink">
 		select
             id,
             title,
@@ -57,7 +57,7 @@
 		order by sort ,enabledStatus ,createDate
 		limit 0,5
 	</select>
-    <select id="getCommodityTopicData" resultType="com.caimei.www.pojo.content.ImageLink">
+    <select id="getCommodityTopicData" resultType="com.caimei.www.pojo.page.ImageLink">
 		select
             id,
             title,
@@ -71,7 +71,7 @@
 		and <![CDATA[ beginTime < sysdate() ]]>
 		order by sort limit 0,3
     </select>
-	<select id="getSmallTopicData" resultType="com.caimei.www.pojo.content.ImageLink">
+	<select id="getSmallTopicData" resultType="com.caimei.www.pojo.page.ImageLink">
 		select
             id,
             title,
@@ -82,7 +82,7 @@
 		order by sort
 		limit 0,4
 	</select>
-	<select id="getSuppliersTopData" resultType="com.caimei.www.pojo.content.ImageLink">
+	<select id="getSuppliersTopData" resultType="com.caimei.www.pojo.page.ImageLink">
 		select
             id,
             supplierName as title,

src/main/resources/mapper/InstrumentMapper.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.caimei.www.mapper.InstrumentDao">
-    <select id="getInstrumentById" resultType="com.caimei.www.pojo.content.PageContent">
+    <select id="getInstrumentById" resultType="com.caimei.www.pojo.page.PageContent">
         select id, type, title, keywords, description, headImage as image
 		from cm_page
 		where id = #{instrumentId} and type='2' and enabledStatus=1
     </select>
-    <select id="getParametersByInstrumentId" resultType="com.caimei.www.pojo.content.Parameter">
+    <select id="getParametersByInstrumentId" resultType="com.caimei.www.pojo.page.Parameter">
         select id,
                pageId as parentId,
                name,

src/main/resources/mapper/ProductMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.caimei.www.mapper.ProductDao">
-	<select id="getProductDetailById" resultType="com.caimei.www.pojo.content.ProductDetail">
+	<select id="getProductDetailById" resultType="com.caimei.www.pojo.page.ProductDetail">
 		select
 			p.productID as pid,
 			p.`name` as `name`,
@@ -54,7 +54,7 @@
 
 		where p.productID = #{productId}
 	</select>
-	<select id="getProductRecommendsById" resultType="com.caimei.www.pojo.content.ProductList">
+	<select id="getProductRecommendsById" resultType="com.caimei.www.pojo.page.ProductList">
         select
 			p.productID as pid,
 			p.`name` as `name`,
@@ -65,7 +65,7 @@
             p.productID = #{productId} and validFlag  = 2
         order by pr.sort desc
 	</select>
-	<select id="getAutoProductRecommends" resultType="com.caimei.www.pojo.content.ProductList">
+	<select id="getAutoProductRecommends" resultType="com.caimei.www.pojo.page.ProductList">
         select
 			p.productID as pid,
 			p.`name` as `name`,
@@ -76,7 +76,7 @@
 			p.tinyTypeID = (select tinyTypeID from product as p1 where p1.productID = #{productId})
         order by p.sellNumber desc limit 0,7
 	</select>
-	<select id="getProductParameters" resultType="com.caimei.www.pojo.content.Parameter">
+	<select id="getProductParameters" resultType="com.caimei.www.pojo.page.Parameter">
 		select id as id,
 		productId as parentId,
 		paramsName as `name`,

src/main/resources/mapper/ShoppingCartMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.caimei.www.mapper.ShoppingCartDao">
-    <select id="getHeadCarts" resultType="com.caimei.www.pojo.base.ShoppingCart">
+    <select id="getHeadCarts" resultType="com.caimei.www.pojo.order.CartItem">
 		select
 			p.productID as id,
 			p.`name` as `name`,
@@ -17,5 +17,32 @@
         and p.stock != '0'
         and p.stock <![CDATA[ >= ]]> c.productCount
 	</select>
+	<select id="getCartSuppliers" resultType="com.caimei.www.pojo.order.CartSupplier">
+		select
+			s.shopID as id,
+			s.name,
+			s.logo
+		from cm_cart c
+		left join product p on c.productID = p.productID
+		left join shop s on p.shopID = s.shopID
+		where c.userID = #{userId}
+		group by s.shopID
+		order by MAX(c.addTime) desc
+	</select>
+	<select id="getShoppingCartBySupplierId" resultType="com.caimei.www.pojo.order.CartItem">
+		select
+			p.productID as id,
+			p.`name` as `name`,
+			p.mainImage as image,
+			p.price1 as price,
+			p.unit as unit,
+			p.step as step,
+			c.productCount as number
+		from cm_cart c
+		left join product p on c.productID = p.productID
+		where p.shopID = #{supplierId} and c.userID = #{userId}
+		order by c.addTime desc
+	</select>
+
 
 </mapper>

src/main/resources/mapper/SinglePageMapper.xml

@@ -1,32 +1,32 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.caimei.www.mapper.SinglePageDao">
-    <select id="getFreePageById" resultType="com.caimei.www.pojo.content.PageContent">
+    <select id="getFreePageById" resultType="com.caimei.www.pojo.page.PageContent">
         select  a.id, a.type, a.title, a.keywords, a.description, f.content
         from cm_page a
         left join cm_page_freedom f on a.id=f.pageId
         where a.type=4 and a.enabledStatus=1 and f.type=1
         and a.id=#{id}
     </select>
-    <select id="getTopicPageById" resultType="com.caimei.www.pojo.content.PageContent">
+    <select id="getTopicPageById" resultType="com.caimei.www.pojo.page.PageContent">
         select  a.id, a.type, a.title, a.keywords, a.description, a.headImage as image, a.headText as content
         from cm_page a
         where a.type=1 and a.enabledStatus=1
         and a.id=#{id}
     </select>
-    <select id="getLivePageData" resultType="com.caimei.www.pojo.content.PageContent">
+    <select id="getLivePageData" resultType="com.caimei.www.pojo.page.PageContent">
         select  a.id, a.type, a.title, a.keywords, a.description, a.headImage as image, a.headText as content
         from cm_page a
         where a.id=1 and a.type=3 and a.enabledStatus=1
     </select>
-    <select id="getFloorByPageId" resultType="com.caimei.www.pojo.content.PageFloor">
+    <select id="getFloorByPageId" resultType="com.caimei.www.pojo.page.PageFloor">
         select id, pageId as type, title, link
         from cm_page_centre
         where pageId=#{id}
         and enabledStatus=1
         order by sort desc,createDate desc
     </select>
-    <select id="getDataByFloorId" resultType="com.caimei.www.pojo.content.ImageLink">
+    <select id="getDataByFloorId" resultType="com.caimei.www.pojo.page.ImageLink">
         select  a.id as id,
                 a.title as title,
                 a.link as link,
@@ -38,7 +38,7 @@
         where b.centreId=#{floorId} and  a.enabledStatus=1
         order  by a.sort desc,a.createDate desc
     </select>
-    <select id="getPromotionsList" resultType="com.caimei.www.pojo.content.ImageLink">
+    <select id="getPromotionsList" resultType="com.caimei.www.pojo.page.ImageLink">
         select  a.id as id,
                 a.title as title,
                 a.link as link,
@@ -49,7 +49,7 @@
         where a.type=4 and a.enabledStatus=1
         order by a.sort desc,a.createDate desc
     </select>
-    <select id="getLiveTeachers" resultType="com.caimei.www.pojo.content.ImageLink">
+    <select id="getLiveTeachers" resultType="com.caimei.www.pojo.page.ImageLink">
         select  a.id as id,
                 a.title as title,
                 a.link as link,

src/main/resources/mapper/SupplierMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.caimei.www.mapper.SupplierDao">
-    <select id="getSupplierById" resultType="com.caimei.www.pojo.content.SupplierDetail">
+    <select id="getSupplierById" resultType="com.caimei.www.pojo.page.SupplierDetail">
         select
             s.shopID as id,
             s.userID as userId,
@@ -24,7 +24,7 @@
         from shopbanner
         where shopID = #{supplierId}
     </select>
-    <select id="getSupplierMainProducts" resultType="com.caimei.www.pojo.content.ProductList">
+    <select id="getSupplierMainProducts" resultType="com.caimei.www.pojo.page.ProductList">
 		select
 			p.productID as pid,
 			p.`name` as `name`,