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-23 10:09:46 +08:00
parent f6372ae7d9 8226622a3e
commit 15ad6f5209
4 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
coolstore-partner-model/src/main/java/com/cool/store/request/FranchiseeSaveRequest.java
View File

@@ -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;
}

2
coolstore-partner-model/src/main/java/com/cool/store/response/FranchiseFeeResponse.java
View File

@@ -115,7 +115,7 @@ public class FranchiseFeeResponse {
@ApiModelProperty("审核原因")
private String result;
@ApiModelProperty("审核状态")
@ApiModelProperty("审核状态 0通过,1拒绝")
private Integer status;
public static LinePay from(LinePayDO linePayDO) {

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

@@ -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;
}

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

@@ -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<TempUserDetailDO> tempUserDetailDOList = tempUserDetailDAO.userList(shopId);
@@ -138,8 +138,9 @@ public class TempUserDetailServiceImpl implements TempUserDetailService {
}
List<String> 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<String, String> messageMap = new HashMap<>();
messageMap.put("userName", tempUserDetailRequest.getName());