From 45a53a5607b679d97c757a4b6b992970174e0add Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Fri, 31 Oct 2025 09:58:04 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E5=9B=A2=E9=98=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/decoration/TeamAreaMappingDAO.java | 2 ++ .../decoration/DecorationTeamConfigMapper.xml | 4 ++-- .../impl/DecorationHandleServiceImpl.java | 1 + .../webb/DecorationAllocationController.java | 18 ++++++++++-------- 4 files changed, 15 insertions(+), 10 deletions(-) diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/decoration/TeamAreaMappingDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/decoration/TeamAreaMappingDAO.java index c6c61c720..e92e5e2af 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/decoration/TeamAreaMappingDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/decoration/TeamAreaMappingDAO.java @@ -7,6 +7,7 @@ import com.cool.store.mapper.decoration.TeamAreaMappingMapper; import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Repository; +import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -20,6 +21,7 @@ import java.util.stream.Collectors; @Repository public class TeamAreaMappingDAO { + @Resource private TeamAreaMappingMapper teamAreaMappingMapper; public void batchInsert(Long teamId,List cityId){ diff --git a/coolstore-partner-dao/src/main/resources/mapper/decoration/DecorationTeamConfigMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/decoration/DecorationTeamConfigMapper.xml index c89ee9ca1..733a5c109 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/decoration/DecorationTeamConfigMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/decoration/DecorationTeamConfigMapper.xml @@ -21,7 +21,7 @@ t.team_code, t.use_system from - zxjp_decoration_team_config - where deleted = 0 + zxjp_decoration_team_config t + where t.deleted = 0 \ No newline at end of file diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationHandleServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationHandleServiceImpl.java index 5a2a47a0c..3eaba3aba 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationHandleServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationHandleServiceImpl.java @@ -85,6 +85,7 @@ public class DecorationHandleServiceImpl implements DecorationHandleService { } teamConfigDO.setDeleted(1); teamAreaMappingDAO.deletedByTeamId(teamId); + decorationTeamConfigDAO.updateTeam(teamConfigDO); return Boolean.TRUE; } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/DecorationAllocationController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/DecorationAllocationController.java index 21cae571a..8fa3dc4f9 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/DecorationAllocationController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/DecorationAllocationController.java @@ -4,12 +4,14 @@ import com.cool.store.common.PageBasicInfo; import com.cool.store.dto.decoration.DecorationTeamDTO; import com.cool.store.request.decoration.AddTeamRequest; import com.cool.store.request.decoration.UpdateTeamRequest; +import com.cool.store.response.ResponseResult; import com.cool.store.service.DecorationHandleService; import com.github.pagehelper.PageInfo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -32,27 +34,27 @@ public class DecorationAllocationController { @PostMapping("/addTeam") @ApiOperation("添加团队") - public Boolean addTeam(AddTeamRequest request){ - return decorationHandleService.addTeam(request); + public ResponseResult addTeam(@RequestBody AddTeamRequest request){ + return ResponseResult.success(decorationHandleService.addTeam(request)); } @PostMapping("/update") @ApiOperation("修改团队") - public Boolean update(UpdateTeamRequest request){ - return decorationHandleService.update(request); + public ResponseResult update(@RequestBody UpdateTeamRequest request){ + return ResponseResult.success(decorationHandleService.update(request)); } @PostMapping("/deleteByTeamId") @ApiOperation("删除团队") - public Boolean deleteByTeamId(Long teamId){ - return decorationHandleService.deleteByTeamId(teamId); + public ResponseResult deleteByTeamId(Long teamId){ + return ResponseResult.success(decorationHandleService.deleteByTeamId(teamId)); } @PostMapping("/listByCondition") @ApiOperation("查询团队") - public PageInfo listByCondition(PageBasicInfo pageBasicInfo){ - return decorationHandleService.listByCondition(pageBasicInfo); + public ResponseResult> listByCondition(@RequestBody PageBasicInfo pageBasicInfo){ + return ResponseResult.success(decorationHandleService.listByCondition(pageBasicInfo)); }