suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat:V2.4

Browse Source
This commit is contained in:
苏竹红
2025-01-14 15:54:54 +08:00
parent 85aeaa4243
commit 0df3a20015
5 changed files with 14 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
coolstore-partner-service/src/main/java/com/cool/store/service/TransferLogService.java
View File

@@ -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<TransferLogDTO> getTransferLogPage(Integer pageNum, Integer pageSize, Long lineId,Integer lineShopType);
}

2
coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java
View File

@@ -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;
}

7
coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java
View File

@@ -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<Long, Integer> 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++;

19
coolstore-partner-service/src/main/java/com/cool/store/service/impl/TransferLogServiceImpl.java
View File

@@ -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<TransferLogDTO> getTransferLogPage(Integer pageNum, Integer pageSize, Long lineId,Integer lineShopType) {

4
coolstore-partner-web/src/main/java/com/cool/store/controller/webc/TestController.java
View File

@@ -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));
}