Merge remote-tracking branch 'origin/test' into test

2025-09-26 16:57:36 +08:00
parent e9581d9cfd 9313f0f5d5
commit 006dbc8dde
3 changed files with 10 additions and 31 deletions
--- a/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkShopCouponRecordService.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkShopCouponRecordService.java
@@ -30,10 +30,8 @@ public interface MkShopCouponRecordService extends IService<MkShopCouponRecord>

    /**
     * 优惠券列表/已领取详情
-     *
-     * @param search 用户Id/昵称/手机号
     */
-    Page<MkShopCouponRecordDTO> getRecord(String search, MkShopCouponRecordDTO param, String startTime, String endTime);
+    Page<MkShopCouponRecordDTO> getRecord(MkShopCouponRecordDTO param, String startTime, String endTime);

    /**
     * 发放券 统一方法
@@ -45,7 +43,6 @@ public interface MkShopCouponRecordService extends IService<MkShopCouponRecord>
    void receiveCoupon(MkShopCouponGiftDTO giftDTO, Integer number, boolean isLimit);


-
    /**
     * 用户优惠券 失效/删除
     */