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

Merge remote-tracking branch 'origin/dev/feat/partner1.1_20230727' into dev/feat/partner1.1_20230727

Browse Source
This commit is contained in:
feng.li
2023-07-25 17:44:26 +08:00
parent 58d443797f f51d844ba1
commit 4d8c04b14b
11 changed files with 41 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
coolstore-partner-dao/src/main/java/com/cool/store/dao/SysRoleMenuDAO.java
View File

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

2
coolstore-partner-dao/src/main/resources/mapper/SysRoleMapper.xml
View File

@@ -152,6 +152,6 @@
from
sys_role
where
role_id = #{roleId} deleted = 0
role_id = #{roleId} and deleted = 0
</select>
</mapper>

3
coolstore-partner-model/src/main/java/com/cool/store/dto/menu/AddMenuDTO.java
View File

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

2
coolstore-partner-model/src/main/java/com/cool/store/vo/role/RolePageVO.java
View File

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

4
coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerLineInfoService.java
View File

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

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

@@ -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());
@@ -217,10 +217,11 @@ 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());
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");
@@ -233,7 +234,6 @@ public class HyPartnerIntentInfoServiceImpl implements HyPartnerIntentInfoServic
noticeService.sendFeiShuNotice(FeiShuNoticeMsgEnum.ALLOCATION_INVESTMENT_MANAGER,userIdList,DateUtil.formatDateTime(new Date()),hyPartnerUserInfoDO.getUsername(),hyPartnerUserInfoDO.getMobile());
}
}
}
if(!isUpdateIntentInfo){
if(CollectionUtils.isEmpty(userIdList)){
userIdList.add(hyPartnerLineInfoDO.getInvestmentManager());

13
coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java
View File

@@ -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<HyPartnerLineInfoDO> 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());

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

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

2
coolstore-partner-webb/src/main/java/com/cool/store/config/swagger/Swagger2Config.java
View File

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

2
coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java
View File

@@ -294,7 +294,7 @@ public class DeskController {
public ResponseResult<Boolean> 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));
}

9
coolstore-partner-webb/src/main/java/com/cool/store/controller/MenuController.java
View File

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