商品模块整理

base-module/src/main/java/com/caimei/module/base/entity/bo/PageModel.java → base-module/src/main/java/com/caimei/module/base/entity/bo/PageVo.java

@@ -4,7 +4,6 @@ import lombok.Builder;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Collection;
 import java.util.List;
 
 /**
@@ -14,7 +13,7 @@ import java.util.List;
  * @date : 2020/3/9
  */
 @Data
-public class PageModel<T> implements Serializable {
+public class PageVo<T> implements Serializable {
     /** 当前页码 */
     @Builder.Default
     private int pageNum = 1;
@@ -32,7 +31,7 @@ public class PageModel<T> implements Serializable {
     /** 查询结果 */
     List<T> results;
 
-    public PageModel(List<T> list) {
+    public PageVo(List<T> list) {
         if (list instanceof com.github.pagehelper.Page) {
             com.github.pagehelper.Page<T> page = (com.github.pagehelper.Page<T>) list;
             this.pageNum = page.getPageNum();
@@ -41,8 +40,7 @@ public class PageModel<T> implements Serializable {
             this.totalPage = page.getPages();
             setHasPreviousAndNext();
             this.results = page;
-        } else if (list instanceof Collection) {
-            this.pageNum = 1;
+        } else if (list != null) {
             this.pageSize = list.size();
             this.totalRecord = list.size();
             this.totalPage = 1;
@@ -50,7 +48,7 @@ public class PageModel<T> implements Serializable {
         }
     }
 
-    public PageModel(int pageNum, int pageSize, int totalRecord, List<T> results) {
+    public PageVo(int pageNum, int pageSize, int totalRecord, List<T> results) {
         super();
         this.pageNum = pageNum;
         this.pageSize = pageSize;
@@ -69,8 +67,8 @@ public class PageModel<T> implements Serializable {
         }
     }
 
-    public PageModel(int pageNum, int maxSize, int totalRecord, int totalPage,
-                     List<T> results) {
+    public PageVo(int pageNum, int maxSize, int totalRecord, int totalPage,
+                  List<T> results) {
         super();
         this.pageNum = pageNum;
         this.pageSize = maxSize;
@@ -89,7 +87,7 @@ public class PageModel<T> implements Serializable {
         }
     }
 
-    public PageModel() {super();}
+    public PageVo() {super();}
 
     public void setHasPreviousAndNext() {
         if (this.pageNum < 2) {

base-module/src/main/java/com/caimei/module/base/entity/enumerate/ClubRegStatus.java

@@ -0,0 +1,46 @@
+/**
+ * <p>Description: Copyright © 2014-2015 CAIMEI365.com All Rights Reserved</p>
+ * @author zhang
+ * @date 2015年8月18日 下午4:58:04
+ */
+package com.caimei.module.base.entity.enumerate;
+
+/**
+ *
+ * <p>Title: ClubRegStatus</p>
+ * <p>Description: 机构注册状态</p>
+ * <p>Company: caimei365</p>
+ * @author zhang
+ * @date 2015年8月18日 下午4:58:07
+ */
+public enum ClubRegStatus {
+
+	WAIT_SCAN(0, "待扫描"),
+	HAVE_SCAN(1, "已扫描"),
+	ONLINE(2, "已上线");
+
+	private int code;
+	private String desc;
+
+	public int getCode() {
+		return code;
+	}
+
+	public void setCode(int code) {
+		this.code = code;
+	}
+
+	public String getDesc() {
+		return desc;
+	}
+
+	public void setDesc(String desc) {
+		this.desc = desc;
+	}
+
+	ClubRegStatus(int code, String desc) {
+		this.code = code;
+		this.desc = desc;
+	}
+
+}

base-module/src/main/java/com/caimei/module/base/entity/enumerate/ClubStatus.java

@@ -0,0 +1,62 @@
+/**
+ * <p>Description: Copyright © 2014-2015 CAIMEI365.com All Rights Reserved</p>
+ * @author zhang
+ * @date 2015年8月18日 下午4:42:31
+ */
+package com.caimei.module.base.entity.enumerate;
+
+/**
+ *
+ * <p>Title: ClubStatus</p>
+ * <p>Description: 机构状态</p>
+ * <p>Company: caimei365</p>
+ * @author zhang
+ * @date 2015年8月18日 下午4:42:34
+ */
+public enum ClubStatus {
+
+//	-20 陌生拜访注册
+	WAIT_CHECK(1, "待审查资料"),
+	COMPLETE_FIRST_PURCHASE(40, "已完成第一次采购"),
+	ONLINE(90, "已上线"),
+	FREEZE(91, "已冻结"),
+	CHECK_FAIL(92, "审查资料未通过,待补充资料"),
+	PHONE_INVITE(2, "电话预约"),
+	HAVE_INVITE(3, "已预约"),
+
+	@Deprecated
+	WAIT_AGREE(20, "待确认"),
+	@Deprecated
+	WAIT_VISIT(21, "待拜访"),
+	@Deprecated
+	WAIT_STAFF_RECOMMEND(30, "待员工推荐");
+
+	private int code;
+	private String desc;
+
+	public static boolean isOnline(Integer code) {
+		return code != null && (code == COMPLETE_FIRST_PURCHASE.getCode() || code == ONLINE.getCode());
+	}
+
+	public int getCode() {
+		return code;
+	}
+
+	public void setCode(int code) {
+		this.code = code;
+	}
+
+	public String getDesc() {
+		return desc;
+	}
+
+	public void setDesc(String desc) {
+		this.desc = desc;
+	}
+
+	ClubStatus(int code, String desc) {
+		this.code = code;
+		this.desc = desc;
+	}
+
+}

base-module/src/main/java/com/caimei/module/base/entity/enumerate/UserPermission.java

@@ -0,0 +1,100 @@
+package com.caimei.module.base.entity.enumerate;
+
+/**
+ * @author zcp
+ * @date 2018/5/9
+ * @time 18:27
+ * @description:用户身份
+ **/
+public enum UserPermission {
+
+    VISITOR(0, "游客权限"),
+    NORMAL(1, "普通用户权限"),
+    CLUB(2, "机构权限"),
+    SHOP(3, "供应商权限"),
+    MAKER(4, "协销权限");
+
+    private int code;
+    private String desc;
+
+    public int getCode() {
+        return code;
+    }
+
+    public void setCode(int code) {
+        this.code = code;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public void setDesc(String desc) {
+        this.desc = desc;
+    }
+
+    UserPermission(int code, String desc) {
+        this.code = code;
+        this.desc = desc;
+    }
+
+    public static boolean isVisitor(int userPermission) {
+        return userPermission == UserPermission.VISITOR.getCode();
+    }
+    /**
+     * 个人用户
+     */
+    public static boolean isNormal(int userPermission) {
+        return userPermission == UserPermission.NORMAL.getCode();
+    }
+
+    /**
+     * 协销
+     */
+    public static boolean isMaker(int userPermission) {
+        return userPermission == UserPermission.MAKER.getCode();
+    }
+
+    /**
+     * 机构
+     */
+    public static boolean isClub(int userPermission) {
+        return userPermission == UserPermission.CLUB.getCode();
+    }
+
+    /**
+     * 供应商
+     */
+    public static boolean isShop(int userPermission) {
+        return userPermission == UserPermission.SHOP.getCode();
+    }
+
+    /**
+     * 真正购买只有普通用户和机构
+     * @param userPermission
+     * @return
+     */
+    public static boolean canBuy(int userPermission){
+        return userPermission == UserPermission.CLUB.getCode() || userPermission == UserPermission.NORMAL.getCode();
+    }
+
+    /**
+     * 协销可帮机构下单
+     * @param userPermission
+     * @return
+     */
+    public static boolean canSubmit(int userPermission){
+        return userPermission == UserPermission.CLUB.getCode() || userPermission == UserPermission.NORMAL.getCode() ||userPermission == UserPermission.MAKER.getCode();
+    }
+
+    //展示VIP价格
+    public static boolean isVipPrice(int userPermission){
+        return userPermission == UserPermission.CLUB.getCode() || userPermission == UserPermission.MAKER.getCode();
+    }
+
+    //不可以购买
+    public static boolean canNotBuy(int userPermission){
+       return userPermission == UserPermission.SHOP.getCode() ||userPermission == UserPermission.MAKER.getCode();
+    }
+
+}

product/src/main/java/com/caimei/module/product/service/ProductModuleService.java

@@ -1,10 +1,10 @@
 package com.caimei.module.product.service;
 
+import com.caimei.module.base.entity.bo.PageVo;
 import com.caimei.module.base.entity.vo.BigtypeVo;
 import com.caimei.module.base.entity.vo.LadderPriceVo;
 import com.caimei.module.base.entity.vo.ProductVo;
 import com.caimei.module.base.entity.vo.SearchHistoryVo;
-import com.github.pagehelper.Page;
 
 import java.util.List;
 
@@ -22,11 +22,11 @@ public interface ProductModuleService {
     /**
      * 根据三级分类获取商品
      */
-    Page<ProductVo> getProductsByTinyType(Integer tinyTypeID, Integer sortType, Integer pageNum, Integer pageSize);
+    PageVo<ProductVo> getProductsByTinyType(Integer tinyTypeID, Integer sortType, Integer pageNum, Integer pageSize);
     /**
      * 根据关键词获取商品
      */
-    Page<ProductVo> searchProduct(String searchWord, Integer userId, Integer pageNum, Integer pageSize);
+    PageVo<ProductVo> searchProduct(String searchWord, Integer userId, Integer pageNum, Integer pageSize);
 
     /**
      * 商品搜索历史记录
@@ -56,9 +56,9 @@ public interface ProductModuleService {
      * 获取模块商品列表
      * @param preferredFlag 新品上线(001) 优惠商品(010) 常用商品(100)，三者同时存在111
      */
-    Page<ProductVo>  getPreferred(Integer preferredFlag, Integer userId, Integer pageNum, Integer pageSize);
+    PageVo<ProductVo> getPreferred(Integer preferredFlag, Integer userId, Integer pageNum, Integer pageSize);
     /**
      * 相关推荐-根据id
      */
-    Page<ProductVo> getRecommended(Integer productID, Integer pageNum, Integer pageSize);
+    PageVo<ProductVo> getRecommended(Integer productID, Integer pageNum, Integer pageSize);
 }

product/src/main/java/com/caimei/module/product/service/impl/ProductModuleServiceImpl.java

@@ -1,5 +1,7 @@
 package com.caimei.module.product.service.impl;
 
+import com.caimei.module.base.entity.bo.JsonModel;
+import com.caimei.module.base.entity.bo.PageVo;
 import com.caimei.module.product.dao.ProductModuleDao;
 import com.caimei.module.base.entity.vo.*;
 import com.caimei.module.product.service.ProductModuleService;
@@ -60,14 +62,14 @@ public class ProductModuleServiceImpl implements ProductModuleService {
      * @param pageSize
      */
     @Override
-    public Page<ProductVo> getProductsByTinyType(Integer tinyTypeID, Integer sortType, Integer pageNum, Integer pageSize) {
+    public PageVo<ProductVo> getProductsByTinyType(Integer tinyTypeID, Integer sortType, Integer pageNum, Integer pageSize) {
         // sortType (3:价格升序, 4:价格降序, 7:人气, 8:销量)
         pageNum = null != pageNum ? pageNum : 1;
         pageSize = null != pageSize ? pageSize : 10;
-        Page<ProductVo> page = PageHelper.startPage(pageNum, pageSize);
+        PageHelper.startPage(pageNum, pageSize);
         sortType = null != sortType ? sortType : 8;
         List<ProductVo> productList = productModuleDao.getProductsByTinyType(tinyTypeID, sortType);
-        return page;
+        return new PageVo<>(productList);
     }
 
     /**
@@ -79,12 +81,12 @@ public class ProductModuleServiceImpl implements ProductModuleService {
      * @param pageSize
      */
     @Override
-    public Page<ProductVo> getPreferred(Integer preferredFlag, Integer userId, Integer pageNum, Integer pageSize) {
+    public PageVo<ProductVo> getPreferred(Integer preferredFlag, Integer userId, Integer pageNum, Integer pageSize) {
         pageNum = null != pageNum ? pageNum : 1;
         pageSize = null != pageSize ? pageSize : 10;
-        Page<ProductVo> page = PageHelper.startPage(pageNum, pageSize);
+        PageHelper.startPage(pageNum, pageSize);
         List<ProductVo> productList = productModuleDao.getProductsByPreferredFlag(preferredFlag);
-        return page;
+        return new PageVo<>(productList);
     }
 
     /**
@@ -96,7 +98,7 @@ public class ProductModuleServiceImpl implements ProductModuleService {
      * @param pageSize
      */
     @Override
-    public Page<ProductVo> searchProduct(String searchWord, Integer userId, Integer pageNum, Integer pageSize) {
+    public PageVo<ProductVo> searchProduct(String searchWord, Integer userId, Integer pageNum, Integer pageSize) {
         pageNum = null != pageNum ? pageNum : 1;
         pageSize = null != pageSize ? pageSize : 10;
         // 登录状态下，查询历史记录是否存在
@@ -123,30 +125,28 @@ public class ProductModuleServiceImpl implements ProductModuleService {
                 productModuleDao.insertSearchHistory(historyRecord);
             }
         }
-        Page<ProductVo> page = PageHelper.startPage(pageNum, pageSize);
+        PageHelper.startPage(pageNum, pageSize);
         List<ProductVo> productList = productModuleDao.searchProduct(searchWord);
-        return page;
+        return new PageVo<>(productList);
     }
 
 
     @Override
-    public Page<ProductVo> getRecommended(Integer productID, Integer pageNum, Integer pageSize) {
+    public PageVo<ProductVo> getRecommended(Integer productID, Integer pageNum, Integer pageSize) {
         ProductVo product = productModuleDao.findProductById(productID);
         pageNum = null != pageNum ? pageNum : 1;
         pageSize = null != pageSize ? pageSize : 7;
-        Page<ProductVo> page = PageHelper.startPage(pageNum, pageSize);
-        List<ProductVo> productList;
+        List<ProductVo> productList = null;
         if ("1".equals(product.getRecommendType())) {
             List<Integer> productIDs = productModuleDao.getRecommendIds(productID);
             if (productIDs != null && productIDs.size() > 0) {
+                PageHelper.startPage(pageNum, pageSize);
                 productList = productModuleDao.getRecommendByIds(productIDs);
             }
         } else {
             productList = productModuleDao.getDeFaultRecommend(product.getTinyTypeID());
-            page.setTotal(7L);
-            page.setPages(1);
         }
-        return page;
+        return new PageVo<>(productList);
     }
 
     /**

product/src/main/resources/com-caimei-module-product/ProductModuleMapper.xml

@@ -267,5 +267,6 @@
         where validFlag = 2
         and tinyTypeID = #{tinyTypeID}
         order by sellNumber desc,onlineTime desc
+        limit 7
     </select>
 </mapper>