From ffab746b52122d0f75c43eff856c06764a8a66db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Tue, 25 Jul 2023 16:53:29 +0800 Subject: [PATCH 1/3] 38318 --- .../impl/HyPartnerIntentInfoServiceImpl.java | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java index 90c289660..90dbec20a 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java @@ -217,21 +217,21 @@ public class HyPartnerIntentInfoServiceImpl implements HyPartnerIntentInfoServic hyPartnerUserInfoDO.setWantShopArea(request.getWantShopArea()); hyPartnerUserInfoDO.setAcceptAdjustType(request.getAcceptAdjustType()); hyPartnerUserInfoDAO.updateByPrimaryKeySelective(hyPartnerUserInfoDO); - // 更新线索状态和招商经理 - //是公海线索 才会修改线索状态与招商经理 - if (LineStatusEnum.PUBLIC_SEAS.getCode().equals(hyPartnerLineInfoDO.getLineStatus())){ - Boolean flag = hyPartnerLineInfoService.assignFollowUser(request.getPartnerId(), request.getWantShopArea(), request.getAcceptAdjustType()); - hyPartnerLineInfoDO.setLineStatus(flag ? LineStatusEnum.PRIVATE_SEAS.getCode() : LineStatusEnum.PUBLIC_SEAS.getCode()); - if (flag){ - String investmentManager = hyPartnerLineInfoService.getAssignFollowUser(request.getPartnerId(), "intent"); - hyPartnerLineInfoDO.setInvestmentManager(investmentManager); - userIdList.add(investmentManager); - } - hyPartnerLineInfoDAO.updateByPrimaryKeySelective(hyPartnerLineInfoDO); + } + // 更新线索状态和招商经理 + //是公海线索 才会修改线索状态与招商经理 + if (LineStatusEnum.PUBLIC_SEAS.getCode().equals(hyPartnerLineInfoDO.getLineStatus())){ + Boolean flag = hyPartnerLineInfoService.assignFollowUser(request.getPartnerId(), request.getWantShopArea(), request.getAcceptAdjustType()); + hyPartnerLineInfoDO.setLineStatus(flag ? LineStatusEnum.PRIVATE_SEAS.getCode() : LineStatusEnum.PUBLIC_SEAS.getCode()); + if (flag){ + String investmentManager = hyPartnerLineInfoService.getAssignFollowUser(request.getPartnerId(), "intent"); + hyPartnerLineInfoDO.setInvestmentManager(investmentManager); + userIdList.add(investmentManager); + } + hyPartnerLineInfoDAO.updateByPrimaryKeySelective(hyPartnerLineInfoDO); - if(flag){//分配招商经理成功才发送分配招商经理的飞书工作通知 - noticeService.sendFeiShuNotice(FeiShuNoticeMsgEnum.ALLOCATION_INVESTMENT_MANAGER,userIdList,DateUtil.formatDateTime(new Date()),hyPartnerUserInfoDO.getUsername(),hyPartnerUserInfoDO.getMobile()); - } + if(flag){//分配招商经理成功才发送分配招商经理的飞书工作通知 + noticeService.sendFeiShuNotice(FeiShuNoticeMsgEnum.ALLOCATION_INVESTMENT_MANAGER,userIdList,DateUtil.formatDateTime(new Date()),hyPartnerUserInfoDO.getUsername(),hyPartnerUserInfoDO.getMobile()); } } if(!isUpdateIntentInfo){ From 01a2fb597c49d76dc0511c9eab6f91ece136daf8 Mon Sep 17 00:00:00 2001 From: zhangchenbiao Date: Tue, 25 Jul 2023 16:58:02 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=A7=92=E8=89=B2?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E4=B8=B4=E6=97=B6=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/cool/store/dao/SysRoleMenuDAO.java | 1 + .../src/main/resources/mapper/SysRoleMapper.xml | 2 +- .../main/java/com/cool/store/dto/menu/AddMenuDTO.java | 3 +-- .../src/main/java/com/cool/store/vo/role/RolePageVO.java | 2 +- .../com/cool/store/config/swagger/Swagger2Config.java | 2 +- .../java/com/cool/store/controller/MenuController.java | 9 +++++++++ 6 files changed, 14 insertions(+), 5 deletions(-) diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/SysRoleMenuDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/SysRoleMenuDAO.java index 84d33a0b4..aa053af5a 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/SysRoleMenuDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/SysRoleMenuDAO.java @@ -43,6 +43,7 @@ public class SysRoleMenuDAO { SysRoleMenuDO insert = new SysRoleMenuDO(); insert.setMenuId(menuId); insert.setRoleId(roleId); + insert.setPlatform(PlatFormTypeEnum.PC.getCode()); insertList.add(insert); } return sysRoleMenuMapper.batchInsert(insertList); diff --git a/coolstore-partner-dao/src/main/resources/mapper/SysRoleMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/SysRoleMapper.xml index 78487b147..27ddf12c0 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/SysRoleMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/SysRoleMapper.xml @@ -152,6 +152,6 @@ from sys_role where - role_id = #{roleId} deleted = 0 + role_id = #{roleId} and deleted = 0 \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/menu/AddMenuDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/menu/AddMenuDTO.java index 64a47bd55..b682b164f 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/menu/AddMenuDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/menu/AddMenuDTO.java @@ -34,7 +34,6 @@ public class AddMenuDTO { private String env; public static SysMenuDO convertDO(AddMenuDTO param, MenuTypeEnum menuTypeEnum){ - SysMenuDO menu = new SysMenuDO(); SysMenuDO sysMenuDO = new SysMenuDO(); sysMenuDO.setParentId(param.getParentId()); sysMenuDO.setName(param.getName()); @@ -48,7 +47,7 @@ public class AddMenuDTO { sysMenuDO.setTarget(param.getTarget()); sysMenuDO.setIcon(param.getIcon()); sysMenuDO.setMenuType(menuTypeEnum.getCode()); - return menu; + return sysMenuDO; } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/role/RolePageVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/role/RolePageVO.java index d59e3f8c4..290b92750 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/role/RolePageVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/role/RolePageVO.java @@ -29,7 +29,7 @@ public class RolePageVO { for (SysRoleDO sysRole : roleList) { RolePageVO role = new RolePageVO(); role.setRoleId(sysRole.getRoleId()); - role.setRoleName(role.getRoleName()); + role.setRoleName(sysRole.getRoleName()); resultList.add(role); } return resultList; diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/config/swagger/Swagger2Config.java b/coolstore-partner-webb/src/main/java/com/cool/store/config/swagger/Swagger2Config.java index 7c1c35efc..3fd37a621 100644 --- a/coolstore-partner-webb/src/main/java/com/cool/store/config/swagger/Swagger2Config.java +++ b/coolstore-partner-webb/src/main/java/com/cool/store/config/swagger/Swagger2Config.java @@ -52,7 +52,7 @@ public class Swagger2Config { .groupName(groupName) .select() .apis(this.scanBasePackage(packages)) - //.paths(PathSelectors.regex(".*/inspection/setting/.*|.*getRegionUserAndSubRegion")) + .paths(PathSelectors.regex(".*/menu/getAllMenus|.*/menu/add|.*/menu/auth/add|.*/role.*")) .build() .globalOperationParameters(pars); } diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/MenuController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/MenuController.java index d510d5e5d..bef7d0854 100644 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/MenuController.java +++ b/coolstore-partner-webb/src/main/java/com/cool/store/controller/MenuController.java @@ -5,6 +5,9 @@ import com.cool.store.dto.menu.AddMenuDTO; import com.cool.store.enums.MenuTypeEnum; import com.cool.store.response.ResponseResult; import com.cool.store.service.MenuService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -19,26 +22,32 @@ import javax.annotation.Resource; * @date 2023-06-08 16:58 */ @RestController +@Slf4j +@Api(tags = "菜单") public class MenuController { @Resource private MenuService menuService; + @ApiOperation("获取用户权限菜单") @GetMapping("/menu/getUserMenus") public ResponseResult getUserMenus(){ return ResponseResult.success(menuService.getUserMenus(CurrentUserHolder.getUserId(), CurrentUserHolder.getRoleId())); } + @ApiOperation("获取所有菜单") @GetMapping("/menu/getAllMenus") public ResponseResult getAllMenus(){ return ResponseResult.success(menuService.getAllMenus()); } + @ApiOperation("新增菜单") @PostMapping(path = "/menu/add") public ResponseResult addMenu(@RequestBody AddMenuDTO param){ return ResponseResult.success(menuService.addMenu(param, MenuTypeEnum.MENU)); } + @ApiOperation("新增权限") @PostMapping(path = "/menu/auth/add") public ResponseResult addMenuAuth(@RequestBody AddMenuDTO param){ return ResponseResult.success(menuService.addMenu(param, MenuTypeEnum.AUTH)); From f51d844ba117354585e89e2fc3efd1fb63c860af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Tue, 25 Jul 2023 17:38:06 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=86=B7=E9=9D=99=E6=9C=9F=E7=BB=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/service/HyPartnerLineInfoService.java | 4 ++-- .../impl/HyPartnerIntentInfoServiceImpl.java | 4 ++-- .../service/impl/HyPartnerLineInfoServiceImpl.java | 13 ++++++++----- .../service/impl/PartnerUserInfoServiceImpl.java | 2 +- .../com/cool/store/controller/DeskController.java | 2 +- 5 files changed, 14 insertions(+), 11 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerLineInfoService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerLineInfoService.java index ff26d13a7..13f82e519 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerLineInfoService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerLineInfoService.java @@ -133,7 +133,7 @@ public interface HyPartnerLineInfoService { * @param lineId * @return */ - Boolean assignFollowUser(String partnerId, String wantShopArea, Integer acceptAdjustType); + Boolean assignFollowUser(String partnerId, String wantShopArea, Integer acceptAdjustType,Boolean flag ); /** * 线索状态 @@ -159,7 +159,7 @@ public interface HyPartnerLineInfoService { * @param acceptAdjustType * @return */ - HyPartnerLineInfoDO generateDefaultLineInfo(String partnerId, String wantShopArea, Integer acceptAdjustType); + HyPartnerLineInfoDO generateDefaultLineInfo(String partnerId, String wantShopArea, Integer acceptAdjustType,Boolean assignFlag); Long checkGenerateNewLineId(Long lineId); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java index 90dbec20a..aaa31408f 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java @@ -125,7 +125,7 @@ public class HyPartnerIntentInfoServiceImpl implements HyPartnerIntentInfoServic hyPartnerBaseInfoDAO.updateByPartnerId(baseUserInfoRequest.getUsername(),baseUserInfoRequest.getMobile(),baseUserInfoRequest.getPartnerId()); // 更新线索状态 - HyPartnerLineInfoDO hyPartnerLineInfoDO = hyPartnerLineInfoService.generateDefaultLineInfo(hyPartnerUserInfoDO.getPartnerId(), baseUserInfoRequest.getWantShopArea(), baseUserInfoRequest.getAcceptAdjustType()); + HyPartnerLineInfoDO hyPartnerLineInfoDO = hyPartnerLineInfoService.generateDefaultLineInfo(hyPartnerUserInfoDO.getPartnerId(), baseUserInfoRequest.getWantShopArea(), baseUserInfoRequest.getAcceptAdjustType(),Boolean.TRUE); //更新意向申请表中信息 HyPartnerIntentInfoDO hyPartnerIntentInfoDO = hyPartnerIntentInfoDAO.selectByLineId(hyPartnerLineInfoDO.getId()); @@ -221,7 +221,7 @@ public class HyPartnerIntentInfoServiceImpl implements HyPartnerIntentInfoServic // 更新线索状态和招商经理 //是公海线索 才会修改线索状态与招商经理 if (LineStatusEnum.PUBLIC_SEAS.getCode().equals(hyPartnerLineInfoDO.getLineStatus())){ - Boolean flag = hyPartnerLineInfoService.assignFollowUser(request.getPartnerId(), request.getWantShopArea(), request.getAcceptAdjustType()); + Boolean flag = hyPartnerLineInfoService.assignFollowUser(request.getPartnerId(), request.getWantShopArea(), request.getAcceptAdjustType(),Boolean.TRUE); hyPartnerLineInfoDO.setLineStatus(flag ? LineStatusEnum.PRIVATE_SEAS.getCode() : LineStatusEnum.PUBLIC_SEAS.getCode()); if (flag){ String investmentManager = hyPartnerLineInfoService.getAssignFollowUser(request.getPartnerId(), "intent"); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java index 4db2c9c34..3232ca86b 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java @@ -568,9 +568,12 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { } @Override - public Boolean assignFollowUser(String partnerId, String wantShopArea, Integer acceptAdjustType) { + public Boolean assignFollowUser(String partnerId, String wantShopArea, Integer acceptAdjustType,Boolean flag) { log.info("assignFollowUser partnerId:{}，wantShopArea：{}，acceptAdjustType：{}",partnerId,wantShopArea,acceptAdjustType); + if (!flag){ + return Boolean.FALSE; + } List lineFollowHistoryList = hyPartnerLineInfoDAO.getLineFollowHistoryList(partnerId); //如果跟进次数大于1 直接使用上一次的招商经理 if (CollectionUtils.isNotEmpty(lineFollowHistoryList)){ @@ -710,10 +713,10 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { return null; } @Override - public HyPartnerLineInfoDO generateDefaultLineInfo(String partnerId, String wantShopArea, Integer acceptAdjustType) { + public HyPartnerLineInfoDO generateDefaultLineInfo(String partnerId, String wantShopArea, Integer acceptAdjustType,Boolean assignFlag) { // 生成一条线索 HyPartnerLineInfoDO hyPartnerLineInfoDO = hyPartnerLineInfoDAO.getByPartnerId(partnerId); - Boolean flag = this.assignFollowUser(partnerId, wantShopArea, acceptAdjustType); + Boolean flag = this.assignFollowUser(partnerId, wantShopArea, acceptAdjustType,assignFlag); String investmentManager = null; if (flag){ investmentManager = getAssignFollowUser(partnerId, "intent"); @@ -752,8 +755,8 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { //将老的线索置为删除状态 hyPartnerLineInfoDAO.batchDeleted(Collections.singletonList(hyPartnerLineInfoDO.getId())); HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByPartnerId(hyPartnerLineInfoDO.getPartnerId()); - // 生成一条新线索 - HyPartnerLineInfoDO newLineInfoDO = this.generateDefaultLineInfo(hyPartnerLineInfoDO.getPartnerId(), hyPartnerUserInfoDO.getWantShopArea(), hyPartnerUserInfoDO.getAcceptAdjustType()); + // 生成一条新线索 生成新线索的时候不需要公海到私海 + HyPartnerLineInfoDO newLineInfoDO = this.generateDefaultLineInfo(hyPartnerLineInfoDO.getPartnerId(), hyPartnerUserInfoDO.getWantShopArea(), hyPartnerUserInfoDO.getAcceptAdjustType(),Boolean.FALSE); // 生成一条意向基本信息 HyPartnerBaseInfoDO oldBaseInfoDO = hyPartnerBaseInfoDAO.getByPartnerIdAndLineId(hyPartnerUserInfoDO.getPartnerId(), lineId); hyPartnerBaseInfoService.generateBaseInfo(hyPartnerUserInfoDO, newLineInfoDO.getId(), oldBaseInfoDO.getUserPortrait()); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerUserInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerUserInfoServiceImpl.java index 2dd6652fe..23eb1dea2 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerUserInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerUserInfoServiceImpl.java @@ -108,7 +108,7 @@ public class PartnerUserInfoServiceImpl implements PartnerUserInfoService { fillUserInfoDOByRequest(hyPartnerUserInfoDO, partnerUserInfoRequest); hyPartnerUserInfoDAO.updateByPrimaryKeySelective(hyPartnerUserInfoDO); // 生成一条线索 - HyPartnerLineInfoDO hyPartnerLineInfoDO = hyPartnerLineInfoService.generateDefaultLineInfo(hyPartnerUserInfoDO.getPartnerId(), partnerUserInfoRequest.getWantShopArea(), partnerUserInfoRequest.getAcceptAdjustType()); + HyPartnerLineInfoDO hyPartnerLineInfoDO = hyPartnerLineInfoService.generateDefaultLineInfo(hyPartnerUserInfoDO.getPartnerId(), partnerUserInfoRequest.getWantShopArea(), partnerUserInfoRequest.getAcceptAdjustType(),Boolean.TRUE); // 生成一条意向基本信息 hyPartnerBaseInfoService.generateBaseInfo(hyPartnerUserInfoDO, hyPartnerLineInfoDO.getId(), null); HyOpenAreaInfoDO hyOpenAreaInfoDO = hyOpenAreaInfoDAO.selectById(Long.valueOf(partnerUserInfoRequest.getWantShopArea())); diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java index bf4ab11c4..0ee748b7e 100644 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java +++ b/coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java @@ -294,7 +294,7 @@ public class DeskController { public ResponseResult getFollowHistory(@RequestParam(value = "partnerId",required = false)String partnerId, @RequestParam(value = "wantShopArea",required = false)String wantShopArea, @RequestParam(value = "acceptAdjustType",required = false)Integer acceptAdjustType){ - return ResponseResult.success(hyPartnerLineInfoService.assignFollowUser(partnerId,wantShopArea,acceptAdjustType)); + return ResponseResult.success(hyPartnerLineInfoService.assignFollowUser(partnerId,wantShopArea,acceptAdjustType,Boolean.TRUE)); }