From f5150d37dcc7f9ecc7fed9870202e7ff7a7b586f Mon Sep 17 00:00:00 2001 From: pengsz Date: Mon, 8 Dec 2025 10:13:21 +0800 Subject: [PATCH] refactor --- .../controller/StoreBargainController.java | 161 ------------------ .../com/yzt/common/response/UserResponse.java | 5 +- 2 files changed, 4 insertions(+), 162 deletions(-) delete mode 100644 fightwine-admin/src/main/java/com/yzt/admin/controller/StoreBargainController.java diff --git a/fightwine-admin/src/main/java/com/yzt/admin/controller/StoreBargainController.java b/fightwine-admin/src/main/java/com/yzt/admin/controller/StoreBargainController.java deleted file mode 100644 index a607f06..0000000 --- a/fightwine-admin/src/main/java/com/yzt/admin/controller/StoreBargainController.java +++ /dev/null @@ -1,161 +0,0 @@ -package com.yzt.admin.controller; - -import com.yzt.common.page.CommonPage; -import com.yzt.common.request.PageParamRequest; -import com.yzt.common.request.StoreBargainRequest; -import com.yzt.common.request.StoreBargainSearchRequest; -import com.yzt.common.request.StoreBargainUserSearchRequest; -import com.yzt.common.response.StoreBargainResponse; -import com.yzt.common.response.StoreBargainUserHelpResponse; -import com.yzt.common.response.StoreBargainUserResponse; -import com.yzt.common.response.StoreProductInfoResponse; -import com.yzt.common.result.CommonResult; -import com.yzt.service.service.StoreBargainService; -import com.yzt.service.service.StoreBargainUserHelpService; -import com.yzt.service.service.StoreBargainUserService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - - -/** - * 砍价表 前端控制器 - * - */ -@Slf4j -@RestController -@RequestMapping("api/admin/store/bargain") -@Api(tags = "商品 -- 砍价 -- 商品") //配合swagger使用 -public class StoreBargainController { - - @Autowired - private StoreBargainService storeBargainService; - - @Autowired - private StoreBargainUserService storeBargainUserService; - - @Autowired - private StoreBargainUserHelpService storeBargainUserHelpService; - - /** - * 分页显示砍价商品列表 - * @param request 搜索条件 - * @param pageParamRequest 分页参数 - */ - @PreAuthorize("hasAuthority('admin:bargain:list')") - @ApiOperation(value = "分页显示砍价商品列表") //配合swagger使用 - @RequestMapping(value = "/list", method = RequestMethod.GET) - public CommonResult> getList(@Validated StoreBargainSearchRequest request, @Validated PageParamRequest pageParamRequest){ - CommonPage storeBargainCommonPage = CommonPage.restPage(storeBargainService.getList(request, pageParamRequest)); - return CommonResult.success(storeBargainCommonPage); - } - - /** - * 新增砍价商品 - * @param storeBargainRequest 新增参数 - */ - @PreAuthorize("hasAuthority('admin:bargain:save')") - @ApiOperation(value = "新增砍价商品") - @RequestMapping(value = "/save", method = RequestMethod.POST) - public CommonResult save(@RequestBody @Validated StoreBargainRequest storeBargainRequest){ - if(storeBargainService.saveBargain(storeBargainRequest)){ - return CommonResult.success("添加砍价商品成功"); - }else{ - return CommonResult.failed("添加砍价商品失败"); - } - } - - /** - * 删除砍价商品 - * @param id Integer - */ - @PreAuthorize("hasAuthority('admin:bargain:delete')") - @ApiOperation(value = "删除砍价商品") - @RequestMapping(value = "/delete", method = RequestMethod.GET) - public CommonResult delete(@RequestParam(value = "id") Integer id){ - if(storeBargainService.deleteById(id)){ - return CommonResult.success(); - }else{ - return CommonResult.failed(); - } - } - - /** - * 修改砍价商品 - * @param storeBargainRequest 修改参数 - */ - @PreAuthorize("hasAuthority('admin:bargain:update')") - @ApiOperation(value = "修改砍价商品") - @RequestMapping(value = "/update", method = RequestMethod.POST) - public CommonResult update(@RequestBody @Validated StoreBargainRequest storeBargainRequest){ - if (storeBargainService.updateBargain(storeBargainRequest)) { - return CommonResult.success(); - } else { - return CommonResult.failed(); - } - } - - /** - * 查询砍价商品详情 - * @param id Integer - */ - @PreAuthorize("hasAuthority('admin:bargain:info')") - @ApiOperation(value = "查询砍价商品详情") - @RequestMapping(value = "/info", method = RequestMethod.GET) - public CommonResult info(@RequestParam(value = "id") Integer id){ - StoreProductInfoResponse storeBargainResponse = storeBargainService.getAdminDetail(id); - return CommonResult.success(storeBargainResponse); - } - - /** - * - * 修改砍价商品状态 - * @param id 商品id - * @param status 商品状态 - * @return {@link CommonResult} - */ - @PreAuthorize("hasAuthority('admin:bargain:update:status')") - @ApiOperation(value = "修改砍价商品状态") - @RequestMapping(value = "/update/status", method = RequestMethod.POST) - public CommonResult updateStatus(@RequestParam @Validated Integer id, @RequestParam @Validated boolean status){ - if(storeBargainService.updateBargainStatus(id,status)){ - return CommonResult.success(); - }else{ - return CommonResult.failed(); - } - } - - /** - * 分页显示砍价列表 - * @param request 搜索条件 - * @param pageParamRequest 分页参数 - */ - @PreAuthorize("hasAuthority('admin:bargain:user:list')") - @ApiOperation(value = "分页显示砍价列表") //配合swagger使用 - @RequestMapping(value = "/bargain_list", method = RequestMethod.GET) - public CommonResult> getBargainUserList(@Validated StoreBargainUserSearchRequest request, @Validated PageParamRequest pageParamRequest){ - CommonPage bargainUserCommonPage = CommonPage.restPage(storeBargainUserService.getList(request, pageParamRequest)); - return CommonResult.success(bargainUserCommonPage); - } - - /** - * 获取砍价参与详情列表 - * @param id StoreBargainUser 砍价参与用户编号 - */ - @PreAuthorize("hasAuthority('admin:bargain:user:help:list')") - @ApiOperation(value = "获取砍价参与详情列表") //配合swagger使用 - @RequestMapping(value = "/bargain_list/{id}", method = RequestMethod.GET) - public CommonResult> getBargainUserHelpDetail(@PathVariable(value = "id") Integer id){ - List list = storeBargainUserHelpService.getList(id); - return CommonResult.success(list); - } -} - - - diff --git a/fightwine-common/src/main/java/com/yzt/common/response/UserResponse.java b/fightwine-common/src/main/java/com/yzt/common/response/UserResponse.java index 43f46a3..244b329 100644 --- a/fightwine-common/src/main/java/com/yzt/common/response/UserResponse.java +++ b/fightwine-common/src/main/java/com/yzt/common/response/UserResponse.java @@ -139,9 +139,12 @@ public class UserResponse { @ApiModelProperty(value = "是否关注公众号") private Boolean subscribe; - @ApiModelProperty(value = "公司名称") + @ApiModelProperty(value = "租户名称") private String tenantName; + @ApiModelProperty("用户公司名称") + private String companyName; + // @ApiModelProperty(value = "累计收益") // private BigDecimal totalIncomes; //