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:
bianyadong
2024-05-17 16:44:42 +08:00
parent 8d12d79274 55c7101dbf
commit 159c29458a
4 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
coolstore-partner-common/src/main/java/com/cool/store/enums/prepare/newStore/PassengerFlowEnum.java
View File

@@ -6,9 +6,9 @@ import java.util.function.Function;
import java.util.stream.Collectors; import java.util.stream.Collectors;
public enum PassengerFlowEnum { public enum PassengerFlowEnum {
BELOW_1000(0,"1000以下"), BELOW_1000(0,"1000以下",10),
TO_1000_10000(1,"1000-1万"), TO_1000_10000(1,"1000-1万",20),
MORE_THAN_10000(2,"1万以上"), MORE_THAN_10000(2,"1万以上",30),
@@ -16,10 +16,12 @@ public enum PassengerFlowEnum {
private Integer code; private Integer code;
private String desc; private String desc;
private Integer type;
PassengerFlowEnum(Integer code, String desc) { PassengerFlowEnum(Integer code, String desc,Integer type) {
this.code = code; this.code = code;
this.desc = desc; this.desc = desc;
this.type = type;
} }
public Integer getCode() { public Integer getCode() {
@@ -38,6 +40,14 @@ public enum PassengerFlowEnum {
this.desc = desc; this.desc = desc;
} }
public Integer getType() {
return type;
}
public void setType(Integer type) {
this.type = type;
}
public static final Map<Integer, PassengerFlowEnum> map public static final Map<Integer, PassengerFlowEnum> map
= Arrays.stream(values()).collect(Collectors.toMap(PassengerFlowEnum::getCode, Function.identity())); = Arrays.stream(values()).collect(Collectors.toMap(PassengerFlowEnum::getCode, Function.identity()));

2
coolstore-partner-model/src/main/java/com/cool/store/request/AddSignFranchiseRequest.java
View File

@@ -26,7 +26,7 @@ public class AddSignFranchiseRequest {
@ApiModelProperty("是否有营业执照 0-是 1-否") @ApiModelProperty("是否有营业执照 0-是 1-否")
private Integer isBusinessLicense; private Integer isBusinessLicense;
@ApiModelProperty("是否有食营 0-是 1-否") @ApiModelProperty("是否有食营 0-是 2-否[二证合一] 3-否[[三小一摊] 4-否[暂未办理]")
private Integer isFoodLicense; private Integer isFoodLicense;
@ApiModelProperty("合同开始日期") @ApiModelProperty("合同开始日期")

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

@@ -378,7 +378,7 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
if (Objects.nonNull(lineInfoDO)) { if (Objects.nonNull(lineInfoDO)) {
addSignFranchiseResponse.setPartnerName(lineInfoDO.getUsername()); addSignFranchiseResponse.setPartnerName(lineInfoDO.getUsername());
} }
if (Objects.nonNull(signingBaseInfoDO)) { if (Objects.nonNull(signingBaseInfoDO) && Objects.nonNull(memberQuestionDO)) {
if (JoinTypeEnum.JOIN_TYPE_ONE.getCode().equals(memberQuestionDO.getJoinType())) { if (JoinTypeEnum.JOIN_TYPE_ONE.getCode().equals(memberQuestionDO.getJoinType())) {
addSignFranchiseResponse.setIdCardNo(signingBaseInfoDO.getIdCardNo()); addSignFranchiseResponse.setIdCardNo(signingBaseInfoDO.getIdCardNo());
} else if (JoinTypeEnum.JOIN_TYPE_TWO.getCode().equals(memberQuestionDO.getJoinType())) { } else if (JoinTypeEnum.JOIN_TYPE_TWO.getCode().equals(memberQuestionDO.getJoinType())) {

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

@@ -383,7 +383,7 @@ public class SysStoreAppServiceImpl implements SysStoreAppService, AuditResultSe
// zmdzt // zmdzt
newStoreRequest.setZmdzt(10); newStoreRequest.setZmdzt(10);
// zmrjkllzs1 // zmrjkllzs1
newStoreRequest.setZmrjkllzs1(sysStoreAppRequest.getStoreDetail().getAverageDailyRs()); newStoreRequest.setZmrjkllzs1(PassengerFlowEnum.getByCode(sysStoreAppRequest.getStoreDetail().getAverageDailyRs()).getType());
// zppsyfy // zppsyfy
newStoreRequest.setZppsyfy(0.05); newStoreRequest.setZppsyfy(0.05);
// zq // zq