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

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

Browse Source
This commit is contained in:
苏竹红
2024-05-15 09:49:40 +08:00
parent 5efdda91d4 b7e8352344
commit cf77d2e1b9
9 changed files with 39 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
coolstore-partner-common/src/main/java/com/cool/store/enums/MessageEnum.java
View File

@@ -130,11 +130,11 @@ public enum MessageEnum {
return "dingtalk://dingtalkclient/action/open_micro_app?appId="+appId+"&corpId="+corpId+"&page=" +
URLEncoder.encode("pages/common-web-view/index?noticeType=xfsg&routerUrl=notice&target=threeAcceptance&timestamp="+System.currentTimeMillis(), StandardCharsets.UTF_8.name());
case MESSAGE_26:
return domainUrl + "/dd-noticemsg?appId=" + appId+"&corpId="+corpId+"&page=" +
URLEncoder.encode("pages/common-web-view/index?noticeType=xfsg&routerUrl=notice&target=openPlan&timestamp="+System.currentTimeMillis()+"&lineId="+ paramMap.get("lineId")+"&shopId="+ paramMap.get("shopId"), StandardCharsets.UTF_8.name());
return domainUrl + "/dd-noticemsg?appId=" + appId + "&corpId=" + corpId + "&appUrl=" +
URLEncoder.encode("pages/common-web-view/index?noticeType=xfsg&routerUrl=notice&target=openPlan&timestamp=" + System.currentTimeMillis() +"&lineId="+ paramMap.get("lineId")+"&shopId="+ paramMap.get("shopId"), StandardCharsets.UTF_8.name());
case MESSAGE_27:
return domainUrl + "/dd-noticemsg?appId=" + appId+"&corpId="+corpId+"&page=" +
URLEncoder.encode("pages/common-web-view/index?noticeType=xfsg&routerUrl=notice&target=orderList&timestamp="+System.currentTimeMillis()+"&lineId="+ paramMap.get("lineId"), StandardCharsets.UTF_8.name());
return domainUrl + "/dd-noticemsg?appId=" + appId + "&corpId=" + corpId + "&appUrl=" +
URLEncoder.encode("pages/common-web-view/index?noticeType=xfsg&routerUrl=notice&target=orderList&timestamp=" + System.currentTimeMillis() +"&lineId="+ paramMap.get("lineId"), StandardCharsets.UTF_8.name());
default:
return "";

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

@@ -13,7 +13,7 @@ public interface ApplyLicenseMapper extends Mapper<LicenseTransactDO> {
List<LicenseListResponse> licenseList(@Param("request") LicenseListRequest request,
@Param("userId") String userId,
@Param("fightRegions") List<RegionDO> fightRegions);
@Param("fightRegions") List<String> fightRegions);
void updateByShopId(@Param("entity") LicenseTransactDO licenseTransactDO);

5
coolstore-partner-model/src/main/java/com/cool/store/entity/SystemBuildingShopDO.java
View File

@@ -175,6 +175,11 @@ public class SystemBuildingShopDO {
// regioGeneralId
systemBuildingShopDO.setRegioGeneralId(sysStoreAppRequest.getSupervisorDetail().getRegioGeneralId());
systemBuildingShopDO.setStoreName(sysStoreAppRequest.getStoreDetail().getStoreName());
systemBuildingShopDO.setBigName(sysStoreAppRequest.getStoreDetail().getBigName());
systemBuildingShopDO.setBigCode(sysStoreAppRequest.getStoreDetail().getBigCode());
systemBuildingShopDO.setFightName(sysStoreAppRequest.getStoreDetail().getFightName());
systemBuildingShopDO.setFightCode(sysStoreAppRequest.getStoreDetail().getFightCode());
systemBuildingShopDO.setSmallName(sysStoreAppRequest.getStoreDetail().getSmallName());
return systemBuildingShopDO;
}
}

15
coolstore-partner-model/src/main/java/com/cool/store/request/ShopIdRequest.java Normal file
View File

@@ -0,0 +1,15 @@
package com.cool.store.request;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author byd
* @date 2024-04-24 16:40
*/
@Data
public class ShopIdRequest {
@ApiModelProperty("shopId")
private Long shopId;
}

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

@@ -148,7 +148,7 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService {
}
//2.未查到证照信息，所以查询鲜丰的默认值(只要鲜丰接口内有值，总是优先使用鲜丰数据)
ShopInfoDO shopInfoDO = shopInfoMapper.selectByPrimaryKey(shopId);
if (Objects.nonNull(shopInfoDO.getStoreNum())) {
if (Objects.nonNull(shopInfoDO.getStoreNum()) && StringUtil.isNotBlank(shopInfoDO.getStoreNum())) {
GetStoreInfoByCodeResponse storeInfoCode = coolStoreStartFlowService.getStoreInfoCode(shopInfoDO.getStoreNum());
if (Objects.nonNull(storeInfoCode.getData().getStoreDocument()) && storeInfoCode.getCode() == 0) {
//替换落库的值
@@ -174,11 +174,13 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService {
return new PageInfo<>();
}
List<RegionDO> fightRegion = regionDao.getFightRegionByRegionIds(regionIds);
List<String> fightRegionIds = fightRegion.stream().map(RegionDO::getRegionId).collect(Collectors.toList());
if (CollectionUtils.isEmpty(fightRegion)) {
return new PageInfo<>();
}
PageHelper.startPage(request.getPageNum(), request.getPageSize());
licenseListResponses = applyLicenseMapper.licenseList(request, null, fightRegion);
licenseListResponses = applyLicenseMapper.licenseList(request, null, fightRegionIds);
} else {
PageHelper.startPage(request.getPageNum(), request.getPageSize());
licenseListResponses = applyLicenseMapper.licenseList(request, user.getUserId(), null);

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

@@ -596,7 +596,7 @@ public class EmployeeTrainingServiceImpl implements EmployeeTrainingService {
if (item.getId() != null) {
assessmentDataDO = assessmentDataDAO.selectByPrimaryKey(item.getId());
} else {
assessmentDataDO = assessmentDataDAO.selectByTemplateId(item.getTemplateId(), employeeTrainingDO.getXfsgUserDetailId().toString(), item.getShopId());
assessmentDataDO = assessmentDataDAO.selectByTemplateId(item.getTemplateId(), userId, item.getShopId());
}
if (assessmentDataDO != null) {
assessmentDataDO.setScore(item.getScore());
@@ -609,7 +609,7 @@ public class EmployeeTrainingServiceImpl implements EmployeeTrainingService {
assessmentDataDO.setShopId(item.getShopId());
assessmentDataDO.setComments(item.getComments());
assessmentDataDO.setScore(item.getScore());
assessmentDataDO.setAssessmentUserId(employeeTrainingDO.getXfsgUserDetailId().toString());
assessmentDataDO.setAssessmentUserId(userId);
assessmentDataDO.setPicture(item.getPicture());
assessmentDataDO.setVideo(item.getVideo());
assessmentDataDAO.insertSelective(assessmentDataDO);
@@ -624,7 +624,7 @@ public class EmployeeTrainingServiceImpl implements EmployeeTrainingService {
if (totalScore.get().intValue() > CommonConstants.NINETY) {
employeeTrainingDO.setPracticalExamStatus(1);
} else {
employeeTrainingDO.setPracticalExamStatus(0);
employeeTrainingDO.setPracticalExamStatus(2);
}
employeeTrainingDO.setPracticalExamScore(totalScore.get().intValue());
employeeTrainingDO.setActualAssessmentTime(new Date());

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

@@ -372,6 +372,8 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
addSignFranchiseResponse.setLicenseName(licenseTransactDO.getBusinessLicense());
addSignFranchiseResponse.setOpeAddress(licenseTransactDO.getLicenseAddress());
addSignFranchiseResponse.setOperator(licenseTransactDO.getOperator());
addSignFranchiseResponse.setLicenseCode(licenseTransactDO.getCreditCode());
addSignFranchiseResponse.setType(LicenseTypeEnum.match(licenseTransactDO.getLicenseType()).getMessage());
}
if (Objects.nonNull(lineInfoDO)) {
addSignFranchiseResponse.setPartnerName(lineInfoDO.getUsername());

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

@@ -190,11 +190,11 @@ public class TempUserDetailServiceImpl implements TempUserDetailService {
public void registrationCompleted(Long shopId) {
ShopStageInfoDO shopStageInfoDO = shopStageInfoDAO.getShopSubStageInfo(shopId, ShopSubStageEnum.SHOP_STAGE_5);
if(shopStageInfoDO != null){
shopStageInfoDO.setShopSubStageStatus(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_51.getShopSubStageStatus());
shopStageInfoDAO.batchUpdate(Collections.singletonList(shopStageInfoDO));
shopStageInfoDAO.updateShopStageInfo(shopId, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_51);
//状态结束
preparationService.whetherToOpenForAcceptance(shopId);
}
}
}

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

@@ -2,6 +2,7 @@ package com.cool.store.controller.webb;
import com.cool.store.dto.ehr.StaffBaseInfoDTO;
import com.cool.store.request.IdRequest;
import com.cool.store.request.ShopIdRequest;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.TempUserDetailService;
import com.cool.store.vo.TempUserDetailInfoVO;
@@ -60,8 +61,8 @@ public class PCTempUserDetailController {
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "店铺id shopId")
})
public ResponseResult<Boolean> registrationCompleted(@RequestBody IdRequest idRequest) {
tempUserDetailService.registrationCompleted((idRequest.getId()));
public ResponseResult<Boolean> registrationCompleted(@RequestBody ShopIdRequest shopIdRequest) {
tempUserDetailService.registrationCompleted(shopIdRequest.getShopId());
return ResponseResult.success(Boolean.TRUE);
}