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-04-30 14:05:46 +08:00
parent c24b22b081 2b38f5f353
commit 14bfb66913
14 changed files with 64 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
coolstore-partner-dao/src/main/java/com/cool/store/mapper/ApplyLicenseMapper.java
View File

@@ -11,4 +11,7 @@ import java.util.List;
public interface ApplyLicenseMapper extends Mapper<LicenseTransactDO> {
List<LicenseListResponse> licenseList(@Param("request") LicenseListRequest request);
void updateByShopId(@Param("entity") LicenseTransactDO licenseTransactDO);
}

5
coolstore-partner-dao/src/main/resources/mapper/ApplyLicenseMapper.xml
View File

@@ -1,6 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.cool.store.mapper.ApplyLicenseMapper">
<update id="updateByShopId">
update xfsg_license_transact
set submit_status = #{entity.submitStatus}
where shop_id = #{entity.shopId}
</update>
<select id="licenseList" resultType="com.cool.store.response.LicenseListResponse">

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

@@ -435,7 +435,7 @@
<select id="publicLineList" resultMap="BaseResultMap">
select * from xfsg_line_info
where deleted = 0 and line_status = 0 and join_status = 0
where deleted = 0 and line_status = 0
<if test="publicFlag">
and investment_manager is not null
</if>

4
coolstore-partner-model/src/main/java/com/cool/store/response/SysStoreAppResponse.java
View File

@@ -103,9 +103,11 @@ public class SysStoreAppResponse {
@ApiModelProperty("大区code")
private String bigCode;
@ApiModelProperty("战区id")
private Long fightId;
@ApiModelProperty("战区描述")
private String fightDesc;
@ApiModelProperty("战区描述")
@ApiModelProperty("战区code")
private String fightCode;
@ApiModelProperty("战区名称")
private String fightName;

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

@@ -1,5 +1,6 @@
package com.cool.store.service;
import com.cool.store.dto.ehr.StaffBaseInfoDTO;
import com.cool.store.request.TempUserDetailRequest;
import com.cool.store.vo.TempUserDetailInfoVO;
import com.cool.store.vo.TempUserDetailListVO;
@@ -19,4 +20,6 @@ public interface TempUserDetailService {
TempUserDetailInfoVO getUserInfoByIdUserDetailId(Long id);
StaffBaseInfoDTO getUserInfoByIdCard(String idCard);
}

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

@@ -21,8 +21,6 @@ public interface XfsgEhrService {
*/
FranchiseeInfoDTO getFranchiseeInfoByFrId(String frId);
StaffBaseInfoDTO getUserInfoByIdCard(String idCard);
}

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

@@ -162,12 +162,12 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService {
shopAuditInfoDO.setPassReason(result);
shopSubStageStatusEnum = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_43;
licenseTransactDO.setSubmitStatus(3);
applyLicenseMapper.updateByPrimaryKeySelective(licenseTransactDO);
}else if (status == Constants.ONE_INTEGER){
licenseTransactDO.setSubmitStatus(2);
shopAuditInfoDO.setRejectReason(result);
shopSubStageStatusEnum = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_42;
}
applyLicenseMapper.updateByShopId(licenseTransactDO);
//插入操作/意见
shopAuditInfoMapper.insertSelective(shopAuditInfoDO);
//更新阶段状态

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

@@ -23,6 +23,7 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -75,6 +76,7 @@ public class AuditStatusServiceImpl implements AuditStatusService {
auditStatusDO.setAuditUserId(Long.valueOf(user.getUserId()));
auditStatusDO.setAuditUserName(user.getName());
auditStatusDO.setAuditStatus(request.getCheckStatus());
auditStatusDO.setUpdateTime(DateUtils.getNowDate());
auditStatusMapper.updateByPrimaryKeySelective(auditStatusDO);
return true;
}

25
coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysStoreAppServiceImpl.java
View File

@@ -97,7 +97,10 @@ public class SysStoreAppServiceImpl implements SysStoreAppService,AuditResultSer
PointInfoDO pointInfoDO = pointInfoMapper.getDataByShopIdAndLineId(request.getLineId(), request.getShopId());//查铺位信息确定铺位所在大区、战区、门店所在省市区街道地址
//3.请求鲜丰接口
NewStoreRequest apiRequest = convertToNewStoreRequest(request,lineInfoDO,pointInfoDO);
return coolStoreStartFlowService.newStore(apiRequest,request.getShopId());
//todo 暂时去掉
// return coolStoreStartFlowService.newStore(apiRequest,request.getShopId());
shopStageInfoDAO.updateShopStageAndAuditInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_31,null);
return ResponseResult.success();
}
@Override
@@ -145,12 +148,19 @@ public class SysStoreAppServiceImpl implements SysStoreAppService,AuditResultSer
Long regionId = pointInfoDO.getRegionId();
RegionDO bigRegion = regionMapper.getBigRegionByRegionId(regionId);//大区
RegionDO fightRegion = regionMapper.getByRegionId(regionId);//战区
EnterpriseUserDO enterpriseUserDO = userAuthMappingService.getUserByRoleEnumAndRegionId(UserRoleEnum.REGION_MANAGER, bigRegion.getId());
if (Objects.nonNull(enterpriseUserDO)){
EnterpriseUserDO regionManager = userAuthMappingService.getUserByRoleEnumAndRegionId(UserRoleEnum.REGION_MANAGER, bigRegion.getId());
EnterpriseUserDO supervisor = userAuthMappingService.getUserByRoleEnumAndRegionId(UserRoleEnum.SUPERVISION, fightRegion.getId());
if (Objects.nonNull(regionManager)){
// regioGeneral
supervisorDetail.setRegioGeneral(regionManager.getName());
// regioGeneralId
supervisorDetail.setRegioGeneralId(regionManager.getUserId());
}
if (Objects.nonNull(supervisor)){
// supervisorName
supervisorDetail.setSupervisorName(enterpriseUserDO.getName());
supervisorDetail.setSupervisorName(supervisor.getName());
// supervisorId
supervisorDetail.setSupervisorId(enterpriseUserDO.getUserId());
supervisorDetail.setSupervisorId(supervisor.getUserId());
}
if (Objects.nonNull(bigRegion)){
storeDetail.setBigName(bigRegion.getName());
@@ -159,6 +169,7 @@ public class SysStoreAppServiceImpl implements SysStoreAppService,AuditResultSer
if (Objects.nonNull(fightRegion)){
storeDetail.setFightName(fightRegion.getName());
storeDetail.setFightCode(fightRegion.getSynDingDeptId());
storeDetail.setFightId(fightRegion.getId());
}
if (Objects.nonNull(systemBuildingShopDO)){
sysStoreAppResponse.setId(systemBuildingShopDO.getId());
@@ -215,10 +226,6 @@ public class SysStoreAppServiceImpl implements SysStoreAppService,AuditResultSer
storeDetail.setStoreSecurityDeposit(systemBuildingShopDO.getStoreSecurityDeposit());
// reasons
storeDetail.setReasons(systemBuildingShopDO.getReasons());
// regioGeneral
supervisorDetail.setRegioGeneral(systemBuildingShopDO.getRegioGeneral());
// regioGeneralId
supervisorDetail.setRegioGeneralId(systemBuildingShopDO.getRegioGeneralId());
}
if (Objects.nonNull(lineInfoDO)){
RegionDO byRegionId = regionMapper.getByRegionId(lineInfoDO.getRegionId());

23
coolstore-partner-service/src/main/java/com/cool/store/service/impl/TempUserDetailServiceImpl.java
View File

@@ -3,23 +3,28 @@ package com.cool.store.service.impl;
import com.cool.store.dao.EnterpriseUserDAO;
import com.cool.store.dao.ShopInfoDAO;
import com.cool.store.dao.TempUserDetailDAO;
import com.cool.store.dto.ehr.StaffBaseInfoDTO;
import com.cool.store.entity.EnterpriseUserDO;
import com.cool.store.entity.ShopInfoDO;
import com.cool.store.entity.TempUserDetailDO;
import com.cool.store.enums.ErrorCodeEnum;
import com.cool.store.exception.ServiceException;
import com.cool.store.request.TempUserDetailRequest;
import com.cool.store.service.TempUserDetailService;
import com.cool.store.service.XfsgEhrService;
import com.cool.store.utils.StringUtil;
import com.cool.store.vo.TempUserDetailInfoVO;
import com.cool.store.vo.TempUserDetailListVO;
import com.cool.store.vo.TempUserDetailVO;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Objects;
/**
* @author byd
@@ -37,6 +42,9 @@ public class TempUserDetailServiceImpl implements TempUserDetailService {
@Resource
private EnterpriseUserDAO enterpriseUserDAO;
@Autowired
private XfsgEhrService xfsgEhrService;
@Override
public TempUserDetailListVO userList(Long shopId) {
List<TempUserDetailDO> tempUserDetailDOList = tempUserDetailDAO.userList(shopId);
@@ -128,4 +136,19 @@ public class TempUserDetailServiceImpl implements TempUserDetailService {
return tempUserDetailInfoVO;
}
@Override
public StaffBaseInfoDTO getUserInfoByIdCard(String idCard) {
if (StringUtil.isBlank(idCard)) {
throw new ServiceException(ErrorCodeEnum.PARAMS_VALIDATE_ERROR);
}
EnterpriseUserDO enterpriseUserDO = enterpriseUserDAO.getUserInfoByThirdOaUniqueFlag(idCard);
if(Objects.isNull(enterpriseUserDO)){
throw new ServiceException(ErrorCodeEnum.USER_NOT_EXIST);
}
if (StringUtil.isBlank(enterpriseUserDO.getJobnumber())) {
throw new ServiceException(ErrorCodeEnum.JOBNUMBER_NOT_EXIST);
}
return xfsgEhrService.getUserInfoByCode(enterpriseUserDO.getJobnumber());
}
}

15
coolstore-partner-service/src/main/java/com/cool/store/service/impl/XfsgEhrServiceImpl.java
View File

@@ -83,21 +83,6 @@ public class XfsgEhrServiceImpl implements XfsgEhrService {
return franchiseeInfoDTO;
}
@Override
public StaffBaseInfoDTO getUserInfoByIdCard(String idCard) {
if (StringUtil.isBlank(idCard)) {
throw new ServiceException(ErrorCodeEnum.PARAMS_VALIDATE_ERROR);
}
EnterpriseUserDO enterpriseUserDO = enterpriseUserDAO.getUserInfoByThirdOaUniqueFlag(idCard);
if(Objects.isNull(enterpriseUserDO)){
throw new ServiceException(ErrorCodeEnum.USER_NOT_EXIST);
}
if (StringUtil.isBlank(enterpriseUserDO.getJobnumber())) {
throw new ServiceException(ErrorCodeEnum.JOBNUMBER_NOT_EXIST);
}
return this.getUserInfoByCode(enterpriseUserDO.getJobnumber());
}
private void fillSignatureInfo(Map<String, Object> requestMap) {
long timestamp = System.currentTimeMillis();
String signature = SecureUtil.getSignature(timestamp);

8
coolstore-partner-web/src/main/java/com/cool/store/config/TokenValidateFilter.java
View File

@@ -49,8 +49,12 @@ public class TokenValidateFilter implements Filter {
//腾讯音视频回调，单独做验签
"/xfsg/pc/video/**",
"/xfsg/pc/sysRole/**",
"/xfsg/*/api/audit/result",
"/xfsg/pc/video/**");
"/xfsg/**/api/audit/result",
"/xfsg/pc/video/**",
"/xfsg/**/api/license"
);
/**
* @param uri

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

@@ -28,9 +28,6 @@ public class TempUserDetailController {
@Autowired
private TempUserDetailService tempUserDetailService;
@Autowired
private XfsgEhrService xfsgEhrService;
@GetMapping(path = "/getUserList")
@ApiOperation("登记员工列表")
@ApiImplicitParams({
@@ -46,7 +43,7 @@ public class TempUserDetailController {
})
@ApiOperation("培训登记-身份证号查询信息")
public ResponseResult<StaffBaseInfoDTO> getUserInfoByIdCard(@RequestParam(value = "idCard") String idCard) {
return ResponseResult.success(xfsgEhrService.getUserInfoByIdCard((idCard)));
return ResponseResult.success(tempUserDetailService.getUserInfoByIdCard((idCard)));
}
@PostMapping(path = "/addTempUserDetail")

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

@@ -32,12 +32,6 @@ public class TrainingRegistController {
return ResponseResult.success(xfsgEhrService.getUserInfoByCode(staffNumber));
}
@ApiOperation("根据身份证号获取人员主数据")
@GetMapping("/getUserInfoByIdCard")
public ResponseResult<StaffBaseInfoDTO> getUserInfoByIdCard(@RequestParam("idCard") String idCard) {
return ResponseResult.success(xfsgEhrService.getUserInfoByIdCard(idCard));
}
@ApiOperation("根据加盟商编码查询加盟商信息")
@GetMapping("/getFranchiseeInfoByFrId")
public ResponseResult<FranchiseeInfoDTO> getFranchiseeInfoByFrId(@RequestParam("frId") String frId) {