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

luofl

2025-04-11 a9edc2f62628007e2c5e86d416d484780238f13f

 cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java

@@ -189,6 +189,17 @@
            return null;
        }
    }
    @ResponseBody
    @PostMapping("/coupon/queryUserCouponById")
    public Integer queryUserCouponById(@RequestBody Long id) {
        try {
            Integer couponId = userCouponService.getById(id).getCouponId();
            return couponId;
        } catch (Exception e) {
            e.printStackTrace();
            return null;
        }
    }


    @Autowired
@@ -796,8 +807,7 @@
    @PostMapping("/base/coupon/listRecord")
    @ResponseBody
    public List<Map<String, Object>> listRecord(@RequestBody CouponRecordQuery ofSearch) {
        Page<Object> objectPage = new Page<>(ofSearch.getOffset(), ofSearch.getLimit());
        return couponService.listRecord(objectPage, ofSearch.getId(), ofSearch.getIds(), ofSearch.getType());
        return couponService.listRecord(ofSearch.getId(), ofSearch.getIds(), ofSearch.getType());
    }