用户优惠券列表3

cash-api/market-server/src/main/java/com/czg/controller/user/UShopCouponController.java

@@ -1,8 +1,8 @@
 package com.czg.controller.user;
 
 import com.czg.account.vo.UserCouponVo;
-import com.czg.market.entity.MkShopCouponRecord;
 import com.czg.market.service.ShopCouponService;
+import com.czg.market.vo.UserCouponVO;
 import com.czg.resp.CzgResult;
 import com.czg.sa.StpKit;
 import com.czg.utils.AssertUtil;
@@ -28,10 +28,11 @@ public class UShopCouponController {
      * @param status 0 未使用 1已使用 2已过期
      */
     @GetMapping("/findByUserId")
-    public CzgResult<Page<MkShopCouponRecord>> findByUserId(
+    public CzgResult<Page<UserCouponVO>> findByUserId(
             @RequestParam(required = false) Integer status,
+            @RequestParam(required = false) String name,
             @RequestParam(required = false) Long shopId) {
-        return CzgResult.success(couponService.find(StpKit.USER.getLoginIdAsLong(), shopId, status));
+        return CzgResult.success(couponService.find(StpKit.USER.getLoginIdAsLong(),name, shopId, status));
     }
 
     /**