Merge #31 into master from cc_2021104_twelve_points

十二分

* cc_2021104_twelve_points: (34 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

Signed-off-by: 王非凡 <accounts_67eba0c5fee9c49c80c8e2b4@mail.teambition.com>
Reviewed-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>
Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/31

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

@@ -16,7 +16,7 @@ public class ImportOaOldShopDataErrorDTO {
     @ExcelProperty(value = "门店编码", order = 1)
     @ColumnWidth(30)
     private String shopCode;
-    @ExcelProperty(value = "门店", order = 2)
+    @ExcelProperty(value = "惩处规则编码", order = 2)
     @ColumnWidth(30)
     private String shopName;
     @ExcelProperty(value = "错误原因", order =3)

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

@@ -0,0 +1,32 @@
+package com.cool.store.dto.tp;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * <p>
+ * 惩处申请单导入错误DTO
+ * </p>
+ *
+ * @author wangff
+ * @since 2026/1/9
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class TpPenaltyImportErrorDTO {
+    @ExcelProperty(value = "门店编码", order = 1)
+    @ColumnWidth(30)
+    private String storeNum;
+
+    @ExcelProperty(value = "惩处规则编码", order = 3)
+    @ColumnWidth(30)
+    private String ruleNo;
+
+    @ExcelProperty(value = "错误原因", order =3)
+    @ColumnWidth(40)
+    private String errorReason;
+}

coolstore-partner-model/src/main/java/com/cool/store/request/store/StoreListRequest.java

@@ -0,0 +1,19 @@
+package com.cool.store.request.store;
+
+import com.cool.store.common.PageBasicInfo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * <p>
+ * 根据区域查询门店Request
+ * </p>
+ *
+ * @author wangff
+ * @since 2025/12/29
+ */
+@Data
+public class StoreListRequest extends PageBasicInfo {
+    @ApiModelProperty("门店编码或门店名称")
+    private String keyword;
+}

coolstore-partner-model/src/main/java/com/cool/store/request/tp/TpApplyAuditRequest.java

@@ -1,7 +1,9 @@
 package com.cool.store.request.tp;
 
 import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.NotNull;
 
@@ -14,6 +16,8 @@ import javax.validation.constraints.NotNull;
  * @since 2025/11/6
  */
 @Data
+@AllArgsConstructor
+@NoArgsConstructor
 public class TpApplyAuditRequest {
     @ApiModelProperty("申请单id")
     @NotNull(message = "申请单id不能为空")

coolstore-partner-model/src/main/java/com/cool/store/request/tp/TpApplyIdRequest.java

@@ -0,0 +1,21 @@
+package com.cool.store.request.tp;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * <p>
+ * 十二分申请单idRequest
+ * </p>
+ *
+ * @author wangff
+ * @since 2026/1/8
+ */
+@Data
+public class TpApplyIdRequest {
+    @ApiModelProperty("申请单id")
+    @NotNull(message = "申请单id不能为空")
+    private Long applyId;
+}

coolstore-partner-model/src/main/java/com/cool/store/request/tp/TpApplyQueryRequest.java

@@ -1,15 +1,12 @@
 package com.cool.store.request.tp;
 
 import com.cool.store.common.PageBasicInfo;
-import com.cool.store.constants.CommonConstants;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.apache.commons.lang3.StringUtils;
 
 import java.math.BigDecimal;
-import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -27,6 +24,9 @@ public class TpApplyQueryRequest extends PageBasicInfo {
     @ApiModelProperty("门店名称或编码")
     private String storeNameOrNum;
 
+    @ApiModelProperty("门店id")
+    private String storeId;
+
     @ApiModelProperty("项目大类")
     private String projectCategory;
 
@@ -56,4 +56,13 @@ public class TpApplyQueryRequest extends PageBasicInfo {
 
     @ApiModelProperty(value = "是否已逾期", hidden = true)
     private Boolean overdue;
+
+    @ApiModelProperty("开始时间")
+    private Date startTime;
+
+    @ApiModelProperty("结束时间")
+    private Date endTime;
+
+    @ApiModelProperty("惩处状态，1惩处待处理 2惩处已处理")
+    private Integer penaltyStatus;
 }

coolstore-partner-model/src/main/java/com/cool/store/request/tp/TpBatchAuditRequest.java

@@ -0,0 +1,34 @@
+package com.cool.store.request.tp;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+ * <p>
+ * 申请单批量审批Request
+ * </p>
+ *
+ * @author wangff
+ * @since 2026/1/20
+ */
+@Data
+public class TpBatchAuditRequest {
+    @ApiModelProperty("申请单类型")
+    @NotNull(message = "申请单类型不能为空")
+    private Integer type;
+
+    @ApiModelProperty("审批状态 1通过 2拒绝")
+    @NotNull(message = "审批状态不能为空")
+    private Integer auditStatus;
+
+    @ApiModelProperty("申请单id列表")
+    @NotEmpty(message = "申请单id不能为空")
+    private List<Long> applyIds;
+
+    @ApiModelProperty("备注")
+    private String remark;
+}

coolstore-partner-model/src/main/java/com/cool/store/request/tp/TpRuleEnableRequest.java

@@ -0,0 +1,27 @@
+package com.cool.store.request.tp;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+ * <p>
+ * 十二分规则启用Request
+ * </p>
+ *
+ * @author wangff
+ * @since 2025/12/25
+ */
+@Data
+public class TpRuleEnableRequest {
+    @ApiModelProperty("规则id列表")
+    @NotEmpty(message = "规则id列表不能为空")
+    private List<Long> ruleIds;
+
+    @ApiModelProperty("是否启用，0禁用 1启用")
+    @NotNull(message = "是否启用不能为空")
+    private Integer status;
+}

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

@@ -0,0 +1,40 @@
+package com.cool.store.vo.store;
+
+import com.cool.store.enums.StoreStatusEnum;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ * 门店列表VO
+ * </p>
+ *
+ * @author wangff
+ * @since 2025/12/29
+ */
+@Data
+public class StoreListVO {
+    @ApiModelProperty("门店ID")
+    private String storeId;
+
+    @ApiModelProperty("门店名称")
+    private String storeName;
+
+    @ApiModelProperty("门店编号")
+    private String storeNum;
+
+    @ApiModelProperty("门店状态")
+    private String storeStatus;
+
+    @ApiModelProperty("门店状态名称")
+    private String storeStatusName;
+
+    @ApiModelProperty("门店积分")
+    private BigDecimal score;
+
+    public String getStoreStatusName() {
+        return StoreStatusEnum.getName(this.storeStatus);
+    }
+}

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

@@ -1,6 +1,7 @@
 package com.cool.store.vo.tp;
 
 import com.cool.store.annotation.DictField;
+import com.cool.store.enums.tp.TpFormStatusEnum;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -56,4 +57,14 @@ public class TpAppealFormDetailVO {
     
     @ApiModelProperty("处罚单")
     private TpPenaltyApplyDetailVO penaltyDetail;
+
+    @ApiModelProperty("状态")
+    private String status;
+
+    @ApiModelProperty("状态名称")
+    private String statusName;
+
+    public String getStatusName() {
+        return TpFormStatusEnum.getMsgByStatus(this.status);
+    }
 }

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

@@ -0,0 +1,37 @@
+package com.cool.store.vo.tp;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * <p>
+ * 申请单批量审批结果VO
+ * </p>
+ *
+ * @author wangff
+ * @since 2026/1/20
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class TpBatchAuditVO {
+    @ApiModelProperty("id")
+    private Long applyId;
+
+    @ApiModelProperty("申请单号")
+    private String applyNo;
+
+    @ApiModelProperty("审批结果，1审批成功 2审批失败")
+    private Integer status;
+
+    @ApiModelProperty("失败原因")
+    private String failReason;
+
+    public TpBatchAuditVO(Long applyId, Integer status, String failReason) {
+        this.applyId = applyId;
+        this.status = status;
+        this.failReason = failReason;
+    }
+}

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

@@ -50,4 +50,10 @@ public class TpPenaltyRuleListVO {
 
     @ApiModelProperty("启用状态，0未启用 1启用")
     private Integer status;
+
+    @ApiModelProperty("项目描述")
+    private String remark;
+
+    @ApiModelProperty("复议申请时效")
+    private Integer appealDeadline;
 }

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

@@ -85,7 +85,7 @@ public class TpScoreJournalVO {
         return BrandTypeEnum.getDescByCode(this.joinBrand);
     }
 
-    public String getJoinModelNam() {
+    public String getJoinModelName() {
         return JoinModeEnum.getDescByCode(this.joinModel);
     }
 

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

@@ -0,0 +1,30 @@
+package com.cool.store.vo.tp;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ * 门店积分VO
+ * </p>
+ *
+ * @author wangff
+ * @since 2026/1/9
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class TpStoreScoreVO {
+    @ApiModelProperty("门店名称")
+    private String storeName;
+
+    @ApiModelProperty("门头照")
+    private String avatar;
+
+    @ApiModelProperty("积分")
+    private BigDecimal score;
+}

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

@@ -1,6 +1,7 @@
 package com.cool.store.vo.tp.mini;
 
 import com.cool.store.annotation.DictField;
+import com.cool.store.enums.tp.TpFormStatusEnum;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -35,4 +36,14 @@ public class MiniTpAppealVO {
 
     @ApiModelProperty("证明材料")
     private String proofUrls;
+
+    @ApiModelProperty("状态")
+    private String status;
+
+    @ApiModelProperty("状态名称")
+    private String statusName;
+
+    public String getStatusName() {
+        return TpFormStatusEnum.getMsgByStatus(this.status);
+    }
 }

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

@@ -66,6 +66,9 @@ public class MiniTpPenaltyApplyVO {
     @ApiModelProperty("复议申请")
     private MiniTpAppealVO appeal;
 
+    @ApiModelProperty("金额")
+    private BigDecimal amount;
+
     public String getStatusName() {
         return TpFormStatusEnum.getMsgByStatus(this.status);
     }