From 0190a76908f930ed75cbbf93696c2f19d40f33e8 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Mon, 14 Apr 2025 16:17:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E6=8E=A5=E5=8F=A3+=E6=96=B0=E7=AE=A1?= =?UTF-8?q?=E5=AE=B6=E5=BA=97=E5=90=8D=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cool/store/request/UpdateLineRequest.java | 4 +- .../com/cool/store/service/LineService.java | 2 + .../com/cool/store/service/ShopService.java | 2 + .../store/service/impl/LineServiceImpl.java | 11 +++++ .../store/service/impl/ShopServiceImpl.java | 9 ++++ .../service/impl/SyncDataServiceImpl.java | 49 ++++++++++++++++++- .../controller/webb/LineInfoController.java | 7 +++ .../controller/webc/MiniShopController.java | 5 ++ 8 files changed, 85 insertions(+), 4 deletions(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/UpdateLineRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/UpdateLineRequest.java index 50b2f994d..3b1a32d25 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/UpdateLineRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/UpdateLineRequest.java @@ -25,9 +25,7 @@ public class UpdateLineRequest { @ApiModelProperty("所属区域") private Long regionId; @NotNull - @Min(1) - @Max(3) - @ApiModelProperty("加盟模式 1-社会加盟模式/加盟部加盟店 2-强加盟模式/加盟公司加盟店 3-加盟公司自有店") + @ApiModelProperty("加盟模式 1-社会加盟模式/加盟部加盟店 2-强加盟模式/加盟公司加盟店 3-加盟公司自有店 4-强加盟") private Integer joinMode; @NotNull @ApiModelProperty("加盟品牌") diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/LineService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/LineService.java index 8c38d01b2..0eb098ae1 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/LineService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/LineService.java @@ -109,4 +109,6 @@ public interface LineService { */ Integer updatePartnerName(String username,Long lineId); + Integer updateRegionId(Long regionId,Long lineId); + } 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 ae2c057d7..3fd12524a 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 @@ -109,4 +109,6 @@ public interface ShopService { List getShopListSuccessOpen(Long lineId); ShopResponse getShopNameAndCode(Long shopId,Long lineId); + + String getFranchiseBrandName(Long shopId); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java index 8b5f013d9..916e99753 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java @@ -640,6 +640,17 @@ public class LineServiceImpl implements LineService { return lineInfoDAO.updateLineInfo(lineInfo); } + @Override + public Integer updateRegionId(Long regionId, Long lineId) { + LineInfoDO lineInfo = lineInfoDAO.getLineInfo(lineId); + if (lineInfo == null) { + throw new ServiceException(ErrorCodeEnum.LINE_ID_IS_NOT_EXIST); + } + lineInfo.setRegionId(regionId); + lineInfo.setUpdateTime(new Date()); + return lineInfoDAO.updateLineInfo(lineInfo); + } + /** * 计算预期时间 * @param startTime 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 e86b0e537..d74bfa3fd 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 @@ -628,5 +628,14 @@ public class ShopServiceImpl implements ShopService { } + @Override + public String getFranchiseBrandName(Long shopId) { + ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(shopId); + if (shopInfo == null){ + throw new ServiceException(ErrorCodeEnum.SHOP_NOT_EXIST); + } + return FranchiseBrandEnum.getDescByCode(shopInfo.getFranchiseBrand()); + } + } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java index aafbce0d3..ba35d26a6 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java @@ -114,7 +114,7 @@ public class SyncDataServiceImpl implements SyncDataService { request.setWqfAccount(shopInfo.getShopCode()); request.setDownstreamSystemShopName(shopInfo.getShopName()); if (systemType.equals(DownSystemTypeEnum.XGJ)) { - //todo + request.setDownstreamSystemShopName(getXgjShopName(lineInfoDO, shopInfo)); } if (systemType.equals(DownSystemTypeEnum.POS)) { if (buildInformationDO != null) { @@ -242,4 +242,51 @@ public class SyncDataServiceImpl implements SyncDataService { } return null; } + + public String getXgjShopName(LineInfoDO lineInfoDO, ShopInfoDO shopInfoDO) { + if (StringUtils.isBlank(shopInfoDO.getShopCode())) { + return null; + } + if (String.valueOf(FranchiseBrandEnum.ZXJP.getCode()).equals(shopInfoDO.getFranchiseBrand())) { + //M10001 + if (shopInfoDO.getShopCode().matches("M\\d*")) { + return "MX" + shopInfoDO.getShopName() + "(" + lineInfoDO.getUsername() + ")"; + } + //FS10001 + if (shopInfoDO.getShopCode().matches("FS\\d*")) { + return "FS" + shopInfoDO.getShopName() + "(" + lineInfoDO.getUsername() + ")"; + } + // MS10001 + if (shopInfoDO.getShopCode().matches("MS\\d*")) { + return "MS" + shopInfoDO.getShopName() + "(" + lineInfoDO.getUsername() + ")"; + } + // S10001 + if (shopInfoDO.getShopCode().matches("S\\d*")) { + return shopInfoDO.getShopName() + "(" + lineInfoDO.getUsername() + ")"; + } + } + if (String.valueOf(FranchiseBrandEnum.MZG.getCode()).equals(shopInfoDO.getFranchiseBrand())) { + if (shopInfoDO.getShopCode().matches("MZGM\\d*")) { + return FranchiseBrandEnum.MZG.getDesc() + shopInfoDO.getShopName() + "(" + lineInfoDO.getUsername() + ")"; + } + if (shopInfoDO.getShopCode().matches("MZGS\\d*")) { + return FranchiseBrandEnum.MZG.getDesc() + shopInfoDO.getShopName(); + } + } + if (String.valueOf(FranchiseBrandEnum.ZJS.getCode()).equals(shopInfoDO.getFranchiseBrand())) { + if (shopInfoDO.getShopCode().matches("LX\\d*")) { + return "LX" + FranchiseBrandEnum.ZJS.getDesc() + shopInfoDO.getShopName() + "(" + lineInfoDO.getUsername() + ")"; + } + if (shopInfoDO.getShopCode().matches("X\\d*")) { + return "X" + FranchiseBrandEnum.ZJS.getDesc() + shopInfoDO.getShopName() + "(" + lineInfoDO.getUsername() + ")"; + } + if (shopInfoDO.getShopCode().matches("Q\\d*")) { + return "Q" + FranchiseBrandEnum.ZJS.getDesc() + shopInfoDO.getShopName() + "(" + lineInfoDO.getUsername() + ")"; + } + if (shopInfoDO.getShopCode().matches("Z\\d*")) { + return FranchiseBrandEnum.ZJS.getDesc() + shopInfoDO.getShopName(); + } + } + return null; + } } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/LineInfoController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/LineInfoController.java index bec65dea7..cb223d0c3 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/LineInfoController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/LineInfoController.java @@ -179,4 +179,11 @@ public class LineInfoController { public ResponseResult> getLines(@RequestBody LinesRequest request) { return ResponseResult.success(lineService.getLines(request)); } + + @ApiOperation("修改所属大区/分公司") + @GetMapping("/updateLineRegion") + public ResponseResult updateLineRegion(@RequestParam("regionId")Long regionId,@RequestParam("lineId")Long lineId) { + return ResponseResult.success(lineService.updateRegionId(regionId,lineId)); + } + } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniShopController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniShopController.java index 7961c71c5..389105b27 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniShopController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniShopController.java @@ -132,5 +132,10 @@ public class MiniShopController { public ResponseResult getShopNameAndCode(@RequestParam(name = "shopId",required = false)Long shopId, @RequestParam("lineId")Long lineId) { return ResponseResult.success(shopService.getShopNameAndCode(shopId,lineId)); } + @ApiOperation("获取店铺所属品牌") + @GetMapping("/getFranchiseBrandName") + public ResponseResult getFranchiseBrandName(@RequestParam(name = "shopId")Long shopId) { + return ResponseResult.success(shopService.getFranchiseBrandName(shopId)); + } }