From 0df3a200159fa5e97e6461ce1b991cc4ba855bf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Tue, 14 Jan 2025 15:54:54 +0800 Subject: [PATCH] feat:V2.4 --- .../store/service/TransferLogService.java | 6 +++--- .../store/service/impl/LineServiceImpl.java | 2 +- .../store/service/impl/ShopServiceImpl.java | 7 +++++-- .../service/impl/TransferLogServiceImpl.java | 19 +++---------------- .../store/controller/webc/TestController.java | 4 ++-- 5 files changed, 14 insertions(+), 24 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/TransferLogService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/TransferLogService.java index 5bcaf84b7..49180985b 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/TransferLogService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/TransferLogService.java @@ -15,14 +15,14 @@ public interface TransferLogService { /** * 添加日志 操作日志类型 - * @param lineInfoDO + * @param id 线索ID 或者 门店ID 如果是线索ID 则表示线索转让记录 如果是门店ID 则表示门店转移记录 + * @param partnerId * @param formUserId * @param toUserId * @param operationLogTypeEnum */ - void addLog(LineInfoDO lineInfoDO, String formUserId, String toUserId, OperationLogTypeEnum operationLogTypeEnum); + void addLog(Long id ,String partnerId, String formUserId, String toUserId, OperationLogTypeEnum operationLogTypeEnum); - void addLog(ShopInfoDO shopInfoDO, String formUserId, String toUserId, OperationLogTypeEnum operationLogTypeEnum); PageInfo getTransferLogPage(Integer pageNum, Integer pageSize, Long lineId,Integer lineShopType); } 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 a2d3a2d40..7c1a95377 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 @@ -331,7 +331,7 @@ public class LineServiceImpl implements LineService { if (lineInfo.getJoinStatus()!=0){ operationLogTypeEnum = OperationLogTypeEnum.TRANSFER_INVESTMENT_MANAGER_3; } - transferLogService.addLog(lineInfo,userInfo.getUserId(),changeInvestmentRequest.getInvestmentManagerId(),operationLogTypeEnum); + transferLogService.addLog(lineInfo.getId(),lineInfo.getPartnerId(),userInfo.getUserId(),changeInvestmentRequest.getInvestmentManagerId(),operationLogTypeEnum); } return Boolean.TRUE; } 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 3df3e8641..db7fdadae 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 @@ -318,7 +318,7 @@ public class ShopServiceImpl implements ShopService { if (updateUserId.equals(shopInfo.getInvestmentManager())) { throw new ServiceException(UPDATE_INVESTMENT_MANAGER_FAIL); } - transferLogService.addLog(shopInfo, shopInfo.getInvestmentManager(), updateUserId, OperationLogTypeEnum.TRANSFER_INVESTMENT_MANAGER_4); + transferLogService.addLog(shopInfo.getId(), shopInfo.getPartnerId(), shopInfo.getInvestmentManager(), updateUserId, OperationLogTypeEnum.TRANSFER_INVESTMENT_MANAGER_4); shopInfo.setUpdateTime(new Date()); shopInfo.setUpdateUserId(userId); shopInfo.setInvestmentManager(updateUserId); @@ -429,6 +429,9 @@ public class ShopServiceImpl implements ShopService { Map shopStatus = preparationService.getShopStatus(shopIds); for (ShopInfoDO shopInfoDO : shopInfoDOS) { LineInfoDO lineInfoDO = lineMap.get(shopInfoDO.getLineId()); + if (lineInfoDO == null){ + continue; + } shopInfoDO.setDevelopmentManager(lineInfoDO.getDevelopmentManager()); shopInfoDO.setShopStatus(shopStatus.get(shopInfoDO.getId())); shopInfoDO.setJoinMode(lineInfoDO.getJoinMode()); @@ -436,7 +439,7 @@ public class ShopServiceImpl implements ShopService { shopInfoDO.setInvestmentManager(lineInfoDO.getInvestmentManager()); shopInfoDO.setWantShopAreaId(lineInfoDO.getWantShopAreaId()); } - //shopInfoDAO.batchUpdate(shopInfoDOS); + shopInfoDAO.batchUpdate(shopInfoDOS); log.info("------shopInfoDOS:{}------", JSONObject.toJSONString(shopInfoDOS)); hasNext = shopInfoDOS.size() >= pageSize; pageNum++; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TransferLogServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TransferLogServiceImpl.java index ecf587db1..c1d4059e2 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TransferLogServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TransferLogServiceImpl.java @@ -26,10 +26,10 @@ public class TransferLogServiceImpl implements TransferLogService { private TransferLogDAO transferLogDAO; @Override - public void addLog(LineInfoDO lineInfoDO, String formUserId, String toUserId, OperationLogTypeEnum operationLogTypeEnum) { + public void addLog(Long id ,String partnerId, String formUserId, String toUserId, OperationLogTypeEnum operationLogTypeEnum) { TransferLogDO transferLogDO = new TransferLogDO(); - transferLogDO.setLineId(lineInfoDO.getId()); - transferLogDO.setPartnerId(lineInfoDO.getPartnerId()); + transferLogDO.setLineId(id); + transferLogDO.setPartnerId(partnerId); transferLogDO.setFromUserId(formUserId); transferLogDO.setToUserId(toUserId); transferLogDO.setType(operationLogTypeEnum.getCode()); @@ -39,19 +39,6 @@ public class TransferLogServiceImpl implements TransferLogService { transferLogDAO.add(transferLogDO); } - @Override - public void addLog(ShopInfoDO shopInfoDO, String formUserId, String toUserId, OperationLogTypeEnum operationLogTypeEnum) { - TransferLogDO transferLogDO = new TransferLogDO(); - transferLogDO.setLineId(shopInfoDO.getId()); - transferLogDO.setPartnerId(shopInfoDO.getPartnerId()); - transferLogDO.setFromUserId(formUserId); - transferLogDO.setToUserId(toUserId); - transferLogDO.setType(operationLogTypeEnum.getCode()); - transferLogDO.setCreateUserId("create"); - transferLogDO.setUpdateUserId("update"); - // 添加操作日志 - transferLogDAO.add(transferLogDO); - } @Override public PageInfo getTransferLogPage(Integer pageNum, Integer pageSize, Long lineId,Integer lineShopType) { diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/TestController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/TestController.java index ea3bcc3f9..a0be0d8f8 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/TestController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/TestController.java @@ -262,12 +262,12 @@ public class TestController { @Resource ShopService shopService; @GetMapping("/linePointToShopPoint") - public ResponseResult linePointToShopPoint(@RequestParam("shopId")Long shopId){ + public ResponseResult linePointToShopPoint(@RequestParam(value = "shopId",required = false)Long shopId){ return ResponseResult.success(pointService.linePointToShopPoint(shopId)); } @GetMapping("/dataHandler") - public ResponseResult dataHandler(@RequestParam("lineId")Long lineId){ + public ResponseResult dataHandler(@RequestParam(value = "lineId",required = false)Long lineId){ return ResponseResult.success(shopService.dataHandler(lineId)); }