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

Merge remote-tracking branch 'origin/cc_partner_init' into cc_partner_init

Browse Source
This commit is contained in:
zhangchenbiao
2024-05-27 10:22:45 +08:00
parent 5204f57ee4 6935302aa1
commit ee98b87399
3 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java
View File

@@ -63,7 +63,7 @@ public class JoinIntentionServiceImpl extends LineFlowService implements JoinInt
throw new ServiceException(ErrorCodeEnum.PARAMS_REQUIRED);
}
LineInfoDO lineInfoDO = lineInfoMapper.getByLineId(request.getLineId());
if (!Objects.isNull(lineInfoDO)&&!WorkflowSubStageStatusEnum.INTENT_0.getCode().equals(lineInfoDO.getWorkflowSubStageStatus())) {
if (!Objects.isNull(lineInfoDO) && WorkflowSubStageStatusEnum.INTENT_5.getCode().equals(lineInfoDO.getWorkflowSubStageStatus())) {
throw new ServiceException(ErrorCodeEnum.INTENT_PASS);
}
//更改线索流程子状态为【待审核】
@@ -87,14 +87,14 @@ public class JoinIntentionServiceImpl extends LineFlowService implements JoinInt
joinIntentionMapper.insertOrUpdate(memberQuestionDO);
Map<String, String> requestMap = new HashMap<>();
requestMap.put("partnerUsername",lineInfoParam.getUsername());
requestMap.put("partnerMobile",lineInfoParam.getMobile());
requestMap.put("lineId",String.valueOf(lineInfoParam.getId()));
requestMap.put("partnerUsername", lineInfoParam.getUsername());
requestMap.put("partnerMobile", lineInfoParam.getMobile());
requestMap.put("lineId", String.valueOf(lineInfoParam.getId()));
HyOpenAreaInfoDO openAreaInfoDO = openAreaInfoMapper.selectById(lineInfoParam.getWantShopAreaId());
requestMap.put("regionName",openAreaInfoDO.getAreaName());
requestMap.put("regionName", openAreaInfoDO.getAreaName());
commonService.sendMessage(Collections.singletonList(lineInfoParam.getInvestmentManager()),
MessageEnum.MESSAGE_29,
requestMap);
MessageEnum.MESSAGE_29,
requestMap);
return Boolean.TRUE;
}
@@ -106,7 +106,7 @@ public class JoinIntentionServiceImpl extends LineFlowService implements JoinInt
lineInfoDAO.updateWorkflowStage(lineInfo.getId(), nextStage, nextStage.getInitStatus(), userId);
//更新加盟问卷信息
joinIntentionMapper.updateAuditIdByLineId(auditId, lineInfo.getId());
commonService.sendSms(lineInfo.getMobile(),SMSMsgEnum.INTERVIEW_APPOINTMENT_SUCCESS);
commonService.sendSms(lineInfo.getMobile(), SMSMsgEnum.INTERVIEW_APPOINTMENT_SUCCESS);
return Boolean.TRUE;
}

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

@@ -229,7 +229,7 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
.ht_day(timeUtils(request.getContractStartTime(),"day"))
.ht_day2(timeUtils(request.getContractStartEndTime(),"day"))
.ht_month1(timeUtils(request.getContractStartTime(),"month"))
.ht_month2(timeUtils(request.getContractStartEndTime(),",month"))
.ht_month2(timeUtils(request.getContractStartEndTime(),"month"))
.ht_year1(timeUtils(request.getContractStartTime(),"year"))
.ht_year2(timeUtils(request.getContractStartEndTime(),"year"))
.idcard_1(Collections.singletonList(signingBaseInfoDO.getIdCardFront()))

15
coolstore-partner-web/src/main/java/com/cool/store/controller/webb/SysRoleController.java
View File

@@ -1,10 +1,12 @@
package com.cool.store.controller.webb;
import com.cool.store.entity.EnterpriseUserDO;
import com.cool.store.enums.UserRoleEnum;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.SysRoleService;
import com.google.common.collect.Lists;
import com.cool.store.service.UserAuthMappingService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -12,6 +14,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
@@ -24,6 +27,9 @@ public class SysRoleController {
@Autowired
private SysRoleService sysRoleService;
@Resource
private UserAuthMappingService userAuthMappingService;
@GetMapping(path = "/getXfsgRoles")
public ResponseResult<Map<String, Long>> getXfsgRoles() {
return ResponseResult.success(sysRoleService.getXfsgRoles());
@@ -34,4 +40,11 @@ public class SysRoleController {
List<UserRoleEnum> roleList = Arrays.asList(UserRoleEnum.THEATER_MANAGER, UserRoleEnum.OPERATIONS_MANAGER, UserRoleEnum.REGION_MANAGER);
return ResponseResult.success(sysRoleService.getUserIdByRegionIdWithRolePriority(regionId, roleList));
}
@GetMapping(path = "/getUserByRoleEnumAndRegionId")
@ApiOperation("获取有区域权限和职位")
public ResponseResult<EnterpriseUserDO> getUserByRoleEnumAndRegionId(@RequestParam("regionId") Long regionId, @RequestParam("roleName") String roleName) {
UserRoleEnum userRoleEnum = UserRoleEnum.getByDesc(roleName);
return ResponseResult.success(userAuthMappingService.getUserByRoleEnumAndRegionId(userRoleEnum, regionId));
}
}