Merge branch 'develop'

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/pms
-  newTag: e00d10cefb341b9b5ab38a774728fa4c968bcaf2
+  newTag: 46346bc6755293aa41fd29fc40bb9aad22dff098

src/main/java/com/mmc/pms/controller/mall/AppMallGoodsController.java

@@ -2,19 +2,20 @@ package com.mmc.pms.controller.mall;
 
 import com.mmc.pms.common.ResultBody;
 import com.mmc.pms.controller.BaseController;
+import com.mmc.pms.entity.mall.MallGoodsDO;
+import com.mmc.pms.entity.mall.ProductBrowseDO;
 import com.mmc.pms.model.mall.GoodsListVO;
 import com.mmc.pms.model.mall.MallGoodsVO;
 import com.mmc.pms.model.mall.UavCartDTO;
 import com.mmc.pms.model.qo.mall.PriceStockQO;
+import com.mmc.pms.model.sale.qo.MallGoodsInfoQO;
 import com.mmc.pms.service.mall.AppMallGoodsService;
 import com.mmc.pms.service.mall.MallGoodsService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
+import io.swagger.annotations.*;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**
@@ -63,4 +64,17 @@ public class AppMallGoodsController extends BaseController {
     List<UavCartDTO> listPriceStock(@RequestBody List<PriceStockQO> priceStockQOS) {
         return appMallGoodsService.listPriceStock(priceStockQOS);
     }
+
+    @ApiOperation(value = "商品搜索")
+    @PostMapping("listMallGoodsBySearch")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = MallGoodsVO.class)})
+    public ResultBody<MallGoodsVO> listMallGoodsBySearch(@ApiParam("商品查询条件QO") @RequestBody MallGoodsInfoQO param, HttpServletRequest request) {
+        return ResultBody.success(mallGoodsService.listMallGoodsBySearch(param, this.getUserLoginInfoFromRedis(request)));
+    }
+    @ApiOperation(value = "商品浏览排行榜")
+    @PostMapping("browseMallGoods")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = MallGoodsVO.class)})
+    public ResultBody<MallGoodsVO> browseMallGoods(@RequestBody MallGoodsDO mallGoodsDO, ProductBrowseDO productBrowseDO, HttpServletRequest request){
+        return appMallGoodsService.browseMallGoods(mallGoodsDO,productBrowseDO,this.getUserLoginInfoFromRedis(request));
+    }
 }

src/main/java/com/mmc/pms/entity/mall/MallGoodsDO.java

@@ -69,6 +69,10 @@ public class MallGoodsDO implements Serializable {
      * 排序字段
      */
     private Integer sort;
+    /**
+     * 商品热度
+     * */
+    private Integer hot;
 
     private Integer priceShow;
 
@@ -96,6 +100,7 @@ public class MallGoodsDO implements Serializable {
         this.labelShow = mallGoodsVO.getLabelShow();
         this.priceShow = mallGoodsVO.getPriceShow();
         this.goodsDetails = mallGoodsVO.getGoodsDetails();
+        this.hot = mallGoodsVO.getHot();
     }
 
     public MallGoodsVO buildMallGoodsVO() {

src/main/java/com/mmc/pms/entity/mall/ProductBrowseDO.java

+package com.mmc.pms.entity.mall;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author lyr
+ * @date 2023/10/10 18:51
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ProductBrowseDO {
+    private Integer id;
+
+    /*
+     * 用户ID
+     * */
+    private Integer userId;
+
+    /*
+     * 商品ID
+     * */
+    private Integer mallGoodsId;
+}

src/main/java/com/mmc/pms/model/mall/MallGoodsVO.java

@@ -78,4 +78,7 @@ public class MallGoodsVO implements Serializable {
 
     @ApiModelProperty(value = "店铺id 小程序用")
     private Integer userAccountId;
+
+    @ApiModelProperty(value = "商品热度")
+    private Integer hot;
 }

src/main/java/com/mmc/pms/service/mall/AppMallGoodsService.java

 package com.mmc.pms.service.mall;
 
+import com.mmc.pms.auth.dto.LoginSuccessDTO;
 import com.mmc.pms.common.ResultBody;
+import com.mmc.pms.entity.mall.MallGoodsDO;
+import com.mmc.pms.entity.mall.ProductBrowseDO;
 import com.mmc.pms.model.mall.GoodsListVO;
 import com.mmc.pms.model.mall.MallGoodsVO;
 import com.mmc.pms.model.mall.UavCartDTO;
@@ -21,4 +24,6 @@ public interface AppMallGoodsService {
     ResultBody<GoodsListVO> brandStoreList(List<Integer> userAccountIds);
 
     List<UavCartDTO> listPriceStock(List<PriceStockQO> priceStockQOS);
+
+    ResultBody<MallGoodsVO> browseMallGoods(MallGoodsDO mallGoodsDO, ProductBrowseDO productBrowseDO, LoginSuccessDTO userLoginInfoFromRedis);
 }

src/main/java/com/mmc/pms/service/mall/MallGoodsService.java

@@ -42,4 +42,6 @@ public interface MallGoodsService {
     void addMallGoodsSpec(List<SpecAttrVO> specAttrList, Integer id, List<PriceStockVO> priceStock, List<LeasePriceStockVO> leasePriceStockVO, Integer flag);
 
     void updateSpecInfo(MallGoodsVO mallGoodsVO, LeaseGoodsVO leaseGoodsVO);
+
+    PageResult listMallGoodsBySearch(MallGoodsInfoQO param, LoginSuccessDTO userLoginInfoFromRedis);
 }

src/main/java/com/mmc/pms/service/mall/impl/AppMallGoodsServiceImpl.java

 package com.mmc.pms.service.mall.impl;
 
+import com.mmc.pms.auth.dto.LoginSuccessDTO;
 import com.mmc.pms.common.ResultBody;
 import com.mmc.pms.dao.mall.AppMallGoodsDao;
 import com.mmc.pms.entity.mall.MallGoodsDO;
 import com.mmc.pms.entity.mall.PriceStockDO;
+import com.mmc.pms.entity.mall.ProductBrowseDO;
 import com.mmc.pms.model.mall.GoodsListVO;
 import com.mmc.pms.model.mall.MallGoodsVO;
 import com.mmc.pms.model.mall.UavCartDTO;
@@ -12,6 +14,7 @@ import com.mmc.pms.service.mall.AppMallGoodsService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
@@ -86,4 +89,20 @@ public class AppMallGoodsServiceImpl implements AppMallGoodsService {
         }
         return uavCartDTOS;
     }
+
+    @Override
+    @Transactional
+    public ResultBody<MallGoodsVO> browseMallGoods(MallGoodsDO mallGoodsDO, ProductBrowseDO productBrowseDO, LoginSuccessDTO userLoginInfoFromRedis) {
+        //获取当前用户id
+        Integer userAccountId = userLoginInfoFromRedis.getUserAccountId();
+        //记录查看商品的用户id
+        productBrowseDO.setUserId(userAccountId);
+        if(productBrowseDO.getUserId() != null){
+            Integer hot = mallGoodsDO.getHot();
+            hot++;
+        }
+
+
+        return null;
+    }
 }

src/main/java/com/mmc/pms/service/mall/impl/MallGoodsServiceImpl.java

@@ -283,6 +283,13 @@ public class MallGoodsServiceImpl implements MallGoodsService {
         }
     }
 
+    @Override
+    public PageResult listMallGoodsBySearch(MallGoodsInfoQO param, LoginSuccessDTO userLoginInfoFromRedis) {
+        param.setShelfStatus(1);
+        PageResult pageResult = getMallGoodsInfo(param);
+        return pageResult;
+    }
+
     /**
      * 添加新规格值
      *