diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ApplyLicenseMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ApplyLicenseMapper.java index e4eabdd94..2729626a4 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ApplyLicenseMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ApplyLicenseMapper.java @@ -11,4 +11,7 @@ import java.util.List; public interface ApplyLicenseMapper extends Mapper { List licenseList(@Param("request") LicenseListRequest request); + + void updateByShopId(@Param("entity") LicenseTransactDO licenseTransactDO); + } diff --git a/coolstore-partner-dao/src/main/resources/mapper/ApplyLicenseMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ApplyLicenseMapper.xml index 448208691..97d9eb254 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/ApplyLicenseMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/ApplyLicenseMapper.xml @@ -1,6 +1,11 @@ + + update xfsg_license_transact + set submit_status = #{entity.submitStatus} + where shop_id = #{entity.shopId} + select * from xfsg_line_info - where deleted = 0 and line_status = 0 and join_status = 0 + where deleted = 0 and line_status = 0 and investment_manager is not null diff --git a/coolstore-partner-model/src/main/java/com/cool/store/response/SysStoreAppResponse.java b/coolstore-partner-model/src/main/java/com/cool/store/response/SysStoreAppResponse.java index 31056a3b7..fb8542d83 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/response/SysStoreAppResponse.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/response/SysStoreAppResponse.java @@ -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; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/TempUserDetailService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/TempUserDetailService.java index 7aa072a88..6331f2198 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/TempUserDetailService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/TempUserDetailService.java @@ -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); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/XfsgEhrService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/XfsgEhrService.java index 7959ae520..3b71e4287 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/XfsgEhrService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/XfsgEhrService.java @@ -21,8 +21,6 @@ public interface XfsgEhrService { */ FranchiseeInfoDTO getFranchiseeInfoByFrId(String frId); - StaffBaseInfoDTO getUserInfoByIdCard(String idCard); - } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java index 15015e76f..72a0363ae 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java @@ -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); //更新阶段状态 diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AuditStatusServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AuditStatusServiceImpl.java index 96b40bfd6..3f25549cc 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AuditStatusServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AuditStatusServiceImpl.java @@ -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; } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysStoreAppServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysStoreAppServiceImpl.java index af4e96d6f..b284e3bde 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysStoreAppServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysStoreAppServiceImpl.java @@ -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()); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TempUserDetailServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TempUserDetailServiceImpl.java index dd107e5ed..3bf773ab2 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TempUserDetailServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TempUserDetailServiceImpl.java @@ -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 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()); + } + } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/XfsgEhrServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/XfsgEhrServiceImpl.java index 6dd725417..52dd621f3 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/XfsgEhrServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/XfsgEhrServiceImpl.java @@ -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 requestMap) { long timestamp = System.currentTimeMillis(); String signature = SecureUtil.getSignature(timestamp); diff --git a/coolstore-partner-web/src/main/java/com/cool/store/config/TokenValidateFilter.java b/coolstore-partner-web/src/main/java/com/cool/store/config/TokenValidateFilter.java index cf10be253..d7d3ecd82 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/config/TokenValidateFilter.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/config/TokenValidateFilter.java @@ -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 diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/TempUserDetailController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/TempUserDetailController.java index 28e4821a7..497b63b4e 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/TempUserDetailController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/TempUserDetailController.java @@ -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 getUserInfoByIdCard(@RequestParam(value = "idCard") String idCard) { - return ResponseResult.success(xfsgEhrService.getUserInfoByIdCard((idCard))); + return ResponseResult.success(tempUserDetailService.getUserInfoByIdCard((idCard))); } @PostMapping(path = "/addTempUserDetail") diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/TrainingRegistController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/TrainingRegistController.java index 43971bcc8..85ac6bd23 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/TrainingRegistController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/TrainingRegistController.java @@ -32,12 +32,6 @@ public class TrainingRegistController { return ResponseResult.success(xfsgEhrService.getUserInfoByCode(staffNumber)); } - @ApiOperation("根据身份证号获取人员主数据") - @GetMapping("/getUserInfoByIdCard") - public ResponseResult getUserInfoByIdCard(@RequestParam("idCard") String idCard) { - return ResponseResult.success(xfsgEhrService.getUserInfoByIdCard(idCard)); - } - @ApiOperation("根据加盟商编码查询加盟商信息") @GetMapping("/getFranchiseeInfoByFrId") public ResponseResult getFranchiseeInfoByFrId(@RequestParam("frId") String frId) {