Merge remote-tracking branch 'origin/developerB' into developer

src/main/java/com/caimei365/commodity/controller/UserLikeApi.java

@@ -0,0 +1,85 @@
+package com.caimei365.commodity.controller;
+
+import com.caimei365.commodity.model.ResponseJson;
+import com.caimei365.commodity.model.vo.PaginationVo;
+import com.caimei365.commodity.model.vo.ProductItemVo;
+import com.caimei365.commodity.service.UserLikeService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * @author zzj 2021/9/17
+ */
+@Api(tags = "用户收藏API")
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/commodity/userLike")
+public class UserLikeApi {
+
+    private final UserLikeService userLikeService;
+
+    /**
+     * 商品收藏（单个商品）
+     */
+    @ApiOperation("单个商品收藏/取消收藏")
+    @ApiImplicitParams({
+            @ApiImplicitParam(required = true, name = "userID", value = "当前用户id"),
+            @ApiImplicitParam(required = true, name = "productID", value = "收藏商品id"),
+    })
+    @GetMapping("/likeOne")
+    public ResponseJson<String> like(Integer userId, Integer productId) {
+        if (userId == null || productId == null) {
+            return ResponseJson.error("非法参数");
+        }
+        return userLikeService.likeOne(userId, productId);
+    }
+
+    /**
+     * 个人中心收藏商品列表
+     *
+     * @param userId 用户Id
+     */
+    @ApiOperation("收藏商品列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(required = false, name = "userId", value = "用户Id"),
+            @ApiImplicitParam(required = false, name = "pageNum", value = "页码"),
+            @ApiImplicitParam(required = false, name = "pageSize", value = "每页数量")
+    })
+    @GetMapping("/likeList")
+    public ResponseJson<PaginationVo<ProductItemVo>> likes(Integer userId,
+                                                           @RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
+                                                           @RequestParam(value = "pageSize", defaultValue = "10") int pageSize) {
+        if (userId == null) {
+            return ResponseJson.error("非法参数");
+        }
+        return userLikeService.findLikeList(userId, pageNum, pageSize);
+    }
+
+    /**
+     * 个人中心删除收藏商品列表
+     *
+     * @param userId 用户Id
+     */
+    @ApiOperation("删除收藏商品列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(required = true, name = "userId", value = "用户Id"),
+            @ApiImplicitParam(required = true, name = "productIDs", value = "商品id字符串")
+    })
+    @GetMapping("/deleteList")
+    public ResponseJson<String> likes(Integer userId, String productIds) {
+        if (userId == null || productIds == null) {
+            return ResponseJson.error("非法参数");
+        }
+        return userLikeService.deleteList(userId, productIds);
+    }
+
+
+}

src/main/java/com/caimei365/commodity/mapper/UserLikeMapper.java

@@ -0,0 +1,56 @@
+package com.caimei365.commodity.mapper;
+
+import com.caimei365.commodity.model.vo.ProductItemVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @author zzj 2021/9/17
+ */
+@Mapper
+public interface UserLikeMapper {
+
+    /**
+     * 用户收藏
+     * @param userId
+     * @param productId
+     * @param userLike
+     * @return
+     */
+    Integer like(Integer userId, Integer productId,Integer userLike);
+
+    /**
+     * 取消收藏
+     * @param userId
+     * @param productId
+     * @param userLike
+     * @return
+     */
+    Integer disLike(Integer userId, Integer productId,Integer userLike);
+
+    /**
+     * 查找用户收藏情况
+     * @param userId
+     * @param productId
+     * @return
+     */
+    Integer findLike(Integer userId, Integer productId);
+
+    /**
+     * 新用户收藏
+     * @param userId
+     * @param productId
+     */
+    void insert(Integer userId, Integer productId);
+
+    /**
+     * 用户收藏列表
+     * @param userId
+     * @return
+     */
+    List<ProductItemVo> findLikeList(@Param("userId") Integer userId);
+
+
+}

src/main/java/com/caimei365/commodity/model/vo/ProductDetailVo.java

@@ -20,6 +20,11 @@ import java.util.List;
 @Data
 public class ProductDetailVo implements Serializable {
     private static final long serialVersionUID = 1L;
+
+    /**
+     * 用户收藏标记（1收藏，0未收藏）
+     */
+    private Integer userLike;
     /**
      * 商品productID
      */

src/main/java/com/caimei365/commodity/service/UserLikeService.java

@@ -0,0 +1,36 @@
+package com.caimei365.commodity.service;
+
+import com.caimei365.commodity.model.ResponseJson;
+import com.caimei365.commodity.model.vo.PaginationVo;
+import com.caimei365.commodity.model.vo.ProductItemVo;
+
+/**
+ * zzj 2021/9/17
+ * @author zzj
+ */
+public interface UserLikeService {
+    /**
+     * 收藏
+     * @param userId
+     * @param productId
+     * @return
+     */
+    ResponseJson<String> likeOne(Integer userId, Integer productId);
+
+    /**
+     * 收藏列表
+     * @param userId
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    ResponseJson<PaginationVo<ProductItemVo>> findLikeList(Integer userId, int pageNum, int pageSize);
+
+    /**
+     * 批量移除收藏商品
+     * @param userId
+     * @param productIds
+     * @return
+     */
+    ResponseJson<String> deleteList(Integer userId, String productIds);
+}

src/main/java/com/caimei365/commodity/service/impl/PageServiceImpl.java

@@ -37,6 +37,9 @@ import java.util.stream.Collectors;
 public class PageServiceImpl implements PageService {
     @Value("${caimei.wwwDomain}")
     private String domain;
+
+    @Resource
+    private UserLikeMapper likeMapper;
     @Resource
     private PageMapper pageMapper;
     @Resource
@@ -487,6 +490,9 @@ public class PageServiceImpl implements PageService {
                 }
                 product.setLadderPriceList(ladderPrices);
             }
+            //查询商品收藏情况，1未收藏，0未收藏，未收藏过该商品用户是null
+            Integer like = likeMapper.findLike(userId, productId);
+            product.setUserLike(like);
         }
         return ResponseJson.success(product);
     }

src/main/java/com/caimei365/commodity/service/impl/UserLikeServiceImpl.java

@@ -0,0 +1,95 @@
+package com.caimei365.commodity.service.impl;
+
+import com.aliyun.opensearch.sdk.dependencies.com.google.common.collect.Lists;
+import com.caimei365.commodity.components.PriceUtilService;
+import com.caimei365.commodity.mapper.UserLikeMapper;
+import com.caimei365.commodity.model.ResponseJson;
+import com.caimei365.commodity.model.vo.PaginationVo;
+import com.caimei365.commodity.model.vo.ProductItemVo;
+import com.caimei365.commodity.service.PageService;
+import com.caimei365.commodity.service.UserLikeService;
+import com.github.pagehelper.PageHelper;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+
+/**
+ * @author zzj 2021/9/17
+ */
+@Service
+public class UserLikeServiceImpl implements UserLikeService {
+
+    @Resource
+    private UserLikeMapper likeMapper;
+
+    @Resource
+    private PriceUtilService priceUtilService;
+
+    @Resource
+    private PageService pageService;
+
+    @Override
+    public ResponseJson<String> likeOne(Integer userId, Integer productId) {
+        //findLike为空则添加收藏，1取消，0收藏。
+        Integer flag = likeMapper.findLike(userId, productId);
+        if (flag == null) {
+            likeMapper.insert(userId, productId);
+            return ResponseJson.success("收藏成功");
+        }
+        if (flag.equals(1)) {
+            likeMapper.disLike(userId, productId, 0);
+            return ResponseJson.success("取消收藏");
+        }
+        if (flag.equals(0)) {
+            likeMapper.like(userId, productId, 1);
+            return ResponseJson.success("收藏成功");
+        }
+        return ResponseJson.error("收藏失败");
+    }
+
+    @Override
+    public ResponseJson<PaginationVo<ProductItemVo>> findLikeList(Integer userId, int pageNum, int pageSize) {
+        if (null == userId) {
+            return ResponseJson.error("参数错误：用户Id不能为空！", null);
+        }
+        PageHelper.startPage(pageNum, pageSize);
+        List<ProductItemVo> productList = likeMapper.findLikeList(userId);
+        productList.forEach(product -> {
+            // 设置商品主图及价格
+            priceUtilService.setProductDetails(userId, product);
+            //优惠券标识
+            Boolean couponsLogo = pageService.setCouponsLogo(userId, product.getProductId(), 2);
+            product.setCouponsLogo(couponsLogo);
+        });
+        PaginationVo<ProductItemVo> pageData = new PaginationVo<>(productList);
+        return ResponseJson.success(pageData);
+    }
+
+    @Override
+    public ResponseJson<String> deleteList(Integer userId, String productIds) {
+        if (productIds == null || userId == null) {
+            return ResponseJson.error("商品Id参数错误", null);
+        }
+        List<Integer> productIdList = Lists.newArrayList();
+        if (productIds.contains(",")) {
+            String[] productArr = productIds.split(",");
+            for (String id : productArr) {
+                Integer ids=Integer.parseInt(id);
+                productIdList.add(ids);
+            }
+        } else {
+            productIdList.add(Integer.parseInt(productIds));
+        }
+
+        for (Integer productID : productIdList) {
+            Integer like = likeMapper.findLike(userId, productID);
+            if (like != 1) {
+                return ResponseJson.error("产品参数错误");
+            }
+            likeMapper.like(userId, productID, 0);
+        }
+        return ResponseJson.success("批量删除成功");
+    }
+}

src/main/resources/mapper/UserLikeMapper.xml

@@ -0,0 +1,71 @@
+<?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.caimei365.commodity.mapper.UserLikeMapper">
+
+    <insert id="insert">
+        INSERT INTO cm_product_userlike (userID, productID, userLike, likeTime)
+        VALUES (#{userId}, #{productId}, 1, now())
+    </insert>
+
+    <update id="like">
+        UPDATE cm_product_userlike
+        SET userLike=#{userLike},
+            likeTime=now()
+        WHERE userID = #{userId}
+          AND productID = #{productId}
+    </update>
+
+    <update id="disLike">
+        UPDATE cm_product_userlike
+        SET userLike=#{userLike}
+        WHERE userID = #{userId}
+          AND productID = #{productId}
+    </update>
+
+
+    <select id="findLike" resultType="java.lang.Integer">
+        SELECT userLike
+        FROM cm_product_userlike
+        WHERE userID = #{userId}
+          AND productID = #{productId}
+    </select>
+
+    <select id="findLikeList" resultType="com.caimei365.commodity.model.vo.ProductItemVo">
+        SELECT p.productID       AS productId,
+               p.actStatus,
+               p.name,
+               p.aliasName,
+               p.mainImage       AS image,
+               p.unit,
+               p.productCode     AS CODE,
+               p.price1TextFlag  AS priceFlag,
+               p.price1          AS price,
+               p.searchKey       AS keyword,
+               p.price8Text      AS beautyActFlag,
+               p.minBuyNumber    AS minBuyNumber,
+               p.maxBuyNumber    AS maxBuyNumber,
+               p.ladderPriceFlag,
+               p.normalPrice,
+               p.step,
+               p.shopID          AS shopId,
+               p.taxPoint        AS taxRate,
+               p.includedTax,
+               p.invoiceType,
+               p.productCategory AS productCategory,
+               p.validFlag,
+               p.featuredFlag,
+               p.commodityType,
+               p.bigTypeID       AS bigTypeId,
+               p.smallTypeID     AS smallTypeId,
+               p.tinyTypeID      AS tinyTypeId,
+               p.visibility      AS visibility
+        FROM product p
+                 LEFT JOIN cm_product_userlike cpu ON p.productID = cpu.productID
+        WHERE p.validFlag = '2'
+          AND cpu.userLike = '1'
+          AND cpu.userID = #{userId}
+        ORDER BY cpu.likeTime DESC
+    </select>
+</mapper>