Merge branch 'milestone-20251104-现金管理二期' of http://39.101.133.168:8807/huangqizhen/gold-java into lijianlin/feature-20251104110749-现金管理二期

src/main/java/com/example/demo/domain/vo/cash/CashRecordDTO.java

@@ -1,6 +1,7 @@
 package com.example.demo.domain.vo.cash;
 
 import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -23,31 +24,52 @@ import java.util.List;
 @AllArgsConstructor
 @NoArgsConstructor
 public class  CashRecordDTO{
+    @ExcelIgnore
     private String activity;// 活动
+    @ExcelProperty("商品名称")
     private String goodsName;// 商品名称
+    @ExcelProperty("商品数量")
     private Integer goodsNum;// 商品数量
+    @ExcelProperty("商品单位")
     private String numUnit;// 商品单位
+    @ExcelIgnore
     private BigDecimal gold;//永久金币
+    @ExcelIgnore
     private BigDecimal free;//免费金币
+    @ExcelIgnore
     private String paymentCurrency;// 支付币种
+    @ExcelIgnore
     private BigDecimal paymentAmount;// 支付金额
+    @ExcelIgnore
     private String receivedCurrency;// 收款币种
+    @ExcelIgnore
     private BigDecimal receivedAmount;// 收款金额
+    @ExcelIgnore
     private BigDecimal handlingCharge;// 手续费
+    @ExcelIgnore
     private String payBankCode;// 付款银行
+    @ExcelIgnore
     private String payType;// 支付方式
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
+    @ExcelIgnore
     private LocalDateTime payTime;// 付款时间
+    @ExcelIgnore
     private String receivedMarket;// 收款地区
+    @ExcelIgnore
     private String payVoucher;// 支付凭证
+    @ExcelIgnore
     private String payRemark;// 支付备注
     //提交人
+    @ExcelIgnore
     private String paySubmitter;
     //提交人
+    @ExcelProperty("提交人")
     private String Submitter;
     //审核人
+    @ExcelIgnore
     private String audit;
     //到账日期
+    @ExcelIgnore
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private LocalDateTime receivedTime;
     @ExcelIgnore
@@ -59,42 +81,51 @@ public class  CashRecordDTO{
     /**
      * 序号
      */
+    @ExcelProperty("序号")
     private Integer id;
 
     /**
      * 精网号
      */
+    @ExcelProperty("精网号")
     private Integer jwcode;
 
     /**
      * 姓名
      */
+    @ExcelProperty("姓名")
     private String userName;
+    @ExcelIgnore
     private String name;
 
     /**
      * 所属地区
      */
+    @ExcelProperty("所属地区")
     private Integer market;
 
     /**
      * 金币订单号
      */
+    @ExcelIgnore
     private String orderCode;
 
     /**
      * 银行流水订单号
      */
+    @ExcelIgnore
     private String bankCode;
 
     /**
      * 永久金币
      */
+    @ExcelIgnore
     private BigDecimal permanentGold;
 
     /**
      * 免费金币
      */
+    @ExcelIgnore
     private BigDecimal freeGold;
 
     /**
@@ -115,6 +146,7 @@ public class  CashRecordDTO{
      30：总部财务待审核；32：总部财务驳回；
      40：执行人待处理；41：执行人已处理，退款结束
      */
+    @ExcelProperty("订单状态")
     private Integer status;
 
     /**
@@ -126,85 +158,101 @@ public class  CashRecordDTO{
     /**
      * 提交人地区
      */
+    @ExcelIgnore
     private String submitterMarket;
 
     /**
      * 转账凭证
      */
+    @ExcelIgnore
     private String voucher;
 
     /**
      * 备注
      */
+    @ExcelProperty("备注")
     private String remark;
 
     /**
      * 驳回理由
      */
+    @ExcelIgnore
     private String rejectReason;
 
     /**
      * 退款备注（理由）,客服填写
      */
+    @ExcelProperty("退款备注")
     private String refundReason;
 
     /**
      * 退款方式（0全额/1部分）
      */
+    @ExcelProperty("退款方式")
     private Integer refundModel;
 
     /**
      * 退款执行人OA号
      */
+    @ExcelIgnore
     private Integer executor;
 
     /**
      * 退款途径
      */
+    @ExcelIgnore
     private String refundChannels;
 
     /**
      * 退款日期（到天）
      */
+    @ExcelIgnore
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date refundTime;
 
     /**
      * 退款备注（执行人填写）
      */
+    @ExcelIgnore
     private String refundRemark;
 
     /**
      * 退款截图
      */
+    @ExcelIgnore
     private String refundVoucher;
 
     /**
      * 创建时间
      */
+    @ExcelIgnore
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date createTime;
 
     /**
      * 更新时间
      */
+    @ExcelIgnore
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date updateTime;
 
     /**
      * 审核时间
      */
+    @ExcelIgnore
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date auditTime;
 
     /**
      * 退款币种
      */
+    @ExcelIgnore
     private String refundCurrency;
 
     /**
      * 退款金额
      */
+    @ExcelIgnore
     private String refundAmount;
 
     /**
@@ -218,9 +266,13 @@ public class  CashRecordDTO{
     @ExcelIgnore
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date endTime;   // 结束时间
+    @ExcelIgnore
     private String submitterName;
+    @ExcelIgnore
     private String auditName;
+    @ExcelIgnore
     private String executorName;
+    @ExcelIgnore
     private String marketName;
     @ExcelIgnore
     private List<Integer> statuses;
@@ -229,9 +281,13 @@ public class  CashRecordDTO{
     @ExcelIgnore
     private String currentTaskId; // 当前任务ID
 
+    @ExcelIgnore
     private String areaServise;
+    @ExcelIgnore
     private String areaFinance;
+    @ExcelIgnore
     private String areaCharge;
+    @ExcelIgnore
     private String headFinance;
     @ExcelIgnore
     private String sortField;

src/main/java/com/example/demo/serviceImpl/coin/RechargeActivityCenterServiceImpl.java

@@ -11,6 +11,7 @@ import org.springframework.stereotype.Service;
 import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 import java.util.regex.Pattern;
 
 /**
@@ -28,7 +29,7 @@ public class RechargeActivityCenterServiceImpl implements RechargeActivityCenter
     @Autowired
     private RechargeActivityCenterMapper rechargeActivityCenterMapper;
 
-    private static final String ACTIVITY_NAME_REGEX = "^[\\u4e00-\\u9fa5a-zA-Z0-9，。！？、；：\"'（）《》【】——～,.:;!'()\\[\\]-_&+=]{1,50}$";
+    private static final String ACTIVITY_NAME_REGEX = "^[\\u4e00-\\u9fa5a-zA-Z0-9，。！？、；：\"'（）《》【】——～,.:;!'()\\[\\]-_&+=]{1,100}$";
     private static final Pattern ACTIVITY_NAME_PATTERN = Pattern.compile(ACTIVITY_NAME_REGEX);
     // 根据ID查询活动
     @Override
@@ -95,7 +96,7 @@ public class RechargeActivityCenterServiceImpl implements RechargeActivityCenter
             activity.setStatus("1");
         }
         rechargeActivityCenterMapper.updateActivity(activity);
-        if(activity.getBusinessBelong() == "客户归属地"){
+        if(Objects.equals(activity.getBusinessBelong(), "客户归属地")){
             rechargeActivityCenterMapper.updateActivityArea(activity);
         }
     }