新增违约记录

performance-api/src/main/java/com/clx/performance/param/pc/breakcontract/BreakContractDriverRecordAddParam.java

+package com.clx.performance.param.pc.breakcontract;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * @Author: aiqingguo
+ * @Date: 2023-10-11 17:30:57
+ * @Version: 1.0
+ */
+@Setter
+@Getter
+@ToString
+@NoArgsConstructor
+public class BreakContractDriverRecordAddParam {
+
+    @ApiModelProperty("违约方类型：1平台 2货主 3司机")
+    private Integer breachContractPartyType;
+
+    @ApiModelProperty("违约运单")
+    private String childNo;
+
+    @ApiModelProperty("违约金")
+    private BigDecimal figure;
+
+    @ApiModelProperty("接单时间限制（小时）")
+    private BigDecimal timeLimit;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+}

performance-api/src/main/java/com/clx/performance/param/pc/breakcontract/BreakContractOwnerRecordAddParam.java

+package com.clx.performance.param.pc.breakcontract;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * @Author: aiqingguo
+ * @Date: 2023-10-11 17:30:57
+ * @Version: 1.0
+ */
+@Setter
+@Getter
+@ToString
+@NoArgsConstructor
+public class BreakContractOwnerRecordAddParam {
+
+    @ApiModelProperty("违约方类型：1平台 2货主 3司机")
+    private Integer breachContractPartyType;
+
+    @ApiModelProperty("违约单")
+    private String orderNo;
+
+    @ApiModelProperty("违约金")
+    private BigDecimal figure;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+}

performance-api/src/main/java/com/clx/performance/param/pc/BreakContractRuleUpdateStatusParam.java → performance-api/src/main/java/com/clx/performance/param/pc/breakcontract/BreakContractRuleUpdateStatusParam.java

-package com.clx.performance.param.pc;
+package com.clx.performance.param.pc.breakcontract;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;

performance-web/src/main/java/com/clx/performance/controller/pc/breakcontract/CarrierBreakContractDriverRecordController.java

+package com.clx.performance.controller.pc.breakcontract;
+
+import com.clx.performance.param.pc.breakcontract.BreakContractDriverRecordAddParam;
+import com.clx.performance.service.breakcontract.BreakContractDriverRecordService;
+import com.clx.performance.service.breakcontract.BreakContractOwnerRecordService;
+import com.msl.common.result.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+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;
+
+
+@Slf4j
+@RestController
+@RequestMapping(value="/pc/carrier/breakContract/driver")
+@Validated
+@Api(tags = "承运端-货主违约管理")
+@AllArgsConstructor
+public class CarrierBreakContractDriverRecordController {
+
+    private final BreakContractDriverRecordService breakContractDriverRecordService;
+
+
+    @ApiOperation(value = "新增违约记录", notes = "<br>By:艾庆国")
+    @PostMapping("/saveRecord")
+    public Result<Void> saveRecord(@RequestBody @Validated BreakContractDriverRecordAddParam param) {
+        breakContractDriverRecordService.saveRecord(param);
+
+        return Result.ok();
+    }
+
+}

performance-web/src/main/java/com/clx/performance/controller/pc/breakcontract/CarrierBreakContractOwnerRecordController.java

+package com.clx.performance.controller.pc.breakcontract;
+
+import com.clx.performance.param.pc.breakcontract.BreakContractOwnerRecordAddParam;
+import com.clx.performance.service.breakcontract.BreakContractOwnerRecordService;
+import com.msl.common.result.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+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;
+
+
+@Slf4j
+@RestController
+@RequestMapping(value="/pc/carrier/breakContract/owner")
+@Validated
+@Api(tags = "承运端-货主违约管理")
+@AllArgsConstructor
+public class CarrierBreakContractOwnerRecordController {
+
+    private final BreakContractOwnerRecordService breakContractOwnerRecordService;
+
+
+    @ApiOperation(value = "新增违约记录", notes = "<br>By:艾庆国")
+    @PostMapping("/saveRecord")
+    public Result<Void> saveRecord(@RequestBody @Validated BreakContractOwnerRecordAddParam param) {
+        breakContractOwnerRecordService.saveRecord(param);
+
+        return Result.ok();
+    }
+
+}

performance-web/src/main/java/com/clx/performance/controller/pc/breakcontract/CarrierBreakContractRuleController.java

+package com.clx.performance.controller.pc.breakcontract;
+
+import com.clx.performance.param.pc.breakcontract.BreakContractRuleUpdateStatusParam;
+import com.clx.performance.service.breakcontract.BreakContractOwnerRuleService;
+import com.msl.common.result.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+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;
+
+
+@Slf4j
+@RestController
+@RequestMapping(value="/pc/carrier/breakContract")
+@Validated
+@Api(tags = "承运端-违约方案")
+@AllArgsConstructor
+public class CarrierBreakContractRuleController {
+
+    private final BreakContractOwnerRuleService breakContractOwnerRuleService;
+
+
+    @ApiOperation(value = "取消运单", notes = "<br>By:艾庆国")
+    @PostMapping("/updateStatus")
+    public Result<Void> updateStatus(@RequestBody @Validated BreakContractRuleUpdateStatusParam param) {
+        breakContractOwnerRuleService.updateStatus(param);
+
+        return Result.ok();
+    }
+
+}

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

 package com.clx.performance.service.breakcontract;
 
+import com.clx.performance.param.pc.breakcontract.BreakContractDriverRecordAddParam;
+
 /**
  * @author liruixin
  * Date 2023-10-24
  * Time 16:02
  */
 public interface BreakContractDriverRecordService  {
+
+    void saveRecord(BreakContractDriverRecordAddParam param);
 }

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

 package com.clx.performance.service.breakcontract;
 
+import com.clx.performance.param.pc.breakcontract.BreakContractOwnerRecordAddParam;
+
 /**
  * @author liruixin
  * Date 2023-10-24
  * Time 16:02
  */
 public interface BreakContractOwnerRecordService  {
+    void saveRecord(BreakContractOwnerRecordAddParam param);
+
 }

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

 package com.clx.performance.service.breakcontract;
 
-import com.clx.performance.param.pc.BreakContractRuleUpdateStatusParam;
+import com.clx.performance.param.pc.breakcontract.BreakContractRuleUpdateStatusParam;
 
 /**
  * @author liruixin

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

@@ -1827,4 +1827,15 @@ public class OrderChildServiceImpl implements OrderChildService {
         }
         return "--";
     }
+
+    private void takeOrderLimit(){
+
+    }
+
+    /**
+     * 运单取消回调
+     */
+    private void orderChildCancelCallback(OrderChild orderChild){
+
+    }
 }

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

 package com.clx.performance.service.impl.breakcontract;
 
+import com.clx.performance.dao.breakcontract.BreakContractDriverRecordDao;
+import com.clx.performance.dao.breakcontract.BreakContractOwnerRecordDao;
+import com.clx.performance.model.breakcontract.BreakContractDriverRecord;
+import com.clx.performance.param.pc.breakcontract.BreakContractDriverRecordAddParam;
 import com.clx.performance.service.breakcontract.BreakContractDriverRecordService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
@@ -10,4 +15,19 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class BreakContractDriverRecordServiceImpl  implements BreakContractDriverRecordService {
+
+    @Autowired
+    private BreakContractDriverRecordDao breakContractDriverRecordDao;
+    @Override
+    public void saveRecord(BreakContractDriverRecordAddParam param) {
+        BreakContractDriverRecord record = new BreakContractDriverRecord();
+        record.setTriggerType(2);
+        record.setChildNo(param.getChildNo());
+        record.setFigure(param.getFigure());
+        record.setTimeLimit(param.getTimeLimit());
+
+        record.setRemark(param.getRemark());
+
+        breakContractDriverRecordDao.saveEntity(record);
+    }
 }

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

 package com.clx.performance.service.impl.breakcontract;
 
 
+import com.clx.performance.dao.breakcontract.BreakContractDriverRecordDao;
+import com.clx.performance.dao.breakcontract.BreakContractOwnerRecordDao;
+import com.clx.performance.model.breakcontract.BreakContractDriverRecord;
+import com.clx.performance.model.breakcontract.BreakContractOwnerRecord;
+import com.clx.performance.param.pc.breakcontract.BreakContractOwnerRecordAddParam;
 import com.clx.performance.service.breakcontract.BreakContractOwnerRecordService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
@@ -11,4 +17,23 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class BreakContractOwnerRecordServiceImpl  implements BreakContractOwnerRecordService {
+
+    @Autowired
+    private BreakContractOwnerRecordDao breakContractOwnerRecordDao;
+
+
+    @Override
+    public void saveRecord(BreakContractOwnerRecordAddParam param) {
+
+        BreakContractOwnerRecord record = new BreakContractOwnerRecord();
+
+        record.setTriggerType(2);
+        record.setBreachContractPartyType(param.getBreachContractPartyType());
+        record.setBreachContractPartyType(param.getBreachContractPartyType());
+        record.setOrderNo(param.getOrderNo());
+        record.setFigure(param.getFigure());
+        record.setRemark(param.getRemark());
+
+        breakContractOwnerRecordDao.saveEntity(record);
+    }
 }

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

 package com.clx.performance.service.impl.breakcontract;
 
 
-import com.clx.performance.param.pc.BreakContractRuleUpdateStatusParam;
+import com.clx.performance.param.pc.breakcontract.BreakContractRuleUpdateStatusParam;
 import com.clx.performance.service.breakcontract.BreakContractOwnerRuleService;
 import org.springframework.stereotype.Service;