1.新增罚款记录批量确认接口

2.新增罚款退款记录批量更新状态接口

biz-base/src/main/java/com/dayou/controller/FinanceFineController.java

@@ -80,6 +80,15 @@ public class FinanceFineController extends BaseController {
     }
 
     /**
+     * 批量确认罚款金额
+     * @return Boolean
+     */
+    @PutMapping("/confirm/batch")
+    public RestResponse<Boolean> batchConfirmFineAmount(@RequestBody List<Long> ids) {
+       return RestResponse.data(financeFineService.batchConfirmFineAmount(ids));
+    }
+
+    /**
      * 超期未收款罚款表详情
      */
     @GetMapping("/{id}")

biz-base/src/main/java/com/dayou/controller/FinanceFineRefundController.java

@@ -103,6 +103,16 @@ public class FinanceFineRefundController extends BaseController {
     }
 
     /**
+     * 批量更新罚款记录状态
+     * @param financeFineRefunds 更新内容
+     * @return Boolean
+     */
+    @PutMapping("/updateStatus/batch")
+    public RestResponse<Boolean> batchUpdateStatus(@RequestBody List<FinanceFineRefund> financeFineRefunds) {
+        return RestResponse.data(financeFineRefundService.batchUpdateStatus(financeFineRefunds));
+    }
+
+    /**
      * 罚款退款表删除
      */
     @DeleteMapping("/{id}")

biz-base/src/test/java/fine/FineTests.java

@@ -1,25 +1,25 @@
-package fine;
-
-import com.dayou.BaseApplication;
-import com.dayou.service.IFinanceFineService;
-import lombok.extern.slf4j.Slf4j;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-@Slf4j
-@SpringBootTest(classes = BaseApplication.class)
-@RunWith(value = SpringJUnit4ClassRunner.class)
-public class FineTests {
-
-    @Autowired
-    private IFinanceFineService financeFineService;
-
-    @Test
-    public void testCompileFineOrder() {
-        financeFineService.compileFineOrder();
-    }
-
-}
+//package fine;
+//
+//import com.dayou.BaseApplication;
+//import com.dayou.service.IFinanceFineService;
+//import lombok.extern.slf4j.Slf4j;
+//import org.junit.Test;
+//import org.junit.runner.RunWith;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.boot.test.context.SpringBootTest;
+//import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+//
+//@Slf4j
+//@SpringBootTest(classes = BaseApplication.class)
+//@RunWith(value = SpringJUnit4ClassRunner.class)
+//public class FineTests {
+//
+//    @Autowired
+//    private IFinanceFineService financeFineService;
+//
+//    @Test
+//    public void testCompileFineOrder() {
+//        financeFineService.compileFineOrder();
+//    }
+//
+//}

dao/src/main/java/com/dayou/mapper/FinanceFineMapper.java

@@ -45,6 +45,12 @@ public interface FinanceFineMapper extends CustomBaseMapper<FinanceFine> {
     Boolean confirmFineAmount(@Param("id") Long id);
 
     /**
+     * 根据id批量确认罚款金额
+     * @return Boolean
+     */
+    Boolean batchConfirmFineAmount(@Param("ids") List<Long> ids);
+
+    /**
      * 获取逾期资产产品款项信息(不包含预评)
      * @return List<CompileFineAssetsOrder>
      */

dao/src/main/resources/mapper/FinanceFineMapper.xml

@@ -141,6 +141,18 @@
         AND id = #{id}
     </update>
 
+    <!--根据id批量确认罚款金额-->
+    <update id="batchConfirmFineAmount">
+        UPDATE finance_fine
+        SET real_fine_amount = fine_amount,
+            status = 1
+        WHERE deleted = 0
+        AND id IN
+        <foreach collection="ids" open="(" close=")" separator="," item="id">
+            #{id}
+        </foreach>
+    </update>
+
     <!--获取逾期资产产品款项信息-->
     <select id="getAssetsOrder" resultType="com.dayou.vo.CompileFineAssetsOrder">
         SELECT

service/src/main/java/com/dayou/service/IFinanceFineRefundService.java

@@ -54,6 +54,13 @@ public interface IFinanceFineRefundService extends IService<FinanceFineRefund> {
          */
         Boolean updateStatus(FinanceFineRefund financeFineRefund);
 
+        /**
+         * 批量更新罚款记录状态
+         * @param financeFineRefunds 更新内容
+         * @return Boolean
+         */
+        Boolean batchUpdateStatus(List<FinanceFineRefund> financeFineRefunds);
+
         Boolean delete(Long id);
 
 }

service/src/main/java/com/dayou/service/IFinanceFineService.java

@@ -42,6 +42,12 @@ public interface IFinanceFineService extends IService<FinanceFine> {
      */
     Boolean confirmFineAmount(Long id);
 
+    /**
+     * 批量确认罚款金额
+     * @return Boolean
+     */
+    Boolean batchConfirmFineAmount(List<Long> ids);
+
     FinanceFine detail(Long id);
 
     Boolean add(FinanceFine financeFine);

service/src/main/java/com/dayou/service/impl/FinanceFineRefundServiceImpl.java

@@ -28,6 +28,8 @@ import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.List;
 import java.util.ArrayList;
@@ -121,6 +123,23 @@ public class FinanceFineRefundServiceImpl extends ServiceImpl<FinanceFineRefundM
         return this.updateById(financeFineRefund);
     }
 
+    /**
+     * 批量更新罚款记录状态
+     * @param financeFineRefunds 更新内容
+     * @return Boolean
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean batchUpdateStatus(List<FinanceFineRefund> financeFineRefunds) {
+        Long userId = LoginContext.getUserId();
+        LocalDateTime date = DateUtils.dateToLocalDateTime(new Date());
+        for (FinanceFineRefund refund : financeFineRefunds) {
+            refund.setUserId(userId);
+            refund.setRefundDate(date);
+        }
+        return this.updateBatchById(financeFineRefunds);
+    }
+
     @Override
     public Boolean delete(Long id){
         //逻辑删除

service/src/main/java/com/dayou/service/impl/FinanceFineServiceImpl.java

@@ -4,6 +4,8 @@ import cn.hutool.core.util.ObjectUtil;
 import com.dayou.dto.FinanceFineSelectDTO;
 import com.dayou.dto.SimplePostModel;
 import com.dayou.entity.FinanceFine;
+import com.dayou.exception.BusinessException;
+import com.dayou.exception.ErrorCode;
 import com.dayou.mapper.FinanceFineMapper;
 import com.dayou.service.IFinanceFineService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -82,6 +84,20 @@ public class FinanceFineServiceImpl extends ServiceImpl<FinanceFineMapper, Finan
         return financeFineMapper.confirmFineAmount(id);
     }
 
+    /**
+     * 批量确认罚款金额
+     * @return Boolean
+     */
+    @Override
+    public Boolean batchConfirmFineAmount(List<Long> ids) {
+        if (!ids.isEmpty()) {
+            return financeFineMapper.batchConfirmFineAmount(ids);
+        }else {
+            ErrorCode.throwBusinessException(ErrorCode.CUSTOM_ERROR,"未选择罚款记录!");
+        }
+        return Boolean.FALSE;
+    }
+
 
     @Override
     public FinanceFine detail(Long id) {