包创建

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

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

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

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

performance-api/src/main/java/com/clx/performance/vo/pc/breakcontract/carrier/CarrierOrderChildDetailVO.java

+package com.clx.performance.vo.pc.breakcontract.carrier;
+
+import com.clx.performance.vo.pc.OrderChildLogVO;
+import com.clx.performance.vo.pc.OrderChildPoundAuditDetailVO;
+import com.msl.common.convertor.type.MoneyOutConvert;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+
+@ApiModel(description = "运单表")
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class CarrierOrderChildDetailVO {
+
+
+    @ApiModelProperty(value = "运单编号", example = "100000000")
+    private String childNo;
+
+    @ApiModelProperty(value = "货单编号", example = "100000000")
+    private String orderGoodsNo;
+
+    @ApiModelProperty(value = "货物名称", example = "煤")
+    private String goodsName;
+
+    @ApiModelProperty(value = "运费单价（元）", example = "1.23")
+    @MoneyOutConvert
+    private BigDecimal freightPrice;
+
+    @ApiModelProperty(value = "应付运费（元）", example = "1.23")
+    @MoneyOutConvert
+    private BigDecimal payableFreight;
+
+    @ApiModelProperty(value = "亏吨扣款（元）", example = "1.23")
+    @MoneyOutConvert
+    private BigDecimal lossDeduction;
+
+    @ApiModelProperty(value = "实付运费（元）", example = "1.23")
+    @MoneyOutConvert
+    private BigDecimal realFreight;
+
+
+    @ApiModelProperty(value = "损耗单价（元）", example = "1.23")
+    @MoneyOutConvert
+    private BigDecimal lossPrice;
+
+    @ApiModelProperty(value = "订单运费单价（元）", example = "1.23")
+    @MoneyOutConvert
+    private BigDecimal orderFreightPrice;
+
+    @ApiModelProperty("货物重量")
+    private BigDecimal extractWeight;
+
+    @ApiModelProperty(value = "发货地址", example = "朝阳")
+    private String sendAddress;
+
+    @ApiModelProperty(value = "收货地址", example = "西城")
+    private String receiveAddress;
+
+    @ApiModelProperty(value = "车牌号", example = "京A12345")
+    private String truckNo;
+
+    @ApiModelProperty(value = "司机姓名", example = "张三")
+    private String driverName;
+
+    @ApiModelProperty(value = "司机手机号", example = "130000000")
+    private String driverMobile;
+
+    @ApiModelProperty(value = "装货净重（单位吨）", example = "1.23")
+    private BigDecimal loadNet;
+
+    @ApiModelProperty(value = "卸货净重（单位吨）", example = "1.23")
+    private BigDecimal unloadNet;
+
+
+    @ApiModelProperty(value = "取消原因", example = "抢错了")
+    private String cancelRemark;
+
+    @ApiModelProperty(value = "状态", example = "0")
+    private Integer status;
+
+    @ApiModelProperty(value = "装车磅单图片列表")
+    private List<String> loadImageList;
+
+    @ApiModelProperty(value = "卸车磅单图片列表")
+    private List<String> unloadImageList;
+
+    @ApiModelProperty(value = "流程节点")
+    private List<OrderChildLogVO> childLogs;
+
+    @ApiModelProperty(value = "磅单审核列表")
+    private List<OrderChildPoundAuditDetailVO> poundAudits;
+
+    @ApiModelProperty(value = "完成时间", example = "2020-01-01 10:10:10")
+    private String finishTime;
+
+
+}
\ No newline at end of file

performance-api/src/main/java/com/clx/performance/vo/pc/breakcontract/owner/CarrierOrderChildDetailVO.java

+package com.clx.performance.vo.pc.breakcontract.owner;
+
+import com.clx.performance.vo.pc.OrderChildLogVO;
+import com.clx.performance.vo.pc.OrderChildPoundAuditDetailVO;
+import com.msl.common.convertor.type.MoneyOutConvert;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+
+@ApiModel(description = "运单表")
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class CarrierOrderChildDetailVO {
+
+
+    @ApiModelProperty(value = "运单编号", example = "100000000")
+    private String childNo;
+
+    @ApiModelProperty(value = "货单编号", example = "100000000")
+    private String orderGoodsNo;
+
+    @ApiModelProperty(value = "货物名称", example = "煤")
+    private String goodsName;
+
+    @ApiModelProperty(value = "运费单价（元）", example = "1.23")
+    @MoneyOutConvert
+    private BigDecimal freightPrice;
+
+    @ApiModelProperty(value = "应付运费（元）", example = "1.23")
+    @MoneyOutConvert
+    private BigDecimal payableFreight;
+
+    @ApiModelProperty(value = "亏吨扣款（元）", example = "1.23")
+    @MoneyOutConvert
+    private BigDecimal lossDeduction;
+
+    @ApiModelProperty(value = "实付运费（元）", example = "1.23")
+    @MoneyOutConvert
+    private BigDecimal realFreight;
+
+
+    @ApiModelProperty(value = "损耗单价（元）", example = "1.23")
+    @MoneyOutConvert
+    private BigDecimal lossPrice;
+
+    @ApiModelProperty(value = "订单运费单价（元）", example = "1.23")
+    @MoneyOutConvert
+    private BigDecimal orderFreightPrice;
+
+    @ApiModelProperty("货物重量")
+    private BigDecimal extractWeight;
+
+    @ApiModelProperty(value = "发货地址", example = "朝阳")
+    private String sendAddress;
+
+    @ApiModelProperty(value = "收货地址", example = "西城")
+    private String receiveAddress;
+
+    @ApiModelProperty(value = "车牌号", example = "京A12345")
+    private String truckNo;
+
+    @ApiModelProperty(value = "司机姓名", example = "张三")
+    private String driverName;
+
+    @ApiModelProperty(value = "司机手机号", example = "130000000")
+    private String driverMobile;
+
+    @ApiModelProperty(value = "装货净重（单位吨）", example = "1.23")
+    private BigDecimal loadNet;
+
+    @ApiModelProperty(value = "卸货净重（单位吨）", example = "1.23")
+    private BigDecimal unloadNet;
+
+
+    @ApiModelProperty(value = "取消原因", example = "抢错了")
+    private String cancelRemark;
+
+    @ApiModelProperty(value = "状态", example = "0")
+    private Integer status;
+
+    @ApiModelProperty(value = "装车磅单图片列表")
+    private List<String> loadImageList;
+
+    @ApiModelProperty(value = "卸车磅单图片列表")
+    private List<String> unloadImageList;
+
+    @ApiModelProperty(value = "流程节点")
+    private List<OrderChildLogVO> childLogs;
+
+    @ApiModelProperty(value = "磅单审核列表")
+    private List<OrderChildPoundAuditDetailVO> poundAudits;
+
+    @ApiModelProperty(value = "完成时间", example = "2020-01-01 10:10:10")
+    private String finishTime;
+
+
+}
\ No newline at end of file

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

-package com.clx.performance.controller.pc.breakcontract;
+package com.clx.performance.controller.pc.breakcontract.carrier;
 
 import com.clx.performance.param.pc.breakcontract.BreakContractDriverRecordAddParam;
 import com.clx.performance.service.breakcontract.BreakContractDriverRecordService;

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

-package com.clx.performance.controller.pc.breakcontract;
+package com.clx.performance.controller.pc.breakcontract.carrier;
 
 import com.clx.performance.param.pc.breakcontract.BreakContractOwnerRecordAddParam;
 import com.clx.performance.service.breakcontract.BreakContractOwnerRecordService;

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

-package com.clx.performance.controller.pc.breakcontract;
+package com.clx.performance.controller.pc.breakcontract.carrier;
 
 import com.clx.performance.param.pc.breakcontract.BreakContractRuleUpdateStatusParam;
 import com.clx.performance.service.breakcontract.BreakContractOwnerRuleService;

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

+package com.clx.performance.controller.pc.breakcontract.owner;
+
+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 OwnerBreakContractSettlementOwnerController {
+
+    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();
+    }
+
+}