Merge #96 into master from cc_20250922_closeStore_w

闭店火码账号关闭优化；十二分积分流水导出

* cc_20250922_closeStore_w: (100 commits squashed)

  - fix:支行列表接口

  - fix:错误信息修改

  - Merge branch 'master' into cc_20250922_closeStore_w
    
    # Conflicts:
    #	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
    #	coolstore-partner-model/src/main/java/com/cool/store/request/close/refund/CloseStoreRefundAddRequest.java
    #	coolstore-partner-model/src/main/java/com/cool/store/request/xgj/XgjPartnerAccountRequest.java
    #	coolstore-partner-model/src/main/java/com/cool/store/request/xgj/XgjSavePartnerRequest.java
    #	coolstore-partner-service/src/main/java/com/cool/store/service/close/CloseStoreRefundService.java
    #	coolstore-partner-service/src/main/java/com/cool/store/service/close/impl/CloseStoreRefundServiceImpl.java
    #	coolstore-partner-web/src/main/java/com/cool/store/controller/webb/CloseStoreRefundController.java
    #	coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenApiController.java
    #	coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java

  - fix:闭店材料详情接口新增字段

  - fix:闭店材料修改单个材料时，去除审批状态

  - Merge remote-tracking branch 'origin/cc_20250922_closeStore_w' into cc_20250922_closeStore_w

  - fix:闭店材料详情接口新增模板链接字段

  - fix:闭店材料详情新增材料状态转义字段

  - Merge remote-tracking branch 'origin/cc_20250922_closeStore_w' into cc_20250922_closeStore_w

  - fix:新管家应退实退金额字段修改

  - fix:启用禁用规则合并

  - Merge branch 'refs/heads/master' into cc_2021104_twelve_points

  - fix:惩处规则列表新增描述字段

  - fix:闭店支行测试环境mock

  - fix:新增用户管辖门店列表接口

  - fix:门店列表接口新增门店积分字段

  - fix:查询问题修复；新增草稿状态

  - fix:申请单审批补充审批人字段

  - fix:修改门店积分限制0-12

  - fix:积分流水接口修复；申请单查询接口添加日期筛选

  - fix:redis报错修复

  - 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:新增字段

  - fix:字段补充

  - fix:小程序新增接口根据闭店申请id获取闭店申请简单信息

  - fix:小程序退款信息列表修改

  - fix:闭店审批允许管理员审批

  - 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

  - fix:阶段名称修改

  - Merge branch 'refs/heads/master' into cc_20250922_closeStore_w
    
    # Conflicts:
    #	coolstore-partner-common/src/main/java/com/cool/store/enums/close/CloseStoreSubStageStatusEnum.java

  - fix:闭店记录列表补充审批id；仅在营门店允许发起闭店

  - fix:提交新管家字段取值逻辑修改

  - 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_20250922_closeStore_w

  - fix:闭店定时任务过滤闭店状态补充

  - Merge branch 'refs/heads/master' into cc_2021104_twelve_points
    
    # Conflicts:
    #	coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java

  - Merge branch 'master' into cc_20250922_closeStore_w

  - fix:闭店材料新增字段

  - fix

  - fix:小程序闭店材料详情新增字段

  - fix:闭店流程流转校验除授权书外是否已邮寄

  - fix:营帐通JWT生成

  - fix:营帐通JWT改为post

  - fix:修改secret

  - fix:配置

  - Merge branch 'master' into cc_2021104_twelve_points

  - fix:十二分流水导出；流水新增规则描述字段

  - fix

  - fix:闭店新管家接口错误信息返回

  - Merge branch 'master' into cc_20250922_closeStore_w

  - Merge branch 'cc_20260412_jwt_ge' into cc_20250922_closeStore_w

  - Merge branch 'master' into cc_20250922_closeStore_w

  - fix:闭店火码关闭账号不存在时忽略

  - Merge branch 'cc_2021104_twelve_points' into cc_20250922_closeStore_w

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/96

coolstore-partner-model/src/main/java/com/cool/store/dto/tp/TpScoreJournalExportDTO.java

@@ -0,0 +1,94 @@
+package com.cool.store.dto.tp;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.cool.store.annotation.DictField;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 十二分制-积分流水导出DTO
+ * </p>
+ *
+ * @author wangff
+ * @since 2025/11/10
+ */
+@Data
+public class TpScoreJournalExportDTO {
+
+    @ExcelProperty(value = "流水号", order = 1)
+    @ColumnWidth(30)
+    private String journalNo;
+
+    @ExcelProperty(value = "门店编码", order = 2)
+    @ColumnWidth(20)
+    private String storeNum;
+
+    @ExcelProperty(value = "门店名称", order = 3)
+    @ColumnWidth(30)
+    private String storeName;
+
+    @ExcelProperty(value = "加盟品牌", order = 4)
+    @ColumnWidth(15)
+    private String joinBrandName;
+
+    @ExcelProperty(value = "加盟模式", order = 5)
+    @ColumnWidth(15)
+    private String joinModelName;
+
+    @ExcelProperty(value = "门店类型", order = 6)
+    @ColumnWidth(15)
+    private String storeTypeName;
+
+    @ExcelProperty(value = "发生分值", order = 7)
+    @ColumnWidth(15)
+    private String occurScore;
+
+    @ExcelProperty(value = "发生日期", order = 8)
+    @ColumnWidth(20)
+    private String occurDate;
+
+    @ExcelProperty(value = "发生前分值", order = 9)
+    @ColumnWidth(15)
+    private BigDecimal occurBeforeScore;
+
+    @ExcelProperty(value = "发生后分值", order = 10)
+    @ColumnWidth(15)
+    private BigDecimal occurAfterScore;
+
+    @ExcelProperty(value = "单据类型", order = 11)
+    @ColumnWidth(20)
+    private String applyTypeName;
+
+    @ExcelProperty(value = "来源单号", order = 12)
+    @ColumnWidth(30)
+    private String applyNo;
+
+    @ExcelIgnore
+    private String projectCategory;
+
+    @ExcelProperty(value = "项目大类", order = 13)
+    @ColumnWidth(20)
+    @DictField
+    private String projectCategoryName;
+
+    @ExcelIgnore
+    private String projectName;
+
+    @ExcelProperty(value = "项目名称", order = 14)
+    @ColumnWidth(30)
+    @DictField
+    private String projectNameName;
+
+    @ExcelProperty(value = "规则编码", order = 15)
+    @ColumnWidth(20)
+    private String ruleNo;
+
+    @ExcelProperty(value = "规则项目描述", order = 16)
+    @ColumnWidth(30)
+    private String remark;
+}

coolstore-partner-model/src/main/java/com/cool/store/entity/tp/TpScoreJournalDO.java

@@ -132,6 +132,11 @@ public class TpScoreJournalDO {
     @Column(name = "rule_no")
     private String ruleNo;
 
+    /**
+     * 规则项目描述
+     */
+    private String remark;
+
     /**
      * 创建时间
      */
@@ -144,7 +149,7 @@ public class TpScoreJournalDO {
     @Column(name = "update_time")
     private Date updateTime;
 
-    public TpScoreJournalDO(StoreDO storeDO, TpApplyFormDO formDO, String occurScore, BigDecimal occurBeforeScore, BigDecimal occurAfterScore) {
+    public TpScoreJournalDO(StoreDO storeDO, TpApplyFormDO formDO, String occurScore, BigDecimal occurBeforeScore, BigDecimal occurAfterScore, String ruleRemark) {
         this.journalNo = TpHelper.generateScoreJournalNo();
         this.storeId = storeDO.getStoreId();
         this.storeNum = storeDO.getStoreNum();
@@ -162,5 +167,6 @@ public class TpScoreJournalDO {
         this.projectName = formDO.getProjectName();
         this.ruleId = formDO.getRuleId();
         this.ruleNo = formDO.getRuleNo();
+        this.remark = ruleRemark;
     }
 }

coolstore-partner-model/src/main/java/com/cool/store/vo/tp/TpScoreJournalVO.java

@@ -4,6 +4,7 @@ import com.cool.store.enums.JoinModeEnum;
 import com.cool.store.enums.StoreTypeEnum;
 import com.cool.store.enums.master.BrandTypeEnum;
 import com.cool.store.enums.tp.TpFormTypeEnum;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -81,6 +82,9 @@ public class TpScoreJournalVO {
     @ApiModelProperty("创建时间")
     private Date createTime;
 
+    @JsonIgnore
+    private String remark;
+
     public String getJoinBrandName() {
         return BrandTypeEnum.getDescByCode(this.joinBrand);
     }