diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/FranchiseeSaveRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/FranchiseeSaveRequest.java index 31c34fd61..4f85b15d2 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/FranchiseeSaveRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/FranchiseeSaveRequest.java @@ -47,7 +47,11 @@ public class FranchiseeSaveRequest { franchiseeDO.setIdCardAddress(this.idCardAddress); franchiseeDO.setIdCardBackUrl(this.idCardBackUrl); franchiseeDO.setIdCardFrontUrl(this.idCardFrontUrl); - franchiseeDO.setSex(this.sex); + if (this.sex == 1){ + franchiseeDO.setSex(1); + }else if (this.sex == 2){ + franchiseeDO.setSex(0); + } franchiseeDO.setSignType(this.signType); return franchiseeDO; } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/response/FranchiseFeeResponse.java b/coolstore-partner-model/src/main/java/com/cool/store/response/FranchiseFeeResponse.java index b22b6d701..616d4039c 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/response/FranchiseFeeResponse.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/response/FranchiseFeeResponse.java @@ -115,7 +115,7 @@ public class FranchiseFeeResponse { @ApiModelProperty("审核原因") private String result; - @ApiModelProperty("审核状态") + @ApiModelProperty("审核状态 0通过,1拒绝") private Integer status; public static LinePay from(LinePayDO linePayDO) { diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java index f4fd52cd3..2211d3cd3 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java @@ -421,7 +421,7 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu @Override @Transactional(rollbackFor = Exception.class) public Boolean rePay(Long shopId) { - shopStageInfoDAO.updateShopStageInfo(shopId,ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_71); + shopStageInfoDAO.updateShopStageInfo(shopId,ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_74); shopStageInfoDAO.updateShopStageToNotStarted(shopId, ShopSubStageEnum.SHOP_STAGE_8); return true; } 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 a85a1846f..481f93096 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 @@ -2,10 +2,7 @@ package com.cool.store.service.impl; import com.cool.store.dao.*; import com.cool.store.dto.ehr.StaffBaseInfoDTO; -import com.cool.store.entity.EnterpriseUserDO; -import com.cool.store.entity.ShopInfoDO; -import com.cool.store.entity.ShopStageInfoDO; -import com.cool.store.entity.TempUserDetailDO; +import com.cool.store.entity.*; import com.cool.store.enums.ErrorCodeEnum; import com.cool.store.enums.MessageEnum; import com.cool.store.enums.UserRoleEnum; @@ -59,6 +56,9 @@ public class TempUserDetailServiceImpl implements TempUserDetailService { @Autowired private PreparationService preparationService; + @Autowired + private RegionDao regionDao; + @Override public TempUserDetailListVO userList(Long shopId) { List tempUserDetailDOList = tempUserDetailDAO.userList(shopId); @@ -138,8 +138,9 @@ public class TempUserDetailServiceImpl implements TempUserDetailService { } List userIdList = enterpriseUserRoleDao.getUserIdsByRoleIdList(Collections.singletonList(UserRoleEnum.TRAINER.getCode())); + RegionDO regionDO = regionDao.getRegionById(shopInfoDO.getRegionId()); // - userIdList = enterpriseUserDAO.getUserIdListByRegionId(shopInfoDO.getRegionId(), userIdList); + userIdList = enterpriseUserDAO.getUserIdListByRegionId(Long.valueOf(regionDO.getParentId()), userIdList); Map messageMap = new HashMap<>(); messageMap.put("userName", tempUserDetailRequest.getName());