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

jiangping

2025-02-19 c977f0e2fd86ca3e9e3ad3961f702206c41d2767

 server/platform/src/main/java/com/doumee/api/business/DiscountMemberController.java

@@ -7,6 +7,7 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.model.PageData;
import com.doumee.dao.business.model.DiscountMember;
import com.doumee.dao.business.web.request.DiscountMemberDTO;
import com.doumee.service.business.DiscountMemberService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -85,6 +86,24 @@
    @GetMapping("/{id}")
    @RequiresPermissions("business:discountmember:query")
    public ApiResponse findById(@PathVariable String id) {
        return ApiResponse.success(discountMemberService.findById(id));
        return ApiResponse.success(discountMemberService.getDetail(id));
    }

    @ApiOperation("套餐卡报废")
    @PostMapping("/cancel")
    @RequiresPermissions("business:discountmember:update")
    public ApiResponse cancel(@RequestBody DiscountMemberDTO model) {
        discountMemberService.cancel(model);
        return ApiResponse.success(null);
    }

    @ApiOperation("套餐卡调整")
    @PostMapping("/adjust")
    @RequiresPermissions("business:discountmember:update")
    public ApiResponse adjust(@RequestBody DiscountMemberDTO model) {
        discountMemberService.adjust(model);
        return ApiResponse.success(null);
    }


}