diff --git a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml index 6cd2ab5d3..d4ff796e5 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml @@ -95,6 +95,7 @@ a.id as id, a.line_id as lineId, a.shop_name as shopName, + a.shop_code as shopCode, a.store_num as storeNum, a.shop_manager_user_id as shopManagerUserId, a.supervisor_user_id as supervisorUserId, diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/Preparation/PreparationDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/Preparation/PreparationDTO.java index 636c72ccb..edb379f10 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/Preparation/PreparationDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/Preparation/PreparationDTO.java @@ -17,7 +17,9 @@ public class PreparationDTO { private Long lineId; private String shopName; - + + private String shopCode; + private String storeNum; private String shopManagerUserId; diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/UpdateShopCodeRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/UpdateShopCodeRequest.java new file mode 100644 index 000000000..ff785c775 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/UpdateShopCodeRequest.java @@ -0,0 +1,24 @@ +package com.cool.store.request; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; + +/** + * @Author: WangShuo + * @Date: 2024/10/09/上午9:36 + * @Version 1.0 + * @注释: + */ +@Data +public class UpdateShopCodeRequest { + + @NotNull + private Long shopId; + + @NotBlank + @ApiModelProperty("门店代码") + private String shopCode; +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/Preparation/PreparationScheduleVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/Preparation/PreparationScheduleVO.java index 9ab71f52d..b5f95c5df 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/Preparation/PreparationScheduleVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/Preparation/PreparationScheduleVO.java @@ -26,6 +26,9 @@ public class PreparationScheduleVO { @ApiModelProperty("门店名称") private String shopName; + @ApiModelProperty("门店代码") + private String shopCode; + @ApiModelProperty("门店编码") private String storeNum; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/ShopService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/ShopService.java index 7c98e33a4..87c1d5183 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/ShopService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/ShopService.java @@ -4,6 +4,7 @@ import com.cool.store.entity.LineInfoDO; import com.cool.store.entity.ShopInfoDO; import com.cool.store.request.AddShopRequest; import com.cool.store.request.DeleteShopRequest; +import com.cool.store.request.UpdateShopCodeRequest; import com.cool.store.vo.shop.MiniShopPageVO; import com.cool.store.vo.shop.RentInfoToDoVO; import com.cool.store.vo.shop.ShopStageInfoVO; @@ -68,4 +69,6 @@ public interface ShopService { * 获取店铺信息 */ ShopInfoDO getShopInfo(Long shopId); + + Integer updateShopCode(UpdateShopCodeRequest request); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreparationServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreparationServiceImpl.java index 8932d0110..77880bff9 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreparationServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreparationServiceImpl.java @@ -106,6 +106,7 @@ public class PreparationServiceImpl implements PreparationService { preparationScheduleVO.setShopId(x.getId()); preparationScheduleVO.setLineId(x.getLineId()); preparationScheduleVO.setShopName(x.getShopName()); + preparationScheduleVO.setShopCode(x.getShopCode()); preparationScheduleVO.setPlanOpenTime(x.getPlanOpenTime()); preparationScheduleVO.setStoreNum(x.getStoreNum()); preparationScheduleVO.setShopManagerUserName(userInfoMap.getOrDefault(x.getShopManagerUserId(), new EnterpriseUserDO()).getName()); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java index a7cae8201..29d8266e3 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java @@ -10,6 +10,7 @@ import com.cool.store.enums.point.*; import com.cool.store.exception.ServiceException; import com.cool.store.request.AddShopRequest; import com.cool.store.request.DeleteShopRequest; +import com.cool.store.request.UpdateShopCodeRequest; import com.cool.store.service.ShopService; import com.cool.store.service.UserAuthMappingService; import com.cool.store.utils.NumberConverter; @@ -172,4 +173,15 @@ public class ShopServiceImpl implements ShopService { return shopInfoDAO.getShopInfo(shopId); } + + @Override + public Integer updateShopCode(UpdateShopCodeRequest request) { + ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(request.getShopId()); + if(Objects.isNull(shopInfo)){ + throw new ServiceException(ErrorCodeEnum.POINT_NOT_EXIST); + } + shopInfo.setShopCode(request.getShopCode()); + shopInfo.setUpdateTime(new Date()); + return shopInfoDAO.updateShopInfo(shopInfo); + } } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCShopController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCShopController.java index ad41bd3ba..47fdf10b3 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCShopController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCShopController.java @@ -2,6 +2,7 @@ package com.cool.store.controller.webb; import com.cool.store.request.AddShopRequest; import com.cool.store.request.DeleteShopRequest; +import com.cool.store.request.UpdateShopCodeRequest; import com.cool.store.response.ResponseResult; import com.cool.store.service.ShopService; import com.cool.store.vo.shop.MiniShopPageVO; @@ -59,4 +60,10 @@ public class PCShopController { return ResponseResult.success(shopService.addShop(request)); } + @ApiOperation("修改门店编号") + @PostMapping("/updateShopCode") + public ResponseResult updateShopCode(@RequestBody @Validated UpdateShopCodeRequest request) { + return ResponseResult.success(shopService.updateShopCode(request)); + } + }