diff --git a/coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java b/coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java index 03237cc04..bb98209a9 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java @@ -232,4 +232,7 @@ public class CommonConstants { public static final int REFRESH_TOKEN_EXPIRE = 30 * 24 * 60 * 60; public static final int BATCH_SIZE = 200; + + public static final Integer INDEX_ZERO = 0; + public static final Integer INDEX_ONE = 1; } diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/BusinessModelEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/BusinessModelEnum.java index 7fdeec748..992738fbe 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/BusinessModelEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/BusinessModelEnum.java @@ -9,7 +9,8 @@ package com.cool.store.enums; public enum BusinessModelEnum { NULL(0, "无"), DIRECT_SALES(1, "直营"), - JOIN_SALES(2, "加盟"); + JOIN_SALES(2, "加盟"), + JOINT_STORE(3, "联营"); private Integer code; private String desc; diff --git a/coolstore-partner-common/src/main/java/com/cool/store/utils/CommonUtil.java b/coolstore-partner-common/src/main/java/com/cool/store/utils/CommonUtil.java index 8e27687ff..07bf9d41a 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/utils/CommonUtil.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/utils/CommonUtil.java @@ -6,7 +6,7 @@ import java.math.BigDecimal; /** *

- * 公告工具 + * 公共工具 *

* * @author wangff diff --git a/coolstore-partner-model/src/main/java/com/cool/store/response/AddSignFranchiseResponse.java b/coolstore-partner-model/src/main/java/com/cool/store/response/AddSignFranchiseResponse.java index f6537dfe0..3dcb6c31d 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/response/AddSignFranchiseResponse.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/response/AddSignFranchiseResponse.java @@ -241,5 +241,6 @@ public class AddSignFranchiseResponse { @ApiModelProperty("是否统管 : 1-统管,0-不统管") private Integer unifiedManagement; - + @ApiModelProperty("收银费(系统费)") + private String cashierFee; } 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 6ee49e3d4..2bc9404ea 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 @@ -627,6 +627,7 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu addSignFranchiseResponse.setThirdYearFee(franchiseFeeDO.getThirdYearFee()); addSignFranchiseResponse.setPerformanceBond(franchiseFeeDO.getPerformanceBond()); addSignFranchiseResponse.setBigPerformanceBond(Convert.digitToChinese(convertToBig(franchiseFeeDO.getPerformanceBond()))); + addSignFranchiseResponse.setCashierFee(franchiseFeeDO.getCashierFee()); } return addSignFranchiseResponse; }