消息推送更新（11.13）

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){

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);
 }

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<CashCollection> 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);
     //根据精网号获取市场名

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<CashCollection> selectCollection(Integer pageNum, Integer pageSize, CashCollection cashCollection);
     //补全手续费等
-    String complete(CashCollection cashRecord);
+    String complete(CashRecord cashRecord);
     //根据精网号获取姓名和地区
     User getNameAndMarket(Integer jwcode);
     //获取活动列表

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

@@ -354,4 +354,17 @@ public class CashRefundServiceImpl implements RefundService {
         List<CashRecordDTO> list = cashRefundMapper.financeSelect(cashRecordDTO);
         return new PageInfo<>(list);
     }
+
+    @Override
+    public PageInfo<CashRecordDTO> exSelect(Integer pageNum, Integer pageSize, CashRecordDTO cashRecordDTO) {
+        PageHelper.startPage(pageNum, pageSize);
+        List<CashRecordDTO> list = cashRefundMapper.exSelect(cashRecordDTO);
+        return new PageInfo<>(list);
+    }
+
+
+    @Override
+    public void addOnline(CashRecordRefund cashRecordRefund) {
+
+    }
 }