10.11 修改实体类

src/main/java/com/example/demo/controller/cash/CashRefundController.java

@@ -3,6 +3,7 @@ package com.example.demo.controller.cash;
 import com.example.demo.Util.JWTUtil;
 import com.example.demo.domain.entity.Admin;
 import com.example.demo.domain.vo.cash.CashCollection;
+import com.example.demo.domain.vo.cash.CashRecordDone;
 import com.example.demo.domain.vo.coin.Page;
 import com.example.demo.domain.vo.coin.Result;
 import com.example.demo.service.coin.MarketService;
@@ -59,35 +60,35 @@ public class CashRefundController {
         }
 
 // 获取传入的市场列表
-        List<String> requestedMarkets = page.getGoldDetail() != null ? page.getGoldDetail().getMarkets() : null;
+        List<String> requestedMarkets = page.getCashRecordDone() != null ? page.getCashRecordDone().getMarkets() : null;
 
 // 权限校验逻辑
         if (markets.contains("9") || markets.contains("9999")) {
             // 特权市场：9 或 9999，跳过权限校验，直接放行传入的 markets
             // 如果业务需要，也可以在这里做空值处理
-            if (page.getGoldDetail() != null) {
+            if (page.getCashRecordDone() != null) {
                 // 保持 requestedMarkets 不变，原样接受
                 // 可选：如果 requestedMarkets 为 null，可设为默认值或保持 null
             }
         } else {
             // 普通用户：必须校验权限
             if (requestedMarkets == null || requestedMarkets.isEmpty()) {
-                page.getGoldDetail().setMarkets(requestedMarkets);
+                page.getCashRecordDone().setMarkets(requestedMarkets);
             }
             if (!markets.containsAll(requestedMarkets)) {
                 return Result.error("无权限！请求的市场不在授权范围内。");
             }
             // 校验通过，保持 requestedMarkets 不变
         }
-       return Result.success(cashRefundServiceImpl.select(page.getPageNum(),page.getPageSize(),page.getCashCollection()));
+       return Result.success(cashRefundServiceImpl.select(page.getPageNum(),page.getPageSize(),page.getCashRecordDone()));
     }
     @PostMapping("/add")
-    public Result add(@RequestBody CashCollection cashCollection){
+    public Result add(@RequestBody CashRecordDone cashCollection){
         return Result.success(cashRefundServiceImpl.add(cashCollection));
     }
     @PostMapping("/update")
-    public Result update(@RequestBody CashCollection cashCollection){
-        return Result.success(cashRefundServiceImpl.update(cashCollection));
+    public Result update(@RequestBody CashRecordDone cashRecordDone){
+        return Result.success(cashRefundServiceImpl.update(cashRecordDone));
     }
 //    @PostMapping("/local")
 //    public Result local(@RequestBody CashCollection cashCollection){

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

@@ -0,0 +1,96 @@
+package com.example.demo.domain.vo.cash;
+
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 现金记录-已完成
+ */
+@Data
+
+public class CashRecordDone {
+    /** 序号 */
+    private Integer id;
+    /** 订单类型：1收款 2退款 */
+    private Integer orderType;
+    /** 精网号 */
+    private Integer jwcode;
+    /** 姓名 */
+    private String name;
+    /** 所属地区 */
+    private String market;
+    private List<String> markets;
+    /** 活动名称 */
+    private String activity;
+    /** 金币订单号 */
+    private String orderCode;
+    /** 银行流水订单号 */
+    private String bankCode;
+    /** 商品名称 */
+    private String goodsName;
+    /** 付款币种 */
+    private String paymentCurrency;
+    /** 付款金额 */
+    private BigDecimal paymentAmount;
+    /** 到账币种 */
+    private String receivedCurrency;
+    /** 到账金额 */
+    private BigDecimal receivedAmount;
+    /** 手续费 */
+    private BigDecimal handlingCharge;
+    /** 支付方式 */
+    private String payType;
+    /** 到账地区 */
+    private String receivedMarket;
+    /** 商品数量 */
+    private Integer goodsNum;
+    /** 付款时间 */
+    private LocalDateTime payTime;
+    /** 到账时间 */
+    private LocalDateTime receivedTime;
+    /** 提交人id */
+    private Integer submitterId;
+    /** 转账凭证 */
+    private String voucher;
+    /** 备注 */
+    private String remark;
+    /** 驳回理由 */
+    private String rejectReason;
+    /** 退款备注（客服写） */
+    private String refundReason;
+    /** 退款方式：全额/部分 */
+    private Integer refundModel;
+    /** 执行人OA号 */
+    private Integer executor;
+    /** 退款途径 */
+    private String refundChannels;
+    /** 退款币种 */
+    private String refundCurrency;
+    /** 退款金额 */
+    private BigDecimal refundAmount;
+    /** 退款日期（到天） */
+    private LocalDateTime refundTime;
+    /** 退款备注（执行人写） */
+    private String refundRemark;
+    /** 退款截图 */
+    private String refundVoucher;
+    /** 创建时间 */
+    private LocalDateTime createTime;
+    /** 更新时间 */
+    private LocalDateTime updateTime;
+    @ExcelIgnore
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
+    private Date startTime; // 开始时间
+    @ExcelIgnore
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
+    private Date endTime;   // 结束时间
+    private String submitterName;
+    private String auditName;
+}

src/main/java/com/example/demo/domain/vo/coin/Page.java

@@ -3,6 +3,7 @@ package com.example.demo.domain.vo.coin;
 import com.example.demo.domain.entity.User;
 import com.example.demo.domain.vo.bean.*;
 import com.example.demo.domain.vo.cash.CashCollection;
+import com.example.demo.domain.vo.cash.CashRecordDone;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -42,4 +43,5 @@ public class Page {
     private BeanAuditInfo beanAuditInfo;    //金豆审核信息
     private HistoryRecord historyRecord; //历史记录
     private CashCollection cashCollection;  //现金收款
+    private CashRecordDone cashRecordDone;
 }

src/main/java/com/example/demo/mapper/cash/CashRefundMapper.java

@@ -1,6 +1,7 @@
 package com.example.demo.mapper.cash;
 
 import com.example.demo.domain.vo.cash.CashCollection;
+import com.example.demo.domain.vo.cash.CashRecordDone;
 import com.example.demo.domain.vo.coin.RefundUser;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -16,7 +17,7 @@ import java.util.List;
  **/
 @Mapper
 public interface CashRefundMapper {
-    List<CashCollection> select(CashCollection cashCollection);
-    int update(CashCollection cashCollection);
-    int insert(CashCollection cashCollection);
+    List<CashCollection> select(CashRecordDone cashRecordDone);
+    int update(CashRecordDone cashCollection);
+    int insert(CashRecordDone cashCollection);
 }

src/main/java/com/example/demo/service/cash/RefundService.java

@@ -1,6 +1,7 @@
 package com.example.demo.service.cash;
 
 import com.example.demo.domain.vo.cash.CashCollection;
+import com.example.demo.domain.vo.cash.CashRecordDone;
 import com.github.pagehelper.PageInfo;
 
 /**
@@ -12,8 +13,8 @@ import com.github.pagehelper.PageInfo;
  * @Version 1.0
  **/
 public interface RefundService {
-    PageInfo<CashCollection> select(Integer pageNum, Integer pageSize,CashCollection cashCollection);
-    int add(CashCollection cashCollection);
-    int update(CashCollection cashCollection);
+    PageInfo<CashCollection> select(Integer pageNum, Integer pageSize, CashRecordDone cashRecordDone);
+    int add(CashRecordDone cashRecordDone);
+    int update(CashRecordDone cashRecordDone);
 
 }

src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java

@@ -1,6 +1,7 @@
 package com.example.demo.serviceImpl.cash;
 
 import com.example.demo.domain.vo.cash.CashCollection;
+import com.example.demo.domain.vo.cash.CashRecordDone;
 import com.example.demo.mapper.cash.CashRefundMapper;
 import com.example.demo.service.cash.RefundService;
 import com.github.pagehelper.PageHelper;
@@ -25,20 +26,20 @@ public class CashRefundServiceImpl implements RefundService {
     @Autowired
     private CashRefundMapper cashRefundMapper;
     @Override
-    public PageInfo<CashCollection> select(Integer pageNum, Integer pageSize,CashCollection cashCollection) {
+    public PageInfo<CashCollection> select(Integer pageNum, Integer pageSize,CashRecordDone cashRecordDone) {
         PageHelper.startPage(pageNum, pageSize);
 //        System.out.println(goldDetail.getMarkets());
-        List<CashCollection> list = cashRefundMapper.select(cashCollection);
+        List<CashCollection> list = cashRefundMapper.select(cashRecordDone);
         return new PageInfo<>(list);
     }
 
     @Override
-    public int add(CashCollection cashCollection) {
-        return cashRefundMapper.insert(cashCollection);
+    public int add(CashRecordDone cashRecordDone) {
+        return cashRefundMapper.insert(cashRecordDone);
     }
 
     @Override
-    public int update(CashCollection cashCollection) {
-        return cashRefundMapper.update(cashCollection);
+    public int update(CashRecordDone cashRecordDone) {
+        return cashRefundMapper.update(cashRecordDone);
     }
 }

src/main/resources/cashMapper/CashRefundMapper.xml

@@ -102,7 +102,7 @@ status = #{status},
     </update>
 
 
-    <select id="select" resultType="com.example.demo.domain.vo.cash.CashCollection">
+    <select id="select" resultType="com.example.demo.domain.vo.cash.CashRecordDone">
         select
             id,
             order_type,
@@ -149,10 +149,10 @@ status = #{status},
         <if test="jwcode != null">
             and jwcode = #{jwcode}
         </if>
-            <if test="market!= null and market.size > 0">
-                AND user.market IN
-                <foreach collection="market" item="market" open="(" separator="," close=")">
-                    #{market}
+            <if test="markets!= null and markets.size > 0">
+                AND market IN
+                <foreach collection="markets" item="markets" open="(" separator="," close=")">
+                    #{markets}
                 </foreach>
             </if>
         <if test="goodsName != null and goodName.size>0">