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

Merge branch 'cc_20251021_join' into 'master'

Browse Source 
Cc 20251021 join

See merge request hangzhou/java/custom_zxjp!176
This commit is contained in:
苏竹红
2025-10-27 09:06:14 +00:00
parent 8b4a594d51 f301234f26
commit 5e37edfd98
7 changed files with 38 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,4 +22,11 @@ public interface EnterpriseService {
* 获取并缓存refreshToken
*/
RefreshUser getRefreshUser(String userId, String mobile);
/**
* 校验用户新建分店/新建线索 可以选择加盟类型类型
* @param userId
* @param joinMode
*/
void checkUser(String userId,Integer joinMode);
}

17
coolstore-partner-service/src/main/java/com/cool/store/service/impl/EnterpriseServiceImpl.java
View File

@@ -7,6 +7,7 @@ import com.cool.store.dao.EnterpriseUserDAO;
import com.cool.store.entity.EnterpriseUserDO;
import com.cool.store.entity.SysRoleDO;
import com.cool.store.enums.ErrorCodeEnum;
import com.cool.store.enums.JoinModeEnum;
import com.cool.store.enums.Role;
import com.cool.store.enums.UserStatusEnum;
import com.cool.store.exception.ServiceException;
@@ -126,6 +127,22 @@ public class EnterpriseServiceImpl implements EnterpriseService {
return refreshUser;
}
@Override
public void checkUser(String userId,Integer joinMode) {
EnterpriseUserDO userInfo = enterpriseUserDAO.getUserInfoById(userId);
if (userInfo !=null){
//校验当前人员是否是加盟部 581
String departments = userInfo.getDepartments();
//如果departments包含/581/ 加盟部
if (com.cool.store.utils.poi.StringUtils.isNotBlank(departments) && departments.contains("/581/")) {
//加盟部 FRANCHISE_COMPANIES
if (!JoinModeEnum.isFranchise(joinMode)){
throw new ServiceException(ErrorCodeEnum.JOIN_MODE_NOT_ALLOW_OPERATE);
}
}
}
}
public static void main(String[] args) {
try {
System.out.println(DateUtils.parseDate("2024-05-09 18:54:28",DateUtils.YYYY_MM_DD_HH_MM_SS));

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

@@ -88,6 +88,8 @@ public class LineServiceImpl implements LineService {
private RegionQrcodeConfigDao regionQrcodeConfigDao;
@Resource
QualificationsInfoDAO qualificationsInfoDAO;
@Resource
EnterpriseService enterpriseService;
@Override
@@ -514,6 +516,7 @@ public class LineServiceImpl implements LineService {
public Boolean addLine(AddLineRequest addLineRequest, LoginUserInfo userInfo) {
//必填参数
log.info("addLine:{}", JSONObject.toJSONString(addLineRequest));
enterpriseService.checkUser(userInfo.getUserId(), addLineRequest.getJoinMode());
if (!StringUtil.isNoneBlank(addLineRequest.getMobile(), addLineRequest.getUserName())) {
throw new ServiceException(ErrorCodeEnum.PARAMS_REQUIRED);
}

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

@@ -110,6 +110,8 @@ public class ShopServiceImpl implements ShopService {
DecorationDesignInfoDAO decorationDesignInfoDAO;
@Resource
StoreService storeService;
@Resource
EnterpriseService enterpriseService;
@Override
@@ -330,6 +332,7 @@ public class ShopServiceImpl implements ShopService {
if (StringUtils.isBlank(request.getInvestmentManagerUserId())) {
request.setInvestmentManagerUserId(userId);
}
enterpriseService.checkUser(userId, request.getJoinMode());
LineInfoDO lineInfo = lineInfoDAO.getLineInfo(request.getLineId());
if (lineInfo.getWorkflowSubStageStatus() < WorkflowSubStageStatusEnum.PAY_DEPOSIT_45.getCode()) {
throw new ServiceException(ErrorCodeEnum.LINE_STATUS_NOT_ALLOW_OPERATE);