mall-portal/src/main/java/com/buy507/mall/portal/controller/HomeController.java

@@ -3,12 +3,7 @@ package com.buy507.mall.portal.controller;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
 
 import com.buy507.mall.common.api.CommonResult;
 import com.buy507.mall.model.PmsProduct;
@@ -96,4 +91,30 @@ public class HomeController {
 		return CommonResult.success(productSku);
 	}
 
+	@ApiOperation("获取会员专区商品")
+	@RequestMapping(value = "/getVipProductList", method = RequestMethod.GET)
+	@ResponseBody
+	public CommonResult<List<PmsProduct>> getVipProductList(){
+		List<PmsProduct> productList = homeService.getVipProductList();
+		return CommonResult.success(productList);
+	}
+
+	@ApiOperation("获取积分专区商品")
+	@RequestMapping(value = "/getPointProductList", method = RequestMethod.GET)
+	@ResponseBody
+	public CommonResult<List<PmsProduct>> getPointProductList(){
+		List<PmsProduct> productList = homeService.getPointProductList();
+		return CommonResult.success(productList);
+	}
+
+	@ApiOperation("获取积分兑换专区")
+	@RequestMapping(value = "/getPointExchangeProductList", method = RequestMethod.GET)
+	@ResponseBody
+	public CommonResult<List<PmsProduct>> getPointExchangeProductList(){
+		List<PmsProduct> productList = homeService.getPointExchangeProductList();
+		return CommonResult.success(productList);
+	}
+
+
+
 }

mall-portal/src/main/java/com/buy507/mall/portal/dao/HomeDao.java

@@ -40,4 +40,34 @@ public interface HomeDao {
      * 获取所有商品信息按销量排序
      */
     List<PmsProduct> getAllPioductList();
+
+    /**
+     * 获取会员专区
+     */
+    List<PmsProduct> getProductVipStatus(@Param("offset") Integer offset,@Param("limit") Integer limit);
+
+    /**
+     * 获取积分专区
+     */
+    List<PmsProduct> getProductpointSareaStatus(@Param("offset") Integer offset,@Param("limit") Integer limit);
+
+    /**
+     * 获取积分兑换专区
+     */
+    List<PmsProduct> getProductpointsExchangeStatus(@Param("offset") Integer offset,@Param("limit") Integer limit);
+
+    /**
+     * 获取会员专区详情
+     */
+    List<PmsProduct> getVipStatusList();
+
+    /**
+     *获取积分专区商品
+     */
+    List<PmsProduct> getPointStatusList();
+
+    /**
+     *获取积分兑换专区商品
+     */
+    List<PmsProduct> getPointExchangeProductList();
 }

mall-portal/src/main/java/com/buy507/mall/portal/domain/HomeContentResult.java

@@ -27,6 +27,12 @@ public class HomeContentResult {
     private List<PmsProduct> hotProductList;
     //推荐专题
     private List<CmsSubject> subjectList;
+    //会员专区
+    private List<PmsProduct> vipProductList;
+    //积分专区
+    private List<PmsProduct> pointsAreaProductList;
+    //积分兑换专区
+    private List<PmsProduct> pointsExchangeProductList;
     //查询所有商品按销量排序
     private List<PmsProduct> allProductList;
 }

mall-portal/src/main/java/com/buy507/mall/portal/service/HomeService.java

@@ -40,9 +40,21 @@ public interface HomeService {
      * @param productId
      * @return
      */
+
+    /**
+     * 获取会员专区商品
+     * @param
+     * @return
+     */
+    List<PmsProduct> getVipProductList();
+
     ProductDetailResult getProductInfo(Long productId);
     
     ProductSkuResult getProductSku(Long productId, String sp1, String sp2, String sp3);
     
     List<PmsProduct> getProductList(Long brandId, Long categoryId, String sortType, Integer pageSize, Integer pageNum);
+
+    List<PmsProduct> getPointProductList();
+
+    List<PmsProduct> getPointExchangeProductList();
 }

mall-portal/src/main/java/com/buy507/mall/portal/service/impl/HomeServiceImpl.java

@@ -114,35 +114,41 @@ public class HomeServiceImpl implements HomeService {
 		//获取首页广告
 		result.setAdvertiseList(getHomeAdvertiseList());
 		//获取推荐品牌
-        result.setBrandList(homeDao.getRecommendBrandList(0,4));
+		result.setBrandList(homeDao.getRecommendBrandList(0, 4));
 		//获取秒杀信息
 		result.setHomeFlashPromotion(getHomeFlashPromotion());
 
-        List<PmsProduct> newProductList = homeDao.getNewProductList(0, 4);
+		List<PmsProduct> VipProductList = homeDao.getProductVipStatus(0, 4);
-        List<PmsProduct> hotProductList = homeDao.getHotProductList(0, 4);
+		List<PmsProduct> PointAreaProductList = homeDao.getProductpointSareaStatus(0, 4);
+		List<PmsProduct> pointsExchangeProductList = homeDao.getProductpointsExchangeStatus(0, 4);
 		List<PmsProduct> allProductList = homeDao.getAllPioductList();
 
 		//根据会员等级显示不同的商品价格
 		UmsMember member = memberService.getCurrentMember();
-        if(member != null) {
+		if (member != null) {
 			BigDecimal discount = commonService.getDiscount(member.getId());
-        	if(discount != null) {
+			if (discount != null) {
-        		for(PmsProduct product : newProductList) {
+				for (PmsProduct product : VipProductList) {
 					product.setPrice(product.getPrice().multiply(discount).setScale(2, BigDecimal.ROUND_HALF_UP));
 				}
-        		for(PmsProduct product : hotProductList) {
+				for (PmsProduct product : PointAreaProductList) {
 					product.setPrice(product.getPrice().multiply(discount).setScale(2, BigDecimal.ROUND_HALF_UP));
 				}
-        		for(PmsProduct product : allProductList) {
+				for (PmsProduct product : pointsExchangeProductList) {
+					product.setPrice(product.getPrice().multiply(discount).setScale(2, BigDecimal.ROUND_HALF_UP));
+				}
+				for (PmsProduct product : allProductList) {
 					product.setPrice(product.getPrice().multiply(discount).setScale(2, BigDecimal.ROUND_HALF_UP));
 				}
 			}
 		}
 
-        //获取新品推荐
+		//获取会员商品
-        result.setNewProductList(newProductList);
+		result.setVipProductList(VipProductList);
-        //获取人气推荐
+		//获取积分专区商品
-        result.setHotProductList(hotProductList);
+		result.setPointsAreaProductList(PointAreaProductList);
+		//获取积分兑换商品
+		result.setPointsExchangeProductList(pointsExchangeProductList);
 		//获取推荐专题
 		//result.setSubjectList(homeDao.getRecommendSubjectList(0,4));
 		//获取上次所有商品，按销量排序
@@ -153,7 +159,7 @@ public class HomeServiceImpl implements HomeService {
 	@Override
 	public List<PmsProduct> recommendProductList(Integer pageSize, Integer pageNum) {
 		// TODO: 2019/1/29 暂时默认推荐所有商品
-        PageHelper.startPage(pageNum,pageSize);
+		PageHelper.startPage(pageNum, pageSize);
 		PmsProductExample example = new PmsProductExample();
 		example.createCriteria()
 				.andDeleteStatusEqualTo(0)
@@ -170,9 +176,9 @@ public class HomeServiceImpl implements HomeService {
 		List<PmsProductCategory> productCategories = productCategoryMapper.selectByExample(example);
 
 		List<ProductCategoryOptions> options = new ArrayList<>();
-    	for(PmsProductCategory category : productCategories) {
+		for (PmsProductCategory category : productCategories) {
 			//我们这里最大的根节点ID是0，所以找出所有parent id为0的节点，然后调用我们的递归算法
-    		if(category.getParentId().equals(0L)){
+			if (category.getParentId().equals(0L)) {
 				options.add(recursionCategory(category, productCategories));
 			}
 		}
@@ -180,6 +186,29 @@ public class HomeServiceImpl implements HomeService {
 		return options;
 	}
 
+	/**
+	 *获取会员专区商品
+	 */
+	@Override
+	public List<PmsProduct> getVipProductList() {
+		return homeDao.getVipStatusList();
+	}
+
+	/**
+	 *获取积分专区商品
+	 */
+	@Override
+	public List<PmsProduct> getPointProductList() {
+		return homeDao.getPointStatusList();
+	}
+
+	/**
+	 *获取积分兑换专区
+	 */
+	@Override
+	public List<PmsProduct> getPointExchangeProductList() {
+		return homeDao.getPointExchangeProductList();
+	}
 	private ProductCategoryOptions recursionCategory(PmsProductCategory category, List<PmsProductCategory> list) {
 		List<ProductCategoryOptions> childList = new ArrayList<>();
 		// 为每一个父节点增加子树（List形式，没有则为空的list）
@@ -189,16 +218,16 @@ public class HomeServiceImpl implements HomeService {
 		node.setLevel(category.getLevel());
 		node.setIcon(category.getIcon());
 		node.setPid(category.getParentId());
-     	for (PmsProductCategory childCategory : list){
+		for (PmsProductCategory childCategory : list) {
 			//如果子节点的pid等于父节点的ID，则说明是父子关系
-    	    if(childCategory.getParentId().equals(category.getId())){
+			if (childCategory.getParentId().equals(category.getId())) {
 				// 继续调用递归算法，将当前作为父节点，继续找他的子节点，反复执行。
 				childList.add(recursionCategory(childCategory, list));
 			}
 		}
 
 		// 当遍历完成，返回调用的节点
-     	if(!childList.isEmpty()) {
+		if (!childList.isEmpty()) {
 			node.setChildren(childList);
 		} else {
 			node.setChildren(null);
@@ -208,11 +237,11 @@ public class HomeServiceImpl implements HomeService {
 
 	@Override
 	public List<CmsSubject> getSubjectList(Long cateId, Integer pageSize, Integer pageNum) {
-        PageHelper.startPage(pageNum,pageSize);
+		PageHelper.startPage(pageNum, pageSize);
 		CmsSubjectExample example = new CmsSubjectExample();
 		CmsSubjectExample.Criteria criteria = example.createCriteria();
 		criteria.andShowStatusEqualTo(1);
-        if(cateId!=null){
+		if (cateId != null) {
 			criteria.andCategoryIdEqualTo(cateId);
 		}
 		return subjectMapper.selectByExample(example);
@@ -232,7 +261,7 @@ public class HomeServiceImpl implements HomeService {
 				homeFlashPromotion.setName(flashPromotion.getTitle());
 				//获取下一个秒杀场次
 				SmsFlashPromotionSession nextSession = getNextFlashPromotionSession(homeFlashPromotion.getStartTime());
-                if(nextSession!=null){
+				if (nextSession != null) {
 					homeFlashPromotion.setNextStartTime(nextSession.getStartTime());
 					homeFlashPromotion.setNextEndTime(nextSession.getEndTime());
 				}
@@ -292,6 +321,7 @@ public class HomeServiceImpl implements HomeService {
 		}
 		return null;
 	}
+
 	//获取商品详情
 	@Override
 	public ProductDetailResult getProductInfo(Long productId) {
@@ -301,15 +331,15 @@ public class HomeServiceImpl implements HomeService {
 		List<String> result = Arrays.asList(detailResult.getAlbumPics().toString().split(","));
 		detailResult.setListAlbumPics(result);
 		detailResult.setAlbumPics(null);
-		PmsProductFullReduction ppFullReduction =(PmsProductFullReduction)pmsProductFullReductionMapper.getPmsProductFullReduction(productId);
+		PmsProductFullReduction ppFullReduction = (PmsProductFullReduction) pmsProductFullReductionMapper.getPmsProductFullReduction(productId);
 		detailResult.setPmsProductFullReduction(ppFullReduction);//满减商品
 
 		UmsMember currentMember = memberService.getCurrentMember();//获取用户信息
-		if(currentMember == null) {
+		if (currentMember == null) {
 			detailResult.setWhetherTheCollection(0);//默认商品未收藏，1代表收藏
 		} else {
-			for(MemberProductCollection scproduct:productCollectionRepository.findByMemberId(currentMember.getId())){
+			for (MemberProductCollection scproduct : productCollectionRepository.findByMemberId(currentMember.getId())) {
-				if(productId==scproduct.getProductId()){
+				if (productId == scproduct.getProductId()) {
 					detailResult.setWhetherTheCollection(1);
 				}
 			}
@@ -323,9 +353,9 @@ public class HomeServiceImpl implements HomeService {
 		List<ProductAttributeResult> specChildList = new ArrayList<>();
 		ProductAttributeResult spec = null;
 		ProductAttributeResult specChild = null;
-		String array [] = null;
+		String array[] = null;
 
-		for(PmsProductAttribute attribute : attributeList) {
+		for (PmsProductAttribute attribute : attributeList) {
 			spec = new ProductAttributeResult();
 			spec.setId(attribute.getId());
 			spec.setName(attribute.getName());
@@ -333,9 +363,9 @@ public class HomeServiceImpl implements HomeService {
 
 			//属性录入方式：0->手工录入；1->从列表中选取
 			//是否支持手动新增；0->不支持；1->支持
-			if(1 == attribute.getInputType() && 0 == attribute.getHandAddStatus()) {
+			if (1 == attribute.getInputType() && 0 == attribute.getHandAddStatus()) {
 				array = attribute.getInputList().split(",");
-				for(int i=0; i<array.length; i++) {
+				for (int i = 0; i < array.length; i++) {
 					specChild = new ProductAttributeResult();
 					specChild.setPid(attribute.getId());
 					specChild.setName(array[i]);
@@ -345,9 +375,9 @@ public class HomeServiceImpl implements HomeService {
 				PmsProductAttributeValueExample attributeValueExample = new PmsProductAttributeValueExample();
 				attributeValueExample.createCriteria().andProductIdEqualTo(product.getId()).andProductAttributeIdEqualTo(attribute.getId());
 				List<PmsProductAttributeValue> attributeValueList = productAttributeValueMapper.selectByExample(attributeValueExample);
-				for(PmsProductAttributeValue value : attributeValueList) {
+				for (PmsProductAttributeValue value : attributeValueList) {
 					array = value.getValue().split(",");
-					for(String s : array) {
+					for (String s : array) {
 						specChild = new ProductAttributeResult();
 						specChild.setPid(attribute.getId());
 						specChild.setName(s);
@@ -359,14 +389,14 @@ public class HomeServiceImpl implements HomeService {
 
 		detailResult.setSpecList(specList);
 		detailResult.setSpecChildList(specChildList);
-		List<PmsComment> pmsComment =(List<PmsComment>) pmsCommentMapper.getPmsComment(productId);//评论基础信息
+		List<PmsComment> pmsComment = (List<PmsComment>) pmsCommentMapper.getPmsComment(productId);//评论基础信息
-		if(pmsComment.size()>0){
+		if (pmsComment.size() > 0) {
-		int i=pmsCommentMapper.getCountComment(productId);//评论总数
+			int i = pmsCommentMapper.getCountComment(productId);//评论总数
-		int j=pmsCommentMapper.getApplauseCount(productId)*100/i;//好评率  好评数除以评论 总数 默认好评为大于等于2星
+			int j = pmsCommentMapper.getApplauseCount(productId) * 100 / i;//好评率  好评数除以评论 总数 默认好评为大于等于2星
 			detailResult.setCountComent(i);
 			detailResult.setApplauseRate(j);
-		for(int a=0;a<pmsComment.size();a++){
+			for (int a = 0; a < pmsComment.size(); a++) {
-			List<PmsCommentReplay> pcr =(List<PmsCommentReplay>) pmsCommentReplayMapper.getPmsCommentReplay(pmsComment.get(a).getId());
+				List<PmsCommentReplay> pcr = (List<PmsCommentReplay>) pmsCommentReplayMapper.getPmsCommentReplay(pmsComment.get(a).getId());
 				pmsComment.get(a).setPmsCommentReplay(pcr);//评论回复 逐个添加
 			}
 			detailResult.setPmsComment(pmsComment);
@@ -374,9 +404,9 @@ public class HomeServiceImpl implements HomeService {
 
 		//根据会员等级显示不同的商品价格
 		UmsMember member = memberService.getCurrentMember();
-        if(member != null) {
+		if (member != null) {
 			BigDecimal discount = commonService.getDiscount(member.getId());
-        	if(discount != null) {
+			if (discount != null) {
 				detailResult.setPrice(detailResult.getPrice().multiply(discount).setScale(2, BigDecimal.ROUND_HALF_UP));
 			}
 		}
@@ -389,26 +419,26 @@ public class HomeServiceImpl implements HomeService {
 		PmsSkuStockExample example = new PmsSkuStockExample();
 		PmsSkuStockExample.Criteria criteria = example.createCriteria();
 		criteria.andProductIdEqualTo(productId);
-		if(!StringUtils.isEmpty(sp1)) {  //mcoooo
+		if (!StringUtils.isEmpty(sp1)) {  //mcoooo
 			criteria.andSp1EqualTo(sp1);
 		}
-		if(!StringUtils.isEmpty(sp2)) {  //mcoooo
+		if (!StringUtils.isEmpty(sp2)) {  //mcoooo
 			criteria.andSp2EqualTo(sp2);
 		}
-		if(!StringUtils.isEmpty(sp3)) {
+		if (!StringUtils.isEmpty(sp3)) {
 			criteria.andSp3EqualTo(sp3);
 		}
 		List<PmsSkuStock> list = skuStockMapper.selectByExample(example);
 		ProductSkuResult skuResult = new ProductSkuResult();
-		for(PmsSkuStock stock : list) {
+		for (PmsSkuStock stock : list) {
 			BeanUtils.copyProperties(stock, skuResult);
 		}
 
 		//根据会员等级显示不同的商品价格
 		UmsMember member = memberService.getCurrentMember();
-        if(member != null) {
+		if (member != null) {
 			BigDecimal discount = commonService.getDiscount(member.getId());
-        	if(discount != null) {
+			if (discount != null) {
 				skuResult.setPrice(skuResult.getPrice().multiply(discount).setScale(2, BigDecimal.ROUND_HALF_UP));
 			}
 		}
@@ -423,27 +453,27 @@ public class HomeServiceImpl implements HomeService {
 		PmsProductExample example = new PmsProductExample();
 		PmsProductExample.Criteria criteria = example.createCriteria();
 		criteria.andDeleteStatusEqualTo(0);
-		if(brandId != null) {
+		if (brandId != null) {
 			criteria.andBrandIdEqualTo(brandId);
 		}
-		if(categoryId != null) {
+		if (categoryId != null) {
 			criteria.andProductCategoryIdEqualTo(categoryId);
 		}
 
 		//综合排序
-		if("1".equals(sortType)) {
+		if ("1".equals(sortType)) {
 			example.setOrderByClause("id asc");
 		}
 		//销量
-		if("2".equals(sortType)) {
+		if ("2".equals(sortType)) {
 			example.setOrderByClause("sale desc");
 		}
 		//价格升序
-		if("3".equals(sortType)) {
+		if ("3".equals(sortType)) {
 			example.setOrderByClause("price asc");
 		}
 		//价格降序
-		if("4".equals(sortType)) {
+		if ("4".equals(sortType)) {
 			example.setOrderByClause("price desc");
 		}
 
@@ -451,10 +481,10 @@ public class HomeServiceImpl implements HomeService {
 
 		//根据会员等级显示不同的商品价格
 		UmsMember member = memberService.getCurrentMember();
-        if(member != null) {
+		if (member != null) {
 			BigDecimal discount = commonService.getDiscount(member.getId());
-        	if(discount != null) {
+			if (discount != null) {
-        		for(PmsProduct product : productList) {
+				for (PmsProduct product : productList) {
 					product.setPrice(product.getPrice().multiply(discount).setScale(2, BigDecimal.ROUND_HALF_UP));
 				}
 			}

mall-portal/src/main/java/com/buy507/mall/portal/service/impl/OmsPortalOrderServiceImpl.java

@@ -3,6 +3,8 @@ package com.buy507.mall.portal.service.impl;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.json.JSONUtil;
+import com.alipay.api.AlipayApiException;
+import com.alipay.api.internal.util.AlipaySignature;
 import com.buy507.mall.common.api.CommonResult;
 import com.buy507.mall.common.util.MD5Util;
 import com.buy507.mall.mapper.*;
@@ -43,9 +45,6 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.ExecutorService;
 
-import com.alipay.api.internal.util.AlipaySignature;
-import com.alipay.api.AlipayApiException;
-
 /**
  * 前台订单管理Service
  */
@@ -364,10 +363,10 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
 
 			//支付类型: 0->未支付；1->支付宝；2->微信; 3->线下支付; 4->积分支付
 			//判断是否为积分专区商品
-			if(isPointsExchangeStatus) {
+			if (isPointsExchangeStatus) {
                 orderResult.setPayType(4); // 设置为积分支付
                 orderResult.setPayTypeName("积分支付");
-				}else {
+            } else {
                 // 如果不是积分兑换专区商品，则继续使用其他支付方式
                 if (order.getPayType() != null) {
                     orderResult.setPayType(order.getPayType());
@@ -748,7 +747,7 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
 			return CommonResult.validateFailed("未查询到商品信息");
 		}
 
-		PmsProduct product = new PmsProduct();
+        PmsProduct product = productMapper.selectByPrimaryKey(skuStock.getProductId());
 
 		// 判断商品是否属于积分兑换区
 		boolean isPointsExchangeStatus = product.getPointsExchangeStatus() == 1;

mall-portal/src/main/resources/dao/HomeDao.xml

@@ -61,11 +61,6 @@
         WHERE
             hp.recommend_status = 1
             AND p.publish_status = 1
-            AND (
-                p.vip_status = 1 OR
-                p.points_area_status = 1 OR
-                p.points_exchange_status = 1
-                )
         ORDER BY
             hp.sort DESC
         LIMIT #{offset}, #{limit};
@@ -84,4 +79,55 @@
         LIMIT #{offset}, #{limit};
     </select>
 
+    <select id="getProductVipStatus" resultType="com.buy507.mall.model.PmsProduct">
+        SELECT p.*
+        FROM
+            pms_product
+        WHERE
+            vip_status = 1
+        LIMIT #{offset}, #{limit};
+    </select>
+
+    <select id="getProductpointSareaStatus" resultType="com.buy507.mall.model.PmsProduct">
+        SELECT p.*
+        FROM
+            pms_product
+        WHERE
+            points_area_status = 1
+        LIMIT #{offset}, #{limit};
+    </select>
+
+    <select id="getProductpointsExchangeStatus" resultType="com.buy507.mall.model.PmsProduct">
+
+        SELECT p.*
+        FROM
+            pms_product
+        WHERE
+            points_exchange_status = 1
+        LIMIT #{offset}, #{limit};
+    </select>
+
+    <select id="getVipStatusList" resultType="com.buy507.mall.model.PmsProduct">
+        SELECT p.*
+        FROM
+            pms_product
+        WHERE
+            vip_status = 1
+    </select>
+
+    <select id="getPointStatusList" resultType="com.buy507.mall.model.PmsProduct">
+        SELECT p.*
+        FROM
+            pms_product
+        WHERE
+            points_area_status = 1
+    </select>
+
+    <select id="getPointExchangeProductList" resultType="com.buy507.mall.model.PmsProduct">
+        SELECT p.*
+        FROM
+            pms_product
+        WHERE
+            points_exchange_status = 1
+    </select>
 </mapper>