用户优惠券列表3

cash-common/cash-common-service/src/main/java/com/czg/account/vo/UserCouponVo.java

@@ -17,6 +17,7 @@ public class UserCouponVo {
     private String shopName;
     private BigDecimal fullAmount;
     private BigDecimal discountAmount;
+    private BigDecimal discountRate;
     private Long couponId;
     private String foods;
     //优惠券名称

cash-common/cash-common-service/src/main/java/com/czg/market/service/MkShopCouponRecordService.java

@@ -6,6 +6,7 @@ import com.czg.account.vo.UserCouponVo;
 import com.czg.market.dto.MkRewardCouponDTO;
 import com.czg.market.dto.MkShopCouponGiftDTO;
 import com.czg.market.dto.MkShopCouponRecordDTO;
+import com.czg.market.vo.UserCouponVO;
 import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.service.IService;
 import com.czg.market.entity.MkShopCouponRecord;
@@ -23,7 +24,7 @@ public interface MkShopCouponRecordService extends IService<MkShopCouponRecord>
 
     List<CouponReceiveVo> queryReceive(QueryReceiveDto param);
 
-    List<MkShopCouponRecord> findByUser(List<Long> shopUserIds, Integer status);
+    List<UserCouponVO> findByUser(String name, List<Long> shopUserIds, Integer status);
 
     List<UserCouponVo> queryByVipIdAndShopId(Long shopId, Long shopUserId, Integer type);
 

cash-common/cash-common-service/src/main/java/com/czg/market/service/ShopCouponService.java

@@ -3,6 +3,7 @@ package com.czg.market.service;
 import com.czg.account.vo.UserCouponVo;
 import com.czg.market.dto.ShopCouponDTO;
 import com.czg.market.entity.MkShopCouponRecord;
+import com.czg.market.vo.UserCouponVO;
 import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.service.IService;
 import com.czg.market.entity.ShopCoupon;
@@ -26,7 +27,7 @@ public interface ShopCouponService extends IService<ShopCoupon> {
 
     void deleteCoupon(Long id);
 
-    Page<MkShopCouponRecord> find(Long userId, Long shopId, Integer status);
+    Page<UserCouponVO> find(Long userId, String name, Long shopId, Integer status);
 
     List<UserCouponVo> findCoupon(Long shopId, Long shopUserId, Integer type);
 

cash-common/cash-common-service/src/main/java/com/czg/market/vo/UserCouponVO.java

@@ -0,0 +1,156 @@
+package com.czg.market.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * 优惠券发放记录表 实体类。
+ *
+ * @author ww
+ * @since 2025-09-13
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Accessors(chain = true)
+public class UserCouponVO implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    private Long id;
+
+    /**
+     * 店铺id
+     */
+    private Long shopId;
+
+    /**
+     * 卷名称
+     */
+    private String name;
+
+    /**
+     * 优惠券类型：1-满减券，2-商品兑换券，3-折扣券，4-第二件半价券， 6-买一送一券，7-固定价格券，8-免配送费券
+     */
+    private Integer type;
+
+    /**
+     * 满多少金额
+     */
+    private BigDecimal fullAmount;
+
+    /**
+     * 减多少金额
+     */
+    private BigDecimal discountAmount;
+
+    /**
+     * 折扣率 %
+     */
+    private Integer discountRate;
+
+
+    /**
+     * 领取时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 使用时间
+     */
+    private LocalDateTime useTime;
+
+    /**
+     * 过期时间
+     */
+    private LocalDateTime effectEndTime;
+    /**
+     * 优惠券生效时间
+     */
+    private LocalDateTime effectStartTime;
+
+    /**
+     * 0未使用
+     * 1已使用
+     * 2已过期
+     */
+    private Integer status;
+    /**
+     * 可用门店类型：only-仅本店；all-所有门店，custom-指定门店
+     */
+    private String useShopType;
+
+    /**
+     * 可用门店
+     */
+    private String useShops;
+    /**
+     * 可用商品
+     */
+    private String foods;
+
+    /**
+     * 可使用类型：dine堂食/pickup自取/deliv配送/express快递
+     */
+    private String useType;
+
+    /**
+     * 可用周期，如：周一,周二,周三,周四,周五,周六,周七
+     */
+    private String useDays;
+
+    /**
+     * 可用时间段类型：all-全时段，custom-指定时段
+     */
+    private String useTimeType;
+
+    /**
+     * 可用开始时间
+     */
+    private LocalDateTime useStartTime;
+
+    /**
+     * 可用结束时间
+     */
+    private LocalDateTime useEndTime;
+
+
+    /**
+     * 每人领取限量，-10086为不限量
+     */
+    private Integer getLimit;
+
+    /**
+     * 每人每日使用限量，-10086为不限量
+     */
+    private Integer useLimit;
+
+    /**
+     * 与限时折扣同享：0-否，1-是
+     */
+    private Integer discountShare;
+
+    /**
+     * 与会员价同享：0-否，1-是
+     */
+    private Integer vipPriceShare;
+
+    /**
+     * 附加规则说明
+     */
+    private String ruleDetails;
+
+    private String deductNum;
+
+
+}