Merge #59 into master from cc_2021104_twelve_points
fix:十二分问题修复
* cc_2021104_twelve_points: (58 commits squashed)
- fix:启用禁用规则合并
- Merge branch 'refs/heads/master' into cc_2021104_twelve_points
- fix:惩处规则列表新增描述字段
- fix:新增用户管辖门店列表接口
- fix:门店列表接口新增门店积分字段
- fix:查询问题修复；新增草稿状态
- fix:申请单审批补充审批人字段
- fix:修改门店积分限制0-12
- fix:积分流水接口修复；申请单查询接口添加日期筛选
- fix:惩处单查询提供惩处待处理、惩处已处理状态筛选
- fix:惩处单复议申请查询异常修复
- fix:小程序惩处单详情接口字段补充
- fix:查询字段补充
- fix
- fix:转义
- fix
- fix:新增撤销复议申请单接口
- fix:补充字段
- fix:补充字段
- fix:新增门店分数接口
- fix:申请单新增筛选条件
- fix:门店积分接口返回参数修改
- fix:小程序规则分页查询接口改为Post
- fix:问题修复
- fix:十二分导入
- fix:导入状态部分失败改为失败
- fix:字段补充
- fix:异步下Excel导入图片临时文件被清理的问题
- fix:扣分申请导入图片路径修改并使用CDN
- fix:导入图片上传oss文件类型修改为图片
- fix:批量审批
- fix:批量审批新增备注字段
- fix:字段补充
- Merge branch 'master' into cc_2021104_twelve_points
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java
#	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
#	coolstore-partner-dao/src/main/java/com/cool/store/dao/StoreDao.java
#	coolstore-partner-dao/src/main/java/com/cool/store/mapper/StoreMapper.java
#	coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml
#	coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCStoreController.java
- fix:字典项新增排序、编辑删除权限、关联字典项
- Merge branch 'master' into cc_2021104_twelve_points
- fix:十二分值-扣分列表申请复议截止日期格式
- fix:去除appealEndDate格式校验
- Merge remote-tracking branch 'origin/cc_20260128_dict_update' into cc_20260205_twelve_points_v2
- Merge branch 'cc_20260128_dict_update' into cc_2021104_twelve_points
- fix:字典回显包含已删除字典项
- Merge branch 'master' into cc_2021104_twelve_points
- Merge remote-tracking branch 'origin/cc_20260205_twelve_points_v2' into cc_2021104_twelve_points
- fix:去除惩处单审批阶段；复议申请单证明图片非必填
- fix:复议拒绝后惩处单直接生效
- fix:扣分申请单证明图片改为非必填
- fix
- fix:字段转义
- fix:惩处待处理包含带生效数据
- fix:字段转义
- fix:警告单金额和积分初始化为0
- fix
- fix:小程序接口字段转义
- Merge branch 'master' into cc_2021104_twelve_points
- fix:十二分审批记录展示待审批人
- fix
- fix:惩处单复议申请逾期检查改为延时队列
- Merge branch 'refs/heads/master' into cc_2021104_twelve_points
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java
Signed-off-by: 王非凡 <accounts_67eba0c5fee9c49c80c8e2b4@mail.teambition.com>
Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>
CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/59
This commit is contained in:
王非凡
@@ -341,7 +341,7 @@ public class RedisConstant {
|
||||
* 建店资料总部订货收款账户信息
|
||||
*/
|
||||
public static final String BUILD_RECEIVE_BANK_INFO = "zxjp_build_receive_bank_info";
|
||||
|
||||
|
||||
/**
|
||||
* 加盟线下收款银行默认配置
|
||||
*/
|
||||
@@ -352,6 +352,12 @@ public class RedisConstant {
|
||||
*/
|
||||
public static final String TP_PENALTY_APPLY_IMPORT_LOCK = "tp_penalty_apply_import_lock";
|
||||
|
||||
/**
|
||||
* 十二分审批按钮权限id
|
||||
*/
|
||||
public static final String TP_AUDIT_AUTH_MENU_ID = "tp_audit_auth_menu_id";
|
||||
|
||||
|
||||
public static final String STANDARD_STORE_PAY_LOCK_KEY = "standard_store_pay_lock_key:{0}";
|
||||
|
||||
/**
|
||||
|
||||
@@ -38,6 +38,7 @@ public enum RocketMqGroupEnum {
|
||||
|
||||
STORE_MASTER_ISSUE("store_master_issue", new ArrayList<>(Arrays.asList(RocketMqTagEnum.STORE_MASTER_ISSUE))),
|
||||
VISIT_RECORD_INVALID("visit_record_invalid", new ArrayList<>(Arrays.asList(RocketMqTagEnum.VISIT_RECORD_INVALID))),
|
||||
TP_PENALTY_APPEAL_OVERDUE("tp_penalty_appeal_overdue", new ArrayList<>(Arrays.asList(RocketMqTagEnum.TP_PENALTY_APPEAL_OVERDUE))),
|
||||
;
|
||||
|
||||
private final String group;
|
||||
|
||||
@@ -22,6 +22,7 @@ public enum RocketMqTagEnum {
|
||||
DELAY_SHOP_DECORATION_ASSIGN("shop_decoration_assign","门店装修分配"),
|
||||
STORE_MASTER_ISSUE("store_master_issue","门店主数据下发"),
|
||||
VISIT_RECORD_INVALID("visit_record_invalid", "拜访记录失效"),
|
||||
TP_PENALTY_APPEAL_OVERDUE("tp_penalty_appeal_overdue", "十二分惩处单复议逾期"),
|
||||
;
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user