From 378e08f2d69eaf93117c8c67f1bfdef78bee1030 Mon Sep 17 00:00:00 2001 From: zhangli <123879394@qq.com> Date: Thu, 7 Aug 2025 20:30:00 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E9=97=A8=E5=BA=97=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/controller/StorePubController.java | 12 ++++--- .../sczx/store/dto/req/StoreChangeReq.java | 34 +++++++++++++++++++ .../com/sczx/store/service/StoreService.java | 8 +++++ .../store/service/impl/StoreServiceImpl.java | 16 +++++++-- 4 files changed, 64 insertions(+), 6 deletions(-) create mode 100644 src/main/java/com/sczx/store/dto/req/StoreChangeReq.java diff --git a/src/main/java/com/sczx/store/controller/StorePubController.java b/src/main/java/com/sczx/store/controller/StorePubController.java index 4a863fa..fa27aef 100644 --- a/src/main/java/com/sczx/store/controller/StorePubController.java +++ b/src/main/java/com/sczx/store/controller/StorePubController.java @@ -3,14 +3,12 @@ package com.sczx.store.controller; import com.sczx.store.common.Result; import com.sczx.store.dto.CompanyStoreDTO; +import com.sczx.store.dto.req.StoreChangeReq; import com.sczx.store.service.StoreService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; /** *

@@ -33,4 +31,10 @@ public class StorePubController { public Result getStoreById(@RequestParam(name = "storeId") Integer storeId){ return Result.ok(storeService.getStoreById(storeId)); } + + @ApiOperation(value = "修改门店信息") + @PostMapping("/changeStoreInfo") + public Result changeStoreInfo(@RequestBody StoreChangeReq storeChangeReq){ + return Result.ok(storeService.changeStore(storeChangeReq)); + } } diff --git a/src/main/java/com/sczx/store/dto/req/StoreChangeReq.java b/src/main/java/com/sczx/store/dto/req/StoreChangeReq.java new file mode 100644 index 0000000..940c203 --- /dev/null +++ b/src/main/java/com/sczx/store/dto/req/StoreChangeReq.java @@ -0,0 +1,34 @@ +package com.sczx.store.dto.req; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author: 张黎 + * @Date: 2025/08/07/20:19 + * @Description: + */ + +@Data +@ApiModel(value = "门店信心修改请求") +public class StoreChangeReq { + + @ApiModelProperty(value = "门店id") + private String id; + + @ApiModelProperty("每日营业开始时间") + private String startTime; + + @ApiModelProperty("每日营业结束时间") + private String endTime; + + @ApiModelProperty("每日营业开关时间") + private String dayTime; + + @ApiModelProperty("手机号码") + private String phone; + + @ApiModelProperty("门店logo") + private String image; +} diff --git a/src/main/java/com/sczx/store/service/StoreService.java b/src/main/java/com/sczx/store/service/StoreService.java index b246673..b69db89 100644 --- a/src/main/java/com/sczx/store/service/StoreService.java +++ b/src/main/java/com/sczx/store/service/StoreService.java @@ -2,6 +2,7 @@ package com.sczx.store.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.sczx.store.dto.CompanyStoreDTO; +import com.sczx.store.dto.req.StoreChangeReq; import com.sczx.store.dto.req.StoreDistanceReq; import java.util.List; @@ -24,6 +25,13 @@ public interface StoreService { */ CompanyStoreDTO getStoreById(Integer id); + /** + * 修改门店信息 + * @param storeChangeReq + * @return + */ + Boolean changeStore(StoreChangeReq storeChangeReq); + /** * 根据管理员id获取门店信息 diff --git a/src/main/java/com/sczx/store/service/impl/StoreServiceImpl.java b/src/main/java/com/sczx/store/service/impl/StoreServiceImpl.java index 1b5e482..b3b365e 100644 --- a/src/main/java/com/sczx/store/service/impl/StoreServiceImpl.java +++ b/src/main/java/com/sczx/store/service/impl/StoreServiceImpl.java @@ -1,11 +1,13 @@ package com.sczx.store.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.sczx.store.convert.StoreConvert; import com.sczx.store.dto.CompanyStoreDTO; import com.sczx.store.dto.SimpleUserInfoDTO; +import com.sczx.store.dto.req.StoreChangeReq; import com.sczx.store.dto.req.StoreDistanceReq; import com.sczx.store.po.CompanyStorePO; import com.sczx.store.repository.CompanyStoreRepo; @@ -31,13 +33,23 @@ public class StoreServiceImpl implements StoreService { @Override public CompanyStoreDTO getStoreById(Integer id) { -// LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(CompanyStorePO.class); -// wrapper.eq(CompanyStorePO::getId, id).orderByDesc(CompanyStorePO::getCreateTime).last("limit 1"); CompanyStorePO companyStorePO = companyStoreRepo.getById(id); return StoreConvert.INSTANCE.poToDTO(companyStorePO); } + @Override + public Boolean changeStore(StoreChangeReq storeChangeReq) { + LambdaUpdateWrapper wrapper = Wrappers.lambdaUpdate(CompanyStorePO.class); + wrapper.set(CompanyStorePO::getDayTime, storeChangeReq.getDayTime()) + .set(CompanyStorePO::getStartTime, storeChangeReq.getStartTime()) + .set(CompanyStorePO::getEndTime, storeChangeReq.getEndTime()) + .set(CompanyStorePO::getPhone, storeChangeReq.getPhone()) + .eq(CompanyStorePO::getId, storeChangeReq.getId()); + companyStoreRepo.update(wrapper); + return true; + } + @Override public List listStoresByManage(Integer managerId) { From 156cad4bc7946fecb8a6cc1d944a847911428179 Mon Sep 17 00:00:00 2001 From: zhangli <123879394@qq.com> Date: Thu, 7 Aug 2025 20:37:55 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E9=97=A8=E5=BA=97=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sczx/store/controller/StoreManageController.java | 10 +++++++++- .../com/sczx/store/controller/StorePubController.java | 5 ----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/sczx/store/controller/StoreManageController.java b/src/main/java/com/sczx/store/controller/StoreManageController.java index c363e97..0df7d2b 100644 --- a/src/main/java/com/sczx/store/controller/StoreManageController.java +++ b/src/main/java/com/sczx/store/controller/StoreManageController.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.sczx.store.common.Result; import com.sczx.store.dto.CompanyStoreDTO; import com.sczx.store.dto.SimpleUserInfoDTO; +import com.sczx.store.dto.req.StoreChangeReq; import com.sczx.store.dto.req.StoreDistanceReq; import com.sczx.store.service.StoreService; import com.sczx.store.util.JwtUtil; @@ -23,7 +24,7 @@ import java.util.List; * @author zhangli * @since 2025-07-08 21:16:36 */ -@Api(value = "门店管理端接口", produces = "管理端接口") +@Api(value = "门店管理端接口", tags = "门店管理端接口") @RestController @RequestMapping("/store") public class StoreManageController { @@ -44,4 +45,11 @@ public class StoreManageController { } return Result.ok(storeService.listStoresByManage(managerId)); } + + + @ApiOperation(value = "修改门店信息") + @PostMapping("/changeStoreInfo") + public Result changeStoreInfo(@RequestBody StoreChangeReq storeChangeReq){ + return Result.ok(storeService.changeStore(storeChangeReq)); + } } diff --git a/src/main/java/com/sczx/store/controller/StorePubController.java b/src/main/java/com/sczx/store/controller/StorePubController.java index fa27aef..2650d7c 100644 --- a/src/main/java/com/sczx/store/controller/StorePubController.java +++ b/src/main/java/com/sczx/store/controller/StorePubController.java @@ -32,9 +32,4 @@ public class StorePubController { return Result.ok(storeService.getStoreById(storeId)); } - @ApiOperation(value = "修改门店信息") - @PostMapping("/changeStoreInfo") - public Result changeStoreInfo(@RequestBody StoreChangeReq storeChangeReq){ - return Result.ok(storeService.changeStore(storeChangeReq)); - } } From 7aa3d0a7ef1a89ee42616ba9ac8ab88ef709cbb7 Mon Sep 17 00:00:00 2001 From: zhangli <123879394@qq.com> Date: Thu, 7 Aug 2025 22:52:08 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=A8=E5=BA=97?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/sczx/store/service/impl/StoreServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/sczx/store/service/impl/StoreServiceImpl.java b/src/main/java/com/sczx/store/service/impl/StoreServiceImpl.java index b3b365e..785a129 100644 --- a/src/main/java/com/sczx/store/service/impl/StoreServiceImpl.java +++ b/src/main/java/com/sczx/store/service/impl/StoreServiceImpl.java @@ -41,10 +41,10 @@ public class StoreServiceImpl implements StoreService { @Override public Boolean changeStore(StoreChangeReq storeChangeReq) { LambdaUpdateWrapper wrapper = Wrappers.lambdaUpdate(CompanyStorePO.class); - wrapper.set(CompanyStorePO::getDayTime, storeChangeReq.getDayTime()) - .set(CompanyStorePO::getStartTime, storeChangeReq.getStartTime()) - .set(CompanyStorePO::getEndTime, storeChangeReq.getEndTime()) - .set(CompanyStorePO::getPhone, storeChangeReq.getPhone()) + wrapper.set(StringUtils.isNotBlank(storeChangeReq.getDayTime()),CompanyStorePO::getDayTime, storeChangeReq.getDayTime()) + .set(StringUtils.isNotBlank(storeChangeReq.getStartTime()),CompanyStorePO::getStartTime, storeChangeReq.getStartTime()) + .set(StringUtils.isNotBlank(storeChangeReq.getEndTime()),CompanyStorePO::getEndTime, storeChangeReq.getEndTime()) + .set(StringUtils.isNotBlank(storeChangeReq.getPhone()),CompanyStorePO::getPhone, storeChangeReq.getPhone()) .eq(CompanyStorePO::getId, storeChangeReq.getId()); companyStoreRepo.update(wrapper); return true;