退款增加金额校验，增加售后撤销功能

ghy-admin/src/main/java/com/ghy/web/controller/order/AfterServiceRecordController.java

@@ -1,9 +1,11 @@
 package com.ghy.web.controller.order;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import com.ghy.order.service.OrderDetailService;
+import com.ghy.payment.domain.FinancialDetail;
+import com.ghy.payment.service.FinancialDetailService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -34,7 +36,7 @@ public class AfterServiceRecordController extends BaseController
     private IAfterServiceRecordService afterServiceRecordService;
 
     @Autowired
-    private OrderDetailService orderDetailService;
+    private FinancialDetailService financialDetailService;
 
     @RequiresPermissions("worker:record:view")
     @GetMapping()
@@ -111,6 +113,11 @@ public class AfterServiceRecordController extends BaseController
     @ResponseBody
     public AjaxResult addSave(@RequestBody AfterServiceRecord afterServiceRecord)
     {
+        FinancialDetail financialDetail = financialDetailService.selectByOrderDetailId(afterServiceRecord.getOrderDetailId());
+        if ((afterServiceRecord.getRefund() != null && afterServiceRecord.getRefund().compareTo(financialDetail.getPayMoney()) > 0)
+            || (afterServiceRecord.getAgreedRefund() != null && afterServiceRecord.getAgreedRefund().compareTo(financialDetail.getPayMoney()) > 0)) {
+            return AjaxResult.error("退款金额超出子单最大可退金额");
+        }
         return toAjax(afterServiceRecordService.insertAfterServiceRecord(afterServiceRecord));
     }
 
@@ -140,7 +147,7 @@ public class AfterServiceRecordController extends BaseController
     /**
      * 删除售后记录
      */
-    @RequiresPermissions("worker:record:remove")
+//    @RequiresPermissions("worker:record:remove")
     @Log(title = "售后记录", businessType = BusinessType.DELETE)
     @PostMapping( "/remove")
     @ResponseBody

ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java

@@ -29,8 +29,10 @@ import com.ghy.order.service.IAfterServiceRecordService;
 import com.ghy.order.service.OrderDetailService;
 import com.ghy.order.service.OrderGoodsService;
 import com.ghy.order.service.OrderMasterService;
+import com.ghy.payment.domain.FinancialDetail;
 import com.ghy.payment.domain.FinancialMaster;
 import com.ghy.payment.domain.OrderTimeoutRecord;
+import com.ghy.payment.service.FinancialDetailService;
 import com.ghy.payment.service.FinancialMasterService;
 import com.ghy.payment.service.OrderFineRecordService;
 import com.ghy.system.domain.SysArea;
@@ -52,6 +54,7 @@ import org.springframework.ui.ModelMap;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -88,6 +91,8 @@ public class OrderMasterController extends BaseController {
     @Autowired
     private FinancialMasterService financialMasterService;
     @Autowired
+    private FinancialDetailService financialDetailService;
+    @Autowired
     private GoodsStandardService goodsStandardService;
     @Autowired
     private OrderFineRecordService orderFineRecordService;
@@ -614,11 +619,15 @@ public class OrderMasterController extends BaseController {
                     workerName = workerRealInfo == null ? worker.getName() : workerRealInfo.getName();
                 }
 
+                // 查询子财务单金额
+                FinancialDetail financialDetail = financialDetailService.selectByOrderDetailId(detail.getId());
+
                 OrderStandardDetail detailRes = new OrderStandardDetail();
                 detailRes.setOrderDetailId(detail.getId());
                 detailRes.setOrderDetailCode(detail.getCode());
                 detailRes.setWorkerName(workerName);
                 detailRes.setRemark(workerName + "(" + detail.getCode() + ")");
+                detailRes.setPayMoney(financialDetail != null ? financialDetail.getPayMoney() : new BigDecimal(0));
                 orderStandardDetails.add(detailRes);
             });
             return AjaxResult.success(orderStandardDetails);

ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderStandardDetail.java

@@ -3,6 +3,7 @@ package com.ghy.web.pojo.vo;
 import com.ghy.order.domain.AfterServiceRecord;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -27,6 +28,8 @@ public class OrderStandardDetail {
 
     private Date workFinishTime;
 
+    private BigDecimal payMoney;
+
     private String remark;
 
     private List<OrderStandard> orderStandardList;

ghy-order/src/main/resources/mapper/order/AfterServiceRecordMapper.xml

@@ -109,11 +109,11 @@
     </update>
 
     <delete id="deleteAfterServiceRecordById" parameterType="String">
-        delete from after_service_record where id = #{id}
+        delete from after_service_record where customer_final_check != 1 and id = #{id}
     </delete>
 
     <delete id="deleteAfterServiceRecordByIds" parameterType="String">
-        delete from after_service_record where id in
+        delete from after_service_record where customer_final_check != 1 and id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>