查询运单取消违约金额

performance-api/src/main/java/com/clx/performance/param/app/OrderChildDriverCancelParam.java

@@ -6,6 +6,7 @@ import lombok.NoArgsConstructor;
 import lombok.Setter;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 @Getter
 @Setter
@@ -20,4 +21,7 @@ public class OrderChildDriverCancelParam extends PositionParam {
     @NotBlank(message = "取消原因不能为空")
     private String remark;
 
+    @ApiModelProperty(value = "图片列表")
+    private List<String> imageList;
+
 }

performance-web/src/main/java/com/clx/performance/controller/app/breakcontract/AppDriverBreakContractDriverRecordController.java

@@ -14,10 +14,9 @@ import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.math.BigDecimal;
 
 
 @Slf4j
@@ -43,4 +42,10 @@ public class AppDriverBreakContractDriverRecordController {
         return Result.page(page.getRecords(), page.getTotal(), page.getPages());
     }
 
+    @ApiOperation(value = "查询运单取消违约金额", notes = "<br>By:艾庆国")
+    @GetMapping("/getOrderChildCancelBreakContractFigure")
+    public Result<BigDecimal> getBreakContractFigure(String childNo) {
+        return Result.ok(breakContractDriverRecordService.getBreakContractFigure(childNo));
+    }
+
 }

performance-web/src/main/java/com/clx/performance/service/breakcontract/BreakContractDriverRecordService.java

@@ -8,6 +8,8 @@ import com.clx.performance.param.pc.breakcontract.carrier.PageBreakContractDrive
 import com.clx.performance.vo.app.breakcontract.DriverBreakContractDriverRecordVO;
 import com.clx.performance.vo.pc.breakcontract.carrier.BreakContractDriverRecordVO;
 
+import java.math.BigDecimal;
+
 /**
  * @author liruixin
  * Date 2023-10-24
@@ -27,4 +29,7 @@ public interface BreakContractDriverRecordService  {
 
     void saveDriverRecordOfArriveReceiveAddress(OrderChild orderChild, Long createBy, String createName);
 
+
+    BigDecimal getBreakContractFigure(String childNo);
+
 }

performance-web/src/main/java/com/clx/performance/service/impl/breakcontract/BreakContractDriverRecordServiceImpl.java

@@ -224,6 +224,21 @@ public class BreakContractDriverRecordServiceImpl  implements BreakContractDrive
         breakContractMqService.driverRecordAdd(record.getId());
     }
 
+    @Override
+    public BigDecimal getBreakContractFigure(String childNo) {
+        OrderChild orderChild = orderChildDao.getByChildNo(childNo).orElseThrow(PerformanceResultEnum.ORDER_CHILD_NO_FOUND);
+        BreakContractDriverRule rule = breakContractDriverRuleDao.getEntityByKey(1).orNull();
+        if (rule == null) {return BigDecimal.ZERO;}
+
+        BreakContractDriverRuleVO breakContractDriverRuleVO = JSON.parseObject(rule.getRuleJson(), BreakContractDriverRuleVO.class);
+        orderChild.setCancelTime(LocalDateTime.now());
+
+        // 费用计算
+        BigDecimal figure = orderChildCancelFigureCalc(orderChild, breakContractDriverRuleVO);
+
+        return figure.movePointLeft(2);
+    }
+
     /**
      * 费用计算 （运单取消）
      */