fix:经营模式新增联营;获取默认值接口返回收银费字段
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -6,7 +6,7 @@ import java.math.BigDecimal;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* 公告工具
|
||||
* 公共工具
|
||||
* </p>
|
||||
*
|
||||
* @author wangff
|
||||
|
||||
@@ -241,5 +241,6 @@ public class AddSignFranchiseResponse {
|
||||
@ApiModelProperty("是否统管 : 1-统管,0-不统管")
|
||||
private Integer unifiedManagement;
|
||||
|
||||
|
||||
@ApiModelProperty("收银费(系统费)")
|
||||
private String cashierFee;
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user