From 08a973bd45928772fb0e5e5d5b3984907c94c9b6 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Thu, 17 Apr 2025 20:40:43 +0800 Subject: [PATCH 1/3] fix --- .../main/java/com/cool/store/request/OrderSysInfoRequest.java | 3 +-- .../com/cool/store/service/impl/OperationLogServiceImpl.java | 3 +++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/OrderSysInfoRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/OrderSysInfoRequest.java index 9d2f94bd0..e29e6b137 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/OrderSysInfoRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/OrderSysInfoRequest.java @@ -117,8 +117,7 @@ public class OrderSysInfoRequest { } public Boolean check(){ if (Objects.equals(this.type, OrderSysTypeEnum.ORDER_SYS_TYPE_1.getType())){ - //todo - if (StringUtils.isAnyBlank(this.xgjRegionId,this.xgjVicePresident,this.declareGoodsDate,this.declareGoodsLogisticsWarehouse)){ + if (StringUtils.isAnyBlank(this.xgjRegionId,this.xgjVicePresident,this.declareGoodsDate,this.declareGoodsLogisticsWarehouse,this.declareGoodsType)){ return false; } } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OperationLogServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OperationLogServiceImpl.java index 06a1a1456..004561049 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OperationLogServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OperationLogServiceImpl.java @@ -90,6 +90,9 @@ public class OperationLogServiceImpl implements OperationLogService { public List getAuditInfo(Long shopId, List shopSubStageList) { List responses = new ArrayList<>(); List logList = operationLogDAO.getByShopSubStage(shopId, shopSubStageList, null); + if (CollectionUtils.isEmpty(logList)) { + return responses; + } Map> operationLogMap = logList.stream().collect(Collectors.groupingBy(OperationLogDO::getCreateTime)); //根据时间分组 for (Date date : operationLogMap.keySet()) { From fe574d5368bebf65e47115942e907038f9eccaed Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Thu, 17 Apr 2025 20:41:58 +0800 Subject: [PATCH 2/3] fix --- .../com/cool/store/service/impl/OperationLogServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OperationLogServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OperationLogServiceImpl.java index 004561049..86b39b858 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OperationLogServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OperationLogServiceImpl.java @@ -91,7 +91,7 @@ public class OperationLogServiceImpl implements OperationLogService { List responses = new ArrayList<>(); List logList = operationLogDAO.getByShopSubStage(shopId, shopSubStageList, null); if (CollectionUtils.isEmpty(logList)) { - return responses; + return null; } Map> operationLogMap = logList.stream().collect(Collectors.groupingBy(OperationLogDO::getCreateTime)); //根据时间分组 From 146d4b11cf75c249cc8aaef7e36d45eed23e2406 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Thu, 17 Apr 2025 21:07:58 +0800 Subject: [PATCH 3/3] fix --- .../store/service/impl/ShopServiceImpl.java | 58 ++++++++++--------- 1 file changed, 30 insertions(+), 28 deletions(-) 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 1da63b663..32203e4c6 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 @@ -583,31 +583,27 @@ public class ShopServiceImpl implements ShopService { public ShopResponse getShopNameAndCode(Long shopId, Long lineId) { boolean flag = false; LineInfoDO lineInfoDO = lineInfoDAO.getLineInfo(lineId); - if (lineInfoDO == null){ + if (lineInfoDO == null) { throw new ServiceException(ErrorCodeEnum.LINE_ID_IS_NOT_EXIST); } ShopResponse response = new ShopResponse(); - if (shopId != null) { - MiniShopsResponse shopInfo = shopInfoDAO.currentShopWhetherOpen(shopId, eid); - if (Objects.nonNull(shopInfo) && StringUtils.isNotBlank(shopInfo.getShopCode())) { - ShopNameAndCodeDTO currentShop = new ShopNameAndCodeDTO(); - currentShop.setShopName(shopInfo.getShopName()); - currentShop.setShopCode(shopInfo.getShopCode()); - response.setCurrentShop(currentShop); - flag = true; - } - } + List list = new ArrayList<>(); - if (lineId != null) { - List shopList = shopInfoDAO.getShopListSuccessOpen(eid, lineId); - if (CollectionUtils.isNotEmpty(shopList)) { - for (MiniShopsResponse shopInfoDO : shopList) { - ShopNameAndCodeDTO dto = new ShopNameAndCodeDTO(); - dto.setShopName(shopInfoDO.getShopName()); - dto.setShopCode(shopInfoDO.getShopCode()); - list.add(dto); - } - flag = true; + List shopList = shopInfoDAO.getShopListSuccessOpen(eid, lineId); + if (CollectionUtils.isNotEmpty(shopList)) { + for (MiniShopsResponse shopInfoDO : shopList) { + ShopNameAndCodeDTO dto = new ShopNameAndCodeDTO(); + dto.setShopName(shopInfoDO.getShopName()); + dto.setShopCode(shopInfoDO.getShopCode()); + list.add(dto); + } + Map shopMap = shopList.stream().collect(Collectors.toMap(MiniShopsResponse::getShopId, Function.identity())); + //获取当前门店 + if (Objects.nonNull(shopMap.get(shopId))) { + ShopNameAndCodeDTO currentShop = new ShopNameAndCodeDTO(); + currentShop.setShopName(shopMap.get(shopId).getShopName()); + currentShop.setShopCode(shopMap.get(shopId).getShopCode()); + response.setCurrentShop(currentShop); } } List oldMobile = oldShopDAO.getByMobile(lineInfoDO.getMobile()); @@ -618,24 +614,30 @@ public class ShopServiceImpl implements ShopService { dto.setShopCode(oldShopDO.getShopCode()); list.add(dto); } - flag = true; } - response.setShopList(list); - if (flag) { - return response; - } else { + if (CollectionUtils.isEmpty(list)) { return null; } + //去重 + List distinctList = new ArrayList<>(list.stream() + .collect(Collectors.toMap( + ShopNameAndCodeDTO::getShopCode, + dto -> dto, + (existing, replacement) -> existing + )) + .values()); + response.setShopList(distinctList); + return response; } @Override public String getFranchiseBrandName(Long shopId) { ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(shopId); - if (shopInfo == null){ + if (shopInfo == null) { throw new ServiceException(ErrorCodeEnum.SHOP_NOT_EXIST); } - return FranchiseBrandEnum.getDescByCode(shopInfo.getFranchiseBrand()); + return FranchiseBrandEnum.getDescByCode(shopInfo.getFranchiseBrand()); }