/user/club/home接口返回数据增加超级会员信息

src/main/java/com/caimei365/user/model/dto/SuperVipDto.java

@@ -21,6 +21,8 @@ public class SuperVipDto implements Serializable {
     @ApiModelProperty("用户Id")
     private Integer userId;
 
+    @ApiModelProperty("会员标记 0不是会员，1是会员")
+    private Integer vipFlag;
     /**
      * 购买套餐id，1套餐12个月，2套餐3个月，3套餐1个月
      */
@@ -30,6 +32,6 @@ public class SuperVipDto implements Serializable {
     @ApiModelProperty("套餐到期时间")
     private Date endTime;
 
-    @ApiModelProperty("过期套餐标记，0未开通，-1过期，1未过期")
-    private String endFlag;
+    @ApiModelProperty("过期套餐标记，0过期，1未过期")
+    private Integer endFlag;
 }

src/main/java/com/caimei365/user/service/impl/ClubServiceImpl.java

@@ -3,8 +3,11 @@ package com.caimei365.user.service.impl;
 import com.caimei365.user.mapper.BaseMapper;
 import com.caimei365.user.mapper.ClubMapper;
 import com.caimei365.user.mapper.RegisterMapper;
+import com.caimei365.user.mapper.SuperVipMapper;
 import com.caimei365.user.model.ResponseJson;
 import com.caimei365.user.model.dto.ClubUpdateDto;
+import com.caimei365.user.model.dto.SuperVipDto;
+import com.caimei365.user.model.po.SuperVipPo;
 import com.caimei365.user.model.po.UserBeansHistoryPo;
 import com.caimei365.user.model.po.UserPo;
 import com.caimei365.user.model.vo.*;
@@ -35,6 +38,8 @@ public class ClubServiceImpl implements ClubService {
     private BaseMapper baseMapper;
     @Resource
     private RegisterMapper registerMapper;
+    @Resource
+    private SuperVipMapper vipMapper;
 
     /**
      * 根据用户Id查询机构资料
@@ -247,6 +252,23 @@ public class ClubServiceImpl implements ClubService {
         map.put("isModify", isModify);
         //优惠券可用数量
         Integer couponNum = clubMapper.findCountCoupon(userId);
+        //加入超级会员信息
+        SuperVipDto vipDto = new SuperVipDto();
+        SuperVipPo vip = vipMapper.findSuperVip(userId);
+        if (vip == null) {
+            vipDto.setVipFlag(0);
+        }else {
+            vipDto.setVipFlag(1);
+            vipDto.setEndTime(vip.getEndTime());
+            SuperVipPo endTime = vipMapper.findEndTime(userId);
+            //不为空则有效期内
+            if(endTime!=null){
+                vipDto.setEndFlag(1);
+            }else {
+                vipDto.setEndFlag(0);
+            }
+        }
+        map.put("vip", vipDto);
         map.put("couponNum", couponNum);
         return ResponseJson.success(map);
     }
@@ -298,7 +320,7 @@ public class ClubServiceImpl implements ClubService {
         // 查询是否已存在用户对该资料的抵扣记录
         Integer historyId = clubMapper.findBeansHistoryByArchiveId(userId, archiveId);
         if (null != historyId) {
-            return ResponseJson.error(-1,"请勿重复抵扣");
+            return ResponseJson.error(-1, "请勿重复抵扣");
         }
         // 查询用户采美豆数量
         Integer beansNum = clubMapper.getBeansNumByUserId(userId);

src/main/resources/mapper/SuperVipMapper.xml

@@ -99,10 +99,11 @@
         where userId = #{userId}
         order by payTime desc
     </select>
+
     <select id="findEndTime" resultType="com.caimei365.user.model.po.SuperVipPo">
-        select beginTime, endTime, delFlag, updateTime
+        select beginTime, endTime, updateTime
         from cm_svip_user
         where userId = #{userId}
-          and (now() between beginTime and endTime)
+          and endTime > now()
     </select>
 </mapper>