From 9e84212c6e55e6ce55c068a2535e6e4b6b8f8e31 Mon Sep 17 00:00:00 2001 From: wangguorui <2069821375@qq.com> Date: Thu, 13 Nov 2025 11:01:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=8E=A8=E9=80=81=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=EF=BC=8811.13=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../demo/controller/cash/CashCollectionController.java | 4 ++-- .../java/com/example/demo/mapper/cash/CashAuditMapper.java | 4 +--- .../com/example/demo/mapper/cash/CashCollectionMapper.java | 5 ++--- .../example/demo/service/cash/CashCollectionService.java | 4 ++-- .../demo/serviceImpl/cash/CashRefundServiceImpl.java | 13 +++++++++++++ 5 files changed, 20 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/example/demo/controller/cash/CashCollectionController.java b/src/main/java/com/example/demo/controller/cash/CashCollectionController.java index 8850388..51cb578 100644 --- a/src/main/java/com/example/demo/controller/cash/CashCollectionController.java +++ b/src/main/java/com/example/demo/controller/cash/CashCollectionController.java @@ -78,7 +78,7 @@ public class CashCollectionController { } //重新提交审核的收款订单 @PostMapping("/reSubmit") - public Result reSubmit(@RequestBody CashCollection cashRecord) { + public Result reSubmit(@RequestBody CashRecord cashRecord) { try { return Result.success(cashCollectionService.reSubmit(cashRecord)); }catch (Exception e){ @@ -128,7 +128,7 @@ public class CashCollectionController { //补全手续费等 @PostMapping("/complete") - public Result complete(@RequestBody CashCollection cashRecord) { + public Result complete(@RequestBody CashRecord cashRecord) { try { return Result.success(cashCollectionService.complete(cashRecord)); }catch (Exception e){ diff --git a/src/main/java/com/example/demo/mapper/cash/CashAuditMapper.java b/src/main/java/com/example/demo/mapper/cash/CashAuditMapper.java index f92f221..2353234 100644 --- a/src/main/java/com/example/demo/mapper/cash/CashAuditMapper.java +++ b/src/main/java/com/example/demo/mapper/cash/CashAuditMapper.java @@ -1,9 +1,7 @@ package com.example.demo.mapper.cash; import com.example.demo.domain.entity.CashRecord; -import com.example.demo.domain.vo.cash.CashCollection; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; /** * @program: gold-java @@ -16,7 +14,7 @@ import org.apache.ibatis.annotations.Param; @Mapper public interface CashAuditMapper { //审核收款订单 - void updateOrder (CashCollection updateOrder); + void updateOrder (CashRecord updateOrder); //根据id获取审核人姓名 String getAuditName(Integer auditId); } diff --git a/src/main/java/com/example/demo/mapper/cash/CashCollectionMapper.java b/src/main/java/com/example/demo/mapper/cash/CashCollectionMapper.java index f55f4f1..9ecd2c9 100644 --- a/src/main/java/com/example/demo/mapper/cash/CashCollectionMapper.java +++ b/src/main/java/com/example/demo/mapper/cash/CashCollectionMapper.java @@ -1,6 +1,5 @@ package com.example.demo.mapper.cash; -import cn.hutool.core.lang.Opt; import com.example.demo.domain.entity.CashRecord; import com.example.demo.domain.entity.GOrder; import com.example.demo.domain.entity.RechargeActivity; @@ -34,7 +33,7 @@ public interface CashCollectionMapper { @Param("status") Integer status); //编辑订单 // 编辑订单（状态=5）后重新提交 - int updateByOrderCode(@Param("cashRecordCollection") CashCollection cashRecord); + int updateByOrderCode(@Param("cashRecordCollection") CashRecord cashRecord); //多条件查询收款订单列表 List selectCollection1(@Param("pageNum") Integer pageNum, @Param("pageSize") Integer pageSize, @@ -43,7 +42,7 @@ public interface CashCollectionMapper { //根据订单号查询待审核的现金收款订单 CashRecord selectAuditByOrderCode(@Param("orderCode") String orderCode); //补全手续费等信息 - int complete(@Param("cashRecordCollection") CashCollection cashRecord); + int complete(@Param("cashRecordCollection") CashRecord cashRecord); //根据精网号获取姓名 String getNameByJwcode(@Param("jwcode") Integer jwcode); //根据精网号获取市场名 diff --git a/src/main/java/com/example/demo/service/cash/CashCollectionService.java b/src/main/java/com/example/demo/service/cash/CashCollectionService.java index 45a7628..81a1226 100644 --- a/src/main/java/com/example/demo/service/cash/CashCollectionService.java +++ b/src/main/java/com/example/demo/service/cash/CashCollectionService.java @@ -24,11 +24,11 @@ public interface CashCollectionService { //撤回未审核的收款订单 String cancel(String orderCode); //编辑并重新提交收款订单 - String reSubmit(CashCollection cashRecord); + String reSubmit(CashRecord cashRecord); //多条件查询收款订单列表 PageInfo selectCollection(Integer pageNum, Integer pageSize, CashCollection cashCollection); //补全手续费等 - String complete(CashCollection cashRecord); + String complete(CashRecord cashRecord); //根据精网号获取姓名和地区 User getNameAndMarket(Integer jwcode); //获取活动列表 diff --git a/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java index d89ded6..d1f0578 100644 --- a/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java @@ -354,4 +354,17 @@ public class CashRefundServiceImpl implements RefundService { List list = cashRefundMapper.financeSelect(cashRecordDTO); return new PageInfo<>(list); } + + @Override + public PageInfo exSelect(Integer pageNum, Integer pageSize, CashRecordDTO cashRecordDTO) { + PageHelper.startPage(pageNum, pageSize); + List list = cashRefundMapper.exSelect(cashRecordDTO); + return new PageInfo<>(list); + } + + + @Override + public void addOnline(CashRecordRefund cashRecordRefund) { + + } }