接口返回时间修改

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

@@ -33,4 +33,7 @@ public class SuperVipDto extends VipPayHistoryPo implements Serializable {
 
     @ApiModelProperty("过期套餐标记，0未买过，-1过期，1有效/无过期时间接口0不是会员，1是")
     private Integer vipFlag;
+
+    @ApiModelProperty("前端展示时间")
+    private String time;
 }

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

@@ -470,15 +470,10 @@ public class BaseServiceImpl implements BaseService {
         //1.封装vipDto看超级会员是否过期,0未开通，-1过期，1未过期
         SuperVipDto vipEnd = findEnd(userId);
         Map<String, Object> map = new HashMap(3);
-        try {
-            if(vipEnd.getVipFlag().equals(1)){
-                SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
-                String mat = format.format(vipEnd.getEndTime());
-                Date parse = format.parse(mat);
-                vipEnd.setEndTime(parse);
-            }
-        } catch (ParseException e) {
-            e.printStackTrace();
+        if (vipEnd.getVipFlag().equals(1)) {
+            SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+            String mat = format.format(vipEnd.getEndTime());
+            vipEnd.setTime(mat);
         }
         map.put("vip", vipEnd);
         //2.查当月vip优惠卷
@@ -489,7 +484,7 @@ public class BaseServiceImpl implements BaseService {
         if (couponUse != null && couponUse.size() > 0) {
             //couponuse有就给2，没有就给1,2使用1未用
             vipCoupon.forEach(couponVo -> couponVo.setUseStatus(couponUse.contains(couponVo.getCouponId()) ? 2 : 1));
-        }else{
+        } else {
             vipCoupon.forEach(couponVo -> couponVo.setUseStatus(1));
         }
         vipCoupon.forEach(couponVo -> couponVo.setGetFlag(couponGet.contains(couponVo.getCouponId()) ? 1 : 0));

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

@@ -274,6 +274,8 @@ public class ClubServiceImpl implements ClubService {
         }else {
             vipDto.setEndTime(vip.getEndTime());
             SuperVipPo endTime = vipMapper.findEndTime(userId);
+            String format = new SimpleDateFormat("yyyy-MM-dd").format(endTime);
+            vipDto.setTime(format);
             //不为空则有效期内
             if(endTime!=null){
                 vipDto.setVipFlag(1);