超期罚款增加确认罚款

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

@@ -80,6 +80,15 @@ public class FinanceFineController extends BaseController {
     }
 
     /**
+     * 确认罚款金额
+     * @return Boolean
+     */
+    @PutMapping("/confirm/{id}")
+    public RestResponse<Boolean> confirmFineAmount(@PathVariable Long id) {
+        return RestResponse.data(financeFineService.confirmFineAmount(id));
+    }
+
+    /**
      * 批量取消确认罚款金额
      * @return Boolean
      */

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

@@ -85,4 +85,10 @@ public interface FinanceFineMapper extends CustomBaseMapper<FinanceFine> {
      */
     FinanceFine getFineByFundInfo(@Param("orderFundId") Long orderFundId, @Param("productionFundId") Long productionFundId);
 
+    /**
+     * 确认罚款
+     * @param id
+     * @return
+     */
+    Boolean confirmFineAmount(@Param("id") Long id);
 }

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

@@ -67,7 +67,7 @@
         fine.fine_amount AS fineAmount,
         fine.real_fine_amount AS realFineAmount,
         fine.status AS status,
-        fine.created AS punishDate,
+        fine.confirm_date AS punishDate,
         fine.`explain` AS `explain`,
         refund.id AS refundId
         FROM finance_fine AS fine
@@ -126,6 +126,7 @@
         <if test="dto != null and dto.startPunishDate != null and dto.endPunishDate!= null">
             AND fine.created BETWEEN #{dto.startPunishDate} AND #{dto.endPunishDate}
         </if>
+        order by fine.status DESC, fine.created DESC
     </sql>
 
     <!--分页查询超期罚款-->
@@ -141,8 +142,9 @@
     <!--确认罚款金额-->
     <update id="cancelFineAmount">
         UPDATE finance_fine
-        SET real_fine_amount = fine_amount,
-            status = 0
+        SET
+            status = 0,
+            confirm_date = null
         WHERE deleted = 0
         AND id = #{id}
     </update>
@@ -150,8 +152,9 @@
     <!--根据id批量确认罚款金额-->
     <update id="batchCancelFineAmount">
         UPDATE finance_fine
-        SET real_fine_amount = fine_amount,
-            status = 0
+        SET
+            status = 0,
+            confirm_date = null
         WHERE deleted = 0
         AND id IN
         <foreach collection="ids" open="(" close=")" separator="," item="id">
@@ -286,4 +289,14 @@
         </if>
     </select>
 
+    <update id="confirmFineAmount">
+        UPDATE finance_fine
+        SET
+            real_fine_amount = fine_amount,
+            status = 1,
+            confirm_date = now()
+        WHERE deleted = 0
+          AND id = #{id}
+    </update>
+
 </mapper>

domain/src/main/java/com/dayou/vo/FinanceFineVO.java

@@ -117,7 +117,7 @@ public class FinanceFineVO {
     /**
      * 是否确认
      */
-    @Excel(name = "是否确认", readConverterExp ="true=已确认,false=未确认")
+    @Excel(name = "是否确认", readConverterExp ="true=已确认,false=已取消")
     private Boolean status;
 
     /**

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

@@ -70,4 +70,10 @@ public interface IFinanceFineService extends IService<FinanceFine> {
      */
     FinanceFine getFineByFundInfo(Long orderFundId, Long productionFundId);
 
+    /**
+     * 确认罚款
+     * @param id
+     * @return
+     */
+    Boolean confirmFineAmount(Long id);
 }

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

@@ -265,4 +265,10 @@ public class FinanceFineServiceImpl extends ServiceImpl<FinanceFineMapper, Finan
         return financeFineMapper.getFineByFundInfo(orderFundId, productionFundId);
     }
 
+    @Override
+    public Boolean confirmFineAmount(Long id) {
+        return financeFineMapper.confirmFineAmount(id);
+    }
+
+
 }