xuq

src/main/java/com/gree/mall/manager/bean/member/GoodsVisitDetail.java

@@ -0,0 +1,15 @@
+package com.gree.mall.manager.bean.member;
+
+import com.gree.mall.manager.plus.entity.GoodsVisit;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel
+@Data
+public class GoodsVisitDetail extends GoodsVisit {
+
+    @ApiModelProperty(value = "商品状态 true:上架  false:下架")
+    private Boolean status;
+
+}

src/main/java/com/gree/mall/manager/controller/member/MemberController.java

@@ -2,6 +2,7 @@ package com.gree.mall.manager.controller.member;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.gree.mall.manager.bean.member.GoodsVisitDetail;
 import com.gree.mall.manager.bean.user.UserApplyBean;
 import com.gree.mall.manager.bean.user.UserWxBean;
 import com.gree.mall.manager.exception.RemoteServiceException;
@@ -207,12 +208,12 @@ public class MemberController {
 
     @GetMapping("/goods/visit")
     @ApiOperation(value = "我的浏览记录")
-    public ResponseHelper<IPage<GoodsVisit>> goodsVisitList(
+    public ResponseHelper<IPage<GoodsVisitDetail>> goodsVisitList(
             @ApiParam(required = true, value = "用户id") @RequestParam(required = true) String userId,
             @ApiParam(value = "页号", required = true) @RequestParam Integer pageNum,
             @ApiParam(value = "页大小", required = true) @RequestParam Integer pageSize
     ) {
-        IPage<GoodsVisit> goodsVisitIPage = userLogic.goodsVisitList(userId, pageNum, pageSize);
+        IPage<GoodsVisitDetail> goodsVisitIPage = userLogic.goodsVisitList(userId, pageNum, pageSize);
         return ResponseHelper.success(goodsVisitIPage);
     }
 

src/main/java/com/gree/mall/manager/logic/user/UserLogic.java

@@ -1,5 +1,6 @@
 package com.gree.mall.manager.logic.user;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
@@ -10,6 +11,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gree.mall.manager.bean.ExcelData;
 import com.gree.mall.manager.bean.admin.AdminUserCom;
+import com.gree.mall.manager.bean.member.GoodsVisitDetail;
 import com.gree.mall.manager.bean.member.MemberBean;
 import com.gree.mall.manager.bean.member.MemberSortBean;
 import com.gree.mall.manager.bean.user.UserApplyBean;
@@ -90,6 +92,8 @@ public class UserLogic {
     UserServiceApplyService userServiceApplyService;
     @Autowired
     UserServiceWaitService userServiceWaitService;
+    @Autowired
+    GoodsService goodsService;
 
 
     /**
@@ -527,8 +531,29 @@ public class UserLogic {
     /**
      * 我的浏览记录
      */
-    public IPage<GoodsVisit> goodsVisitList(String userId, Integer pageNo, Integer pageSize) {
-        return goodsVisitService.lambdaQuery().eq(GoodsVisit::getUserId, userId).page(new Page<>(pageNo, pageSize));
+    public IPage<GoodsVisitDetail> goodsVisitList(String userId, Integer pageNo, Integer pageSize) {
+        Page<GoodsVisit> page = goodsVisitService.lambdaQuery().eq(GoodsVisit::getUserId, userId).page(new Page<>(pageNo, pageSize));
+
+        if (CollectionUtils.isEmpty(page.getRecords()))
+            return new Page<>();
+
+        Page<GoodsVisitDetail> goodsVisitDetailPage = new Page<>();
+
+        List<GoodsVisitDetail> goodsVisitDetails = new ArrayList<>();
+
+        for (GoodsVisit record : page.getRecords()) {
+            GoodsVisitDetail goodsVisitDetail = BeanUtil.toBean(record, GoodsVisitDetail.class);
+            Goods goods = goodsService.getById(goodsVisitDetail.getGoodsId());
+            goodsVisitDetail.setStatus(goods.getStatus());
+
+            goodsVisitDetails.add(goodsVisitDetail);
+        }
+        goodsVisitDetailPage.setRecords(goodsVisitDetails);
+        goodsVisitDetailPage.setTotal(page.getTotal());
+        goodsVisitDetailPage.setCurrent(page.getCurrent());
+        goodsVisitDetailPage.setSize(page.getSize());
+        goodsVisitDetailPage.setPages(page.getPages());
+        return goodsVisitDetailPage;
     }
 
     /**