修改领取优惠券方法

ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/StoreCouponVO.java

@@ -1,8 +1,10 @@
 package com.ruoyi.system.domain.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 门店可领优惠券列表项
@@ -39,4 +41,8 @@ public class StoreCouponVO {
 
     /** 当前用户是否已领取 */
     private Boolean hasReceived;
+
+    /** 领取结束时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date endTime;
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/PromotionUserCouponServiceImpl.java

@@ -106,6 +106,7 @@ public class PromotionUserCouponServiceImpl extends ServiceImpl<PromotionUserCou
             vo.setCouponType(batch.getCouponType());
             vo.setTotalCount(batch.getTotalCount());
             vo.setRemainCount(batch.getRemainCount());
+            vo.setEndTime(batch.getEndTime());
 
             // 查询券规则
             PromotionCouponRule rule = ruleMapper.selectOne(