套购套餐详情 增加是否收藏回显

alien-entity/src/main/java/shop/alien/entity/store/OrderCouponMiddle.java

@@ -31,9 +31,9 @@ public class OrderCouponMiddle {
     private Integer count;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Long usedTime; // 使用时间
+    private Date usedTime; // 使用时间
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Long refundTime; // 退款时间
+    private Date refundTime; // 退款时间
     private Integer couponId; // 团购/代金券id
     @ApiModelProperty(value = "删除标记, 0:未删除, 1:已删除")
     @TableField("delete_flag")

alien-entity/src/main/java/shop/alien/entity/store/vo/LifeGroupBuyThaliVo.java

@@ -253,4 +253,7 @@ public class LifeGroupBuyThaliVo {
     @ApiModelProperty(value = "子信息")
     private List<LifeGroupBuyNameThaliVo> details;
 
+    @ApiModelProperty(value = "是否收藏")
+    private String isCollect;
+
 }

alien-store/src/main/java/shop/alien/store/controller/LifeGroupBuyController.java

@@ -57,9 +57,9 @@ public class LifeGroupBuyController {
 
     @ApiOperation("id查询套餐团购")
     @GetMapping("/getThaliById")
-    private R getThaliById(@RequestParam("id") String id) {
-        log.info("LifeGroupBuyController.getThaliById?id={}", id);
-        return R.data(lifeGroupBuyService.getThaliById(id));
+    private R getThaliById(@RequestParam("id") String id, String userId) {
+        log.info("LifeGroupBuyController.getThaliById?id={}&userId={}", id, userId);
+        return R.data(lifeGroupBuyService.getThaliById(id, userId));
     }
 
     @ApiOperation("修改团购状态")

alien-store/src/main/java/shop/alien/store/service/LifeGroupBuyService.java

@@ -17,7 +17,7 @@ public interface LifeGroupBuyService extends IService<LifeGroupBuyMain> {
 
     IPage<LifeGroupBuyThaliVo> getThaliList(int page, int size, String storeId, String status, String groupName, String groupType);
 
-    LifeGroupBuyThaliVo getThaliById(String id);
+    LifeGroupBuyThaliVo getThaliById(String id, String userId);
 
     boolean updateStatus(String id,String status, String approvalComments);
 

alien-store/src/main/java/shop/alien/store/service/impl/LifeGroupBuyServiceImpl.java

@@ -42,6 +42,8 @@ public class LifeGroupBuyServiceImpl extends ServiceImpl<LifeGroupBuyMainMapper,
 
     private final StoreMenuMapper storeMenuMapper;
 
+    private final LifeCollectMapper lifeCollectMapper;
+
     @Override
     public boolean saveThali(LifeGroupBuyDto lifeGroupBuyDto) {
         JSONObject currentUserInfo = JwtUtil.getCurrentUserInfo();
@@ -99,12 +101,18 @@ public class LifeGroupBuyServiceImpl extends ServiceImpl<LifeGroupBuyMainMapper,
     }
 
     @Override
-    public LifeGroupBuyThaliVo getThaliById(String id) {
+    public LifeGroupBuyThaliVo getThaliById(String id, String userId) {
         LifeGroupBuyMain lifeGroupBuyMain = lifeGroupBuyMainMapper.selectById(id);
         LifeGroupBuyThaliVo lifeGroupBuyThaliVo = new LifeGroupBuyThaliVo();
         BeanUtils.copyProperties(lifeGroupBuyMain, lifeGroupBuyThaliVo);
         List<LifeGroupBuyThali> lifeGroupBuyThalis = lifeGroupBuyThaliMapper.selectList(new LambdaQueryWrapper<LifeGroupBuyThali>().eq(LifeGroupBuyThali::getParentId, id).eq(LifeGroupBuyThali::getDeleteFlag, 0));
 
+        // 是否收藏了该团购
+        LifeCollect lifeCollect = lifeCollectMapper.selectOne(new QueryWrapper<LifeCollect>().eq("user_id", userId).eq("coupon_id", id));
+        lifeGroupBuyThaliVo.setIsCollect("0");
+        if(!Objects.isNull(lifeCollect)){
+            lifeGroupBuyThaliVo.setIsCollect("1");
+        }
         //美食
         if (lifeGroupBuyMain.getGroupType() == 1) {
             for (LifeGroupBuyThali lifeGroupBuyThali : lifeGroupBuyThalis) {