Merge remote-tracking branch 'origin/v5.7_break_contract_reverse_20231020' into…

performance-api/src/main/java/com/clx/performance/enums/BreakContractOwnerRecordEnum.java

@@ -28,5 +28,24 @@ public enum BreakContractOwnerRecordEnum {
         }
     }
 
+    @Getter
+    @AllArgsConstructor
+    public enum CompensationStatusStatus {
+        NOT(0, "未赔付"),
+        YES(1, "已赔付"),
+        ;
+
+        private final Integer code;
+        private final String msg;
+
+        public static Optional<CompensationStatusStatus> getByCode(int code) {
+            return Arrays.stream(values()).filter(e -> e.code == code).findFirst();
+        }
+
+        public static String getMsgByCode(int code) {
+            return getByCode(code).map(CompensationStatusStatus::getMsg).orElse(null);
+        }
+    }
+
 
 }

performance-api/src/main/java/com/clx/performance/enums/BreakContractRecordEnum.java

@@ -25,7 +25,7 @@ public enum BreakContractRecordEnum {
     }
     @Getter
     @AllArgsConstructor
-    public enum BreachContractPartyType {
+    public enum BreakContractPartyType {
         PLATFORM(1, "平台"),
         OWNER(2, "货主"),
         DRIVER(3, "司机"),
@@ -34,7 +34,7 @@ public enum BreakContractRecordEnum {
         private final Integer code;
         private final String msg;
 
-        public static Optional<BreachContractPartyType> getByCode(int code) {
+        public static Optional<BreakContractPartyType> getByCode(int code) {
             return Arrays.stream(values()).filter(e -> e.code == code).findFirst();
         }
     }

performance-api/src/main/java/com/clx/performance/enums/BreakContractSettlementDriverEnum.java

@@ -11,7 +11,7 @@ public enum BreakContractSettlementDriverEnum {
 
     @Getter
     @AllArgsConstructor
-    public enum BreachContractPartyType {
+    public enum BreakContractPartyType {
         PLATFORM(1, "平台"),
         OWNER(2, "货主"),
         DRIVER(3, "司机"),
@@ -20,12 +20,12 @@ public enum BreakContractSettlementDriverEnum {
         private final Integer code;
         private final String msg;
 
-        public static Optional<BreachContractPartyType> getByCode(int code) {
+        public static Optional<BreakContractPartyType> getByCode(int code) {
             return Arrays.stream(values()).filter(e -> e.code == code).findFirst();
         }
 
         public static String getMsgByCode(int code) {
-            return getByCode(code).map(BreachContractPartyType::getMsg).orElse(null);
+            return getByCode(code).map(BreakContractPartyType::getMsg).orElse(null);
         }
     }
 

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

@@ -24,7 +24,7 @@ public class BreakContractDriverRecordAddParam {
 
     @ApiModelProperty("违约方类型：1平台 3司机")
     @NotNull(message = "违约方类型不能为空")
-    private Integer breachContractPartyType;
+    private Integer breakContractPartyType;
 
     @ApiModelProperty("违约运单")
     @NotBlank(message = "违约运单不能为空")

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

@@ -24,7 +24,7 @@ public class BreakContractOwnerRecordAddParam {
 
     @ApiModelProperty("违约方类型：1平台 2货主")
     @NotNull(message = "违约方类型不能为空")
-    private Integer breachContractPartyType;
+    private Integer breakContractPartyType;
 
     @ApiModelProperty("违约订单")
     @NotBlank(message = "违约订单不能为空")

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

@@ -16,6 +16,9 @@ public class PageCarrierBreakContractSettlementOwnerParam extends PageParam {
     @ApiModelProperty(value="货主编号",example = "201457878",hidden = true)
     private Long ownerUserNo;
 
+    @ApiModelProperty("货主名称")
+    private String ownerName;
+
     @ApiModelProperty(value="订单编号",example = "201457878")
     private String orderNo;
 

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

@@ -23,9 +23,9 @@ public class PageOwnerBreakContractOwnerRecordParam extends PageParam {
 
     @NotNull(message = "违约方类型不能为空")
     @ApiModelProperty(value = "违约方类型：1平台 2货主 3司机", example = "1")
-    private Integer breachContractPartyType;
+    private Integer breakContractPartyType;
 
-    @ApiModelProperty(value = "缴费状态：0未缴费;1已缴费", example = "1")
+    @ApiModelProperty(value = "缴费状态：0未缴费;1已缴费/赔付状态：0未赔付;1已赔付", example = "1")
     private Integer payStatus;
 
     @ApiModelProperty(value = "开始时间", example = "2012-01-01 00:00:00")

performance-api/src/main/java/com/clx/performance/vo/app/breakcontract/DriverBreakContractDriverRecordVO.java

@@ -27,7 +27,7 @@ public class DriverBreakContractDriverRecordVO {
     private Integer triggerType;
 
     @ApiModelProperty("违约方类型：1平台 2货主 3司机")
-    private Integer breachContractPartyType;
+    private Integer breakContractPartyType;
 
     @ApiModelProperty("违约运单")
     private String childNo;

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

@@ -27,7 +27,7 @@ public class BreakContractDriverRecordVO {
     private Integer triggerType;
 
     @ApiModelProperty("违约方类型：1平台 2货主 3司机")
-    private Integer breachContractPartyType;
+    private Integer breakContractPartyType;
 
     @ApiModelProperty("违约运单")
     private String childNo;

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

@@ -27,7 +27,7 @@ public class BreakContractOwnerRecordVO {
     private Integer triggerType;
 
     @ApiModelProperty("违约方类型：1平台 2货主 3司机")
-    private Integer breachContractPartyType;
+    private Integer breakContractPartyType;
 
     @ApiModelProperty("违约订单")
     private String orderNo;

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

@@ -34,13 +34,19 @@ public class PageOwnerBreakContractOwnerRecordVO {
     @ApiModelProperty("缴费状态：0未缴费;1已缴费")
     private String payStatusMsg;
 
-    @ApiModelProperty("缴费状态：0未缴费;1已缴费")
+    @ApiModelProperty("赔付状态：0未赔付;1已赔付")
+    private String compensationStatusMsg;
+
+    @ApiModelProperty("缴费状态：0未缴费;1已缴费 /赔付状态：0未赔付;1已赔付")
     private Integer payStatus;
 
     @ApiModelProperty("备注")
     private String remark;
 
-    @ApiModelProperty("创建时间")
+    @ApiModelProperty("违约时间")
     private String createTime;
 
+    @ApiModelProperty("赔付时间")
+    private String payTime;
+
 }

performance-web/src/main/java/com/clx/performance/dao/impl/breakcontract/BreakContractOwnerRecordDaoImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.performance.dao.breakcontract.BreakContractOwnerRecordDao;
+import com.clx.performance.enums.BreakContractSettlementDriverEnum;
 import com.clx.performance.mapper.breakcontract.BreakContractOwnerRecordMapper;
 import com.clx.performance.model.breakcontract.BreakContractOwnerRecord;
 import com.clx.performance.param.pc.breakcontract.carrier.PageBreakContractOwnerRecordParam;
@@ -35,10 +36,15 @@ public class BreakContractOwnerRecordDaoImpl extends BaseDaoImpl<BreakContractOw
         LambdaQueryWrapper<BreakContractOwnerRecord> query = new LambdaQueryWrapper<>();
         query.eq(StringUtils.isNotBlank(param.getOrderNo()),BreakContractOwnerRecord :: getOrderNo,param.getOrderNo());
         query.eq(Objects.nonNull(param.getOwnerUserNo()),BreakContractOwnerRecord :: getOwnerUserNo,param.getOwnerUserNo());
-        query.eq(Objects.nonNull(param.getBreachContractPartyType()),BreakContractOwnerRecord :: getBreachContractPartyType,param.getBreachContractPartyType());
+        query.eq(Objects.nonNull(param.getBreakContractPartyType()),BreakContractOwnerRecord :: getBreakContractPartyType,param.getBreakContractPartyType());
         query.eq(Objects.nonNull(param.getPayStatus()),BreakContractOwnerRecord :: getPayStatus,param.getPayStatus());
-        query.ge(StringUtils.isNotBlank(param.getBeginTime()), BreakContractOwnerRecord:: getCreateTime,param.getBeginTime());
-        query.le(StringUtils.isNotBlank(param.getEndTime()),BreakContractOwnerRecord :: getCreateTime,param.getEndTime());
+        if(Objects.equals(param.getBreakContractPartyType(), BreakContractSettlementDriverEnum.BreakContractPartyType.PLATFORM.getCode())){
+            query.ge(StringUtils.isNotBlank(param.getBeginTime()), BreakContractOwnerRecord:: getPayTime,param.getBeginTime());
+            query.le(StringUtils.isNotBlank(param.getEndTime()),BreakContractOwnerRecord :: getPayTime,param.getEndTime());
+        }else{
+            query.ge(StringUtils.isNotBlank(param.getBeginTime()), BreakContractOwnerRecord:: getCreateTime,param.getBeginTime());
+            query.le(StringUtils.isNotBlank(param.getEndTime()),BreakContractOwnerRecord :: getCreateTime,param.getEndTime());
+        }
         query.orderByDesc(BreakContractOwnerRecord::getId);
         return baseMapper.selectPage(Page.of(param.getPage(), param.getPageSize()),query);
     }

performance-web/src/main/java/com/clx/performance/dao/impl/breakcontract/BreakContractSettlementOwnerDaoImpl.java

@@ -30,6 +30,7 @@ public class BreakContractSettlementOwnerDaoImpl extends BaseDaoImpl<BreakContra
         LambdaQueryWrapper<BreakContractSettlementOwner> query = new LambdaQueryWrapper<>();
         query.eq(StringUtils.isNotBlank(param.getOrderNo()),BreakContractSettlementOwner :: getOrderNo,param.getOrderNo());
         query.eq(Objects.nonNull(param.getOwnerUserNo()),BreakContractSettlementOwner :: getOwnerUserNo,param.getOwnerUserNo());
+        query.eq(StringUtils.isNotBlank(param.getOwnerName()),BreakContractSettlementOwner ::getOwnerName ,param.getOwnerName());
         query.eq(StringUtils.isNotBlank(param.getSettlementNo()),BreakContractSettlementOwner ::getSettlementNo ,param.getSettlementNo());
         query.eq(Objects.nonNull(param.getBreakContractPartyType()),BreakContractSettlementOwner :: getBreakContractPartyType,param.getBreakContractPartyType());
         query.ge(StringUtils.isNotBlank(param.getBeginTime()), BreakContractSettlementOwner:: getCreateTime,param.getBeginTime());

performance-web/src/main/java/com/clx/performance/model/breakcontract/BreakContractDriverRecord.java

@@ -31,9 +31,9 @@ public class BreakContractDriverRecord  implements HasKey<Integer> {
     @ApiModelProperty("触发类型：1系统触发 2手动触发")
     private Integer triggerType;
 
-    @TableField("breach_contract_party_type")
+    @TableField("break_contract_party_type")
     @ApiModelProperty("违约方类型：1平台 2货主 3车主")
-    private Integer breachContractPartyType;
+    private Integer breakContractPartyType;
 
     @TableField("break_no")
     @ApiModelProperty(value = "违约单号", example = "")

performance-web/src/main/java/com/clx/performance/model/breakcontract/BreakContractOwnerRecord.java

@@ -31,9 +31,9 @@ public class BreakContractOwnerRecord   implements HasKey<Integer> {
     @ApiModelProperty("触发类型：1系统触发 2手动触发")
     private Integer triggerType;
 
-    @TableField("breach_contract_party_type")
+    @TableField("break_contract_party_type")
     @ApiModelProperty("违约方类型：1平台 2货主 3车主")
-    private Integer breachContractPartyType;
+    private Integer breakContractPartyType;
 
     @TableField("break_no")
     @ApiModelProperty(value = "违约单号", example = "")
@@ -63,6 +63,10 @@ public class BreakContractOwnerRecord   implements HasKey<Integer> {
     @ApiModelProperty("缴费状态：0未缴费;1已缴费")
     private Integer payStatus;
 
+    @TableField("pay_time")
+    @ApiModelProperty("支付时间")
+    private LocalDateTime payTime;
+
     @TableField("remark")
     @ApiModelProperty("备注")
     private String remark;

performance-web/src/main/java/com/clx/performance/model/breakcontract/BreakContractSettlementDriver.java

@@ -31,6 +31,10 @@ public class BreakContractSettlementDriver  implements HasKey<Integer> {
     @ApiModelProperty("违约方类型：1平台 2货主 3车主")
     private Integer breakContractPartyType;
 
+    @TableField("break_no")
+    @ApiModelProperty("违约单号")
+    private String breakNo;
+
     @TableField("settlement_no")
     @ApiModelProperty("结算单编号")
     private String settlementNo;

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

@@ -3,15 +3,22 @@ package com.clx.performance.service.impl.breakcontract;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.dao.OrderChildDao;
 import com.clx.performance.dao.breakcontract.BreakContractDriverRecordDao;
+import com.clx.performance.dao.breakcontract.BreakContractSettlementDriverDao;
+import com.clx.performance.dao.breakcontract.BreakContractSettlementDriverDetailDao;
 import com.clx.performance.enums.BreakContractRecordEnum;
+import com.clx.performance.enums.BreakContractSettlementDriverEnum;
 import com.clx.performance.enums.PerformanceResultEnum;
 import com.clx.performance.model.OrderChild;
 import com.clx.performance.model.breakcontract.BreakContractDriverRecord;
+import com.clx.performance.model.breakcontract.BreakContractSettlementDriver;
+import com.clx.performance.model.breakcontract.BreakContractSettlementDriverDetail;
 import com.clx.performance.param.app.breakcontract.DriverPageBreakContractDriverRecordParam;
 import com.clx.performance.param.pc.breakcontract.carrier.BreakContractDriverRecordAddParam;
 import com.clx.performance.param.pc.breakcontract.carrier.PageBreakContractDriverRecordParam;
 import com.clx.performance.service.breakcontract.BreakContractDriverRecordService;
 import com.clx.performance.service.impl.UniqueOrderNumService;
+import com.clx.performance.struct.breakcontract.BreakContractSettlementDriverDetailStruct;
+import com.clx.performance.struct.breakcontract.BreakContractSettlementDriverStruct;
 import com.clx.performance.vo.app.breakcontract.DriverBreakContractDriverRecordVO;
 import com.clx.performance.vo.pc.breakcontract.carrier.BreakContractDriverRecordVO;
 import com.msl.common.utils.LocalDateTimeUtils;
@@ -20,6 +27,7 @@ import com.msl.user.utils.TokenUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
@@ -40,13 +48,22 @@ public class BreakContractDriverRecordServiceImpl  implements BreakContractDrive
     private OrderChildDao orderChildDao;
     @Autowired
     private UniqueOrderNumService uniqueOrderNumService;
+    @Autowired
+    private BreakContractSettlementDriverDetailStruct breakContractSettlementDriverDetailStruct;
+    @Autowired
+    private BreakContractSettlementDriverStruct breakContractSettlementDriverStruct;
+    @Autowired
+    private BreakContractSettlementDriverDao breakContractSettlementDriverDao;
+    @Autowired
+    private BreakContractSettlementDriverDetailDao breakContractSettlementDriverDetailDao;
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void saveRecord(BreakContractDriverRecordAddParam param) {
         UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
         Long userNo = loginUserInfo.getUserNo();
 
-        String breakNo = childNoGenerate();
+        String breakNo = "WYD"+childNoGenerate();
         OrderChild orderChild = orderChildDao.getByChildNo(param.getChildNo()).orElseThrow(PerformanceResultEnum.ORDER_CHILD_NO_FOUND);
 
         LocalDateTime time = LocalDateTime.now();
@@ -54,15 +71,15 @@ public class BreakContractDriverRecordServiceImpl  implements BreakContractDrive
         BreakContractDriverRecord record = new BreakContractDriverRecord();
         record.setBreakNo(breakNo);
         record.setTriggerType(BreakContractRecordEnum.TriggerType.MANUAL.getCode());
-        if (Objects.equals(param.getBreachContractPartyType(), BreakContractRecordEnum.BreachContractPartyType.DRIVER.getCode())) {
-            record.setBreachContractPartyType(BreakContractRecordEnum.BreachContractPartyType.DRIVER.getCode());
+        if (Objects.equals(param.getBreakContractPartyType(), BreakContractRecordEnum.BreakContractPartyType.DRIVER.getCode())) {
+            record.setBreakContractPartyType(BreakContractRecordEnum.BreakContractPartyType.DRIVER.getCode());
             if (param.getTimeLimit() != null) {
                 record.setTimeLimit(param.getTimeLimit());
                 record.setLimitTime(time.plusSeconds(param.getTimeLimit().multiply(BigDecimal.valueOf(3600L)).intValue()));
             }
         }
         else {
-            record.setBreachContractPartyType(BreakContractRecordEnum.BreachContractPartyType.PLATFORM.getCode());
+            record.setBreakContractPartyType(BreakContractRecordEnum.BreakContractPartyType.PLATFORM.getCode());
         }
         record.setChildNo(param.getChildNo());
         record.setFigure(param.getFigure());
@@ -78,7 +95,20 @@ public class BreakContractDriverRecordServiceImpl  implements BreakContractDrive
         record.setCreateName(loginUserInfo.getUserName());
         record.setCreateTime(time);
 
+        //车主违约计费明细
+        BreakContractSettlementDriverDetail breakDriverDetail = breakContractSettlementDriverDetailStruct.convert(record);
+        String settlementNo = "WYJSD"+childNoGenerate();
+        breakDriverDetail.setSettlementNo(settlementNo);
+
+        //车主违约结算单
+        BreakContractSettlementDriver breakDriver = breakContractSettlementDriverStruct.convert(breakDriverDetail);
+        breakDriver.setSettleStatus(BreakContractSettlementDriverEnum.SettleStatus.NO.getCode());
+        breakDriver.setSettlePlatform(BreakContractSettlementDriverEnum.SettlePlatform.MSL.getCode());
+
+        record.setSettlementNo(settlementNo);
         breakContractDriverRecordDao.saveEntity(record);
+        breakContractSettlementDriverDao.saveEntity(breakDriver);
+        breakContractSettlementDriverDetailDao.saveEntity(breakDriverDetail);
     }
 
     @Override

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

@@ -66,11 +66,11 @@ public class BreakContractOwnerRecordServiceImpl  implements BreakContractOwnerR
         BreakContractOwnerRecord record = new BreakContractOwnerRecord();
         record.setBreakNo(breakNo);
         record.setTriggerType(BreakContractRecordEnum.TriggerType.MANUAL.getCode());
-        if (Objects.equals(param.getBreachContractPartyType(), BreakContractRecordEnum.BreachContractPartyType.OWNER.getCode())) {
-            record.setBreachContractPartyType(BreakContractRecordEnum.BreachContractPartyType.OWNER.getCode());
+        if (Objects.equals(param.getBreakContractPartyType(), BreakContractRecordEnum.BreakContractPartyType.OWNER.getCode())) {
+            record.setBreakContractPartyType(BreakContractRecordEnum.BreakContractPartyType.OWNER.getCode());
         }
         else {
-            record.setBreachContractPartyType(BreakContractRecordEnum.BreachContractPartyType.PLATFORM.getCode());
+            record.setBreakContractPartyType(BreakContractRecordEnum.BreakContractPartyType.PLATFORM.getCode());
         }
 
         record.setOrderNo(param.getOrderNo());

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

@@ -58,7 +58,7 @@ public class BreakContractSettlementDriverDetailServiceImpl  implements BreakCon
         fieldList.add(new ExcelField(3, "运单编号", "childNo", 5000));
 
         fieldList.add(new ExcelField(4, "司机名称", "driverName", 5000));
-        fieldList.add(new ExcelField(5, "违约方", "breachContractPartyType", 5000));
+        fieldList.add(new ExcelField(5, "违约方", "breakContractPartyType", 5000));
         fieldList.add(new ExcelField(6, "违约金额", "figure", 5000));
         fieldList.add(new ExcelField(7, "创建人", "createName", 5000));
         fieldList.add(new ExcelField(8, "创建时间", "createTime", 5000));

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

@@ -57,7 +57,7 @@ public class BreakContractSettlementDriverServiceImpl implements BreakContractSe
         fieldList.add(new ExcelField(3, "车主编号", "truckOwnerNo", 5000));
 
         fieldList.add(new ExcelField(4, "司机名称", "driverName", 5000));
-        fieldList.add(new ExcelField(5, "违约方", "breachContractPartyType", 5000));
+        fieldList.add(new ExcelField(5, "违约方", "breakContractPartyType", 5000));
         fieldList.add(new ExcelField(6, "违约金额", "figure", 5000));
         fieldList.add(new ExcelField(7, "创建人", "createName", 5000));
         fieldList.add(new ExcelField(8, "创建时间", "createTime", 5000));

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

@@ -56,7 +56,7 @@ public class BreakContractSettlementOwnerDetailServiceImpl  implements BreakCont
         fieldList.add(new ExcelField(2, "货主编号", "ownUserNo", 5000));
         fieldList.add(new ExcelField(3, "货主名称", "ownerName", 5000));
 
-        fieldList.add(new ExcelField(4, "违约方", "breachContractPartyType", 5000));
+        fieldList.add(new ExcelField(4, "违约方", "breakContractPartyType", 5000));
         fieldList.add(new ExcelField(5, "违约金额", "figure", 5000));
         fieldList.add(new ExcelField(6, "创建人", "createName", 5000));
         fieldList.add(new ExcelField(7, "创建时间", "createTime", 5000));

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

@@ -73,7 +73,7 @@ public class BreakContractSettlementOwnerServiceImpl  implements BreakContractSe
         fieldList.add(new ExcelField(2, "货主编号", "ownUserNo", 5000));
         fieldList.add(new ExcelField(3, "货主名称", "ownerName", 5000));
 
-        fieldList.add(new ExcelField(4, "违约方", "breachContractPartyType", 5000));
+        fieldList.add(new ExcelField(4, "违约方", "breakContractPartyType", 5000));
         fieldList.add(new ExcelField(5, "违约金额", "figure", 5000));
         fieldList.add(new ExcelField(6, "状态", "statusMsg", 5000));
         fieldList.add(new ExcelField(7, "结算单号", "settlementNo", 5000));
@@ -209,7 +209,7 @@ public class BreakContractSettlementOwnerServiceImpl  implements BreakContractSe
         }
 
         int status = BreakContractSettlementOwnerEnum.Status.SHIPPER_TO_PAYMENT.getCode();
-        if(Objects.equals(settlementOwner.getBreakContractPartyType(), BreakContractSettlementDriverEnum.BreachContractPartyType.PLATFORM.getCode())){
+        if(Objects.equals(settlementOwner.getBreakContractPartyType(), BreakContractSettlementDriverEnum.BreakContractPartyType.PLATFORM.getCode())){
             status = BreakContractSettlementOwnerEnum.Status.PLATFORM_TO_PAYMENT.getCode();
         }
         breakContractSettlementOwnerDao.updateStatus(param.getId(),BreakContractSettlementOwnerEnum.Status.OWNER_TO_BE_CONFIRMED.getCode(),status);

performance-web/src/main/java/com/clx/performance/sqlProvider/breakcontract/BreakContractDriverRecordSqlProvider.java

@@ -16,7 +16,7 @@ public class BreakContractDriverRecordSqlProvider {
     public String pageByParam(@Param("page") Page<BreakContractDriverRecordVO> page, @Param("param") PageBreakContractDriverRecordParam param) {
         return new SQL(){{
 
-            SELECT(" id, trigger_type, breach_contract_party_type, break_no, " +
+            SELECT(" id, trigger_type, break_contract_party_type, break_no, " +
                     " child_no, truck_no, truck_own_user_no, truck_own_name, " +
                     " driver_user_no, driver_name, figure, time_limit, " +
                     " date_format(limit_time, '%Y-%m-%d %H:%i:%s') as limitTime, " +
@@ -41,7 +41,7 @@ public class BreakContractDriverRecordSqlProvider {
     public String driverPageByParam(@Param("page") Page<DriverBreakContractDriverRecordVO> page, @Param("param") DriverPageBreakContractDriverRecordParam param) {
         return new SQL(){{
 
-            SELECT(" id, trigger_type, breach_contract_party_type, break_no, " +
+            SELECT(" id, trigger_type, break_contract_party_type, break_no, " +
                     " child_no, truck_no, truck_own_user_no, truck_own_name, " +
                     " driver_user_no, driver_name, figure, time_limit, " +
                     " date_format(limit_time, '%Y-%m-%d %H:%i:%s') as limitTime, " +
@@ -54,8 +54,8 @@ public class BreakContractDriverRecordSqlProvider {
 
             FROM("break_contract_driver_record");
             WHERE("(truck_own_user_no = #{param.userNo} or driver_user_no = #{param.userNo})");
-            if (Objects.equals(param.getType(), 1)) {WHERE("breach_contract_party_type = 3");}
-            if (Objects.equals(param.getType(), 2)) {WHERE("breach_contract_party_type = 1");}
+            if (Objects.equals(param.getType(), 1)) {WHERE("break_contract_party_type = 3");}
+            if (Objects.equals(param.getType(), 2)) {WHERE("break_contract_party_type = 1");}
 
             if (StringUtils.isNotBlank(param.getBeginTime())) {WHERE("create_time >= #{param.beginTime}");}
             if (StringUtils.isNotBlank(param.getEndTime())) {WHERE("create_time <= #{param.endTime}");}

performance-web/src/main/java/com/clx/performance/sqlProvider/breakcontract/BreakContractOwnerRecordSqlProvider.java

@@ -12,7 +12,7 @@ public class BreakContractOwnerRecordSqlProvider {
     public String pageByParam(@Param("page") Page<BreakContractOwnerRecordVO> page, @Param("param") PageBreakContractOwnerRecordParam param) {
         return new SQL(){{
 
-            SELECT(" id, trigger_type, breach_contract_party_type, break_no, " +
+            SELECT(" id, trigger_type, break_contract_party_type, break_no, " +
                     " order_no, owner_user_no, owner_name, figure, " +
                     " settlement_no, " +
                     " remark, " +

performance-web/src/main/java/com/clx/performance/strategy/GoodsOrderStrategy.java

 package com.clx.performance.strategy;
 
+import com.clx.order.enums.OrderStopEnum;
+import com.clx.order.enums.ResultEnum;
 import com.clx.order.params.OrderGoodsParams;
 import com.clx.order.vo.feign.FeignOrderVO;
 import com.clx.performance.constant.RabbitKeyConstants;
+import com.msl.common.exception.ServiceSystemException;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.core.MessageBuilder;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 
 import java.time.LocalDateTime;
+import java.util.Objects;
 
 @Slf4j
 public abstract class GoodsOrderStrategy {
@@ -26,6 +30,9 @@ public abstract class GoodsOrderStrategy {
 
     public void saveGoodsOrder(OrderGoodsParams orderGoodsParams, FeignOrderVO orderInfo, LocalDateTime now, RabbitTemplate rabbitTemplate) {
         String orderNo = orderGoodsParams.getOrderNo();
+        if(Objects.equals(orderInfo.getStopFlag(), OrderStopEnum.Status.YES.getCode())){
+            throw new ServiceSystemException(ResultEnum.DATA_ERROR,"订单已暂停，无法进行提量");
+        }
         //根据不同的订单类型创建不同的货单
         LocalDateTime sendLazyTime = goodsOrderProcess(orderGoodsParams, orderInfo, now);
 

performance-web/src/main/java/com/clx/performance/struct/breakcontract/BreakContractOwnerRecordStruct.java

@@ -18,6 +18,7 @@ public interface BreakContractOwnerRecordStruct {
 
     @Named("toBaseVo")
     @Mapping(target = "payStatusMsg", expression = "java(BreakContractOwnerRecordEnum.PayStatus.getMsgByCode(detail.getPayStatus()))")
+    @Mapping(target = "compensationStatusMsg", expression = "java(BreakContractOwnerRecordEnum.CompensationStatusStatus.getMsgByCode(detail.getPayStatus()))")
     PageOwnerBreakContractOwnerRecordVO convert(BreakContractOwnerRecord detail);
 
     @IterableMapping(qualifiedByName = "toBaseVo")

performance-web/src/main/java/com/clx/performance/struct/breakcontract/BreakContractSettlementDriverDetailStruct.java

 package com.clx.performance.struct.breakcontract;
 
 import com.clx.performance.enums.BreakContractSettlementDriverEnum;
+import com.clx.performance.model.breakcontract.BreakContractDriverRecord;
 import com.clx.performance.model.breakcontract.BreakContractSettlementDriverDetail;
 import com.clx.performance.vo.pc.breakcontract.carrier.PageCarrierBreakContractSettlementDriverDetailVO;
 import com.msl.common.utils.DateStructUtil;
@@ -17,10 +18,13 @@ public interface BreakContractSettlementDriverDetailStruct {
 
 
     @Named("toBaseVo")
-    @Mapping(target = "breakContractPartyTypeMsg", expression = "java(BreakContractSettlementDriverEnum.BreachContractPartyType.getMsgByCode(detail.getBreakContractPartyType()))")
+    @Mapping(target = "breakContractPartyTypeMsg", expression = "java(BreakContractSettlementDriverEnum.BreakContractPartyType.getMsgByCode(detail.getBreakContractPartyType()))")
     PageCarrierBreakContractSettlementDriverDetailVO convert(BreakContractSettlementDriverDetail detail);
 
     @IterableMapping(qualifiedByName = "toBaseVo")
     List<PageCarrierBreakContractSettlementDriverDetailVO> covertToCarrierList(List<BreakContractSettlementDriverDetail> list);
 
+    @Mapping(target = "breakContractRemark", source = "remark")
+    BreakContractSettlementDriverDetail convert(BreakContractDriverRecord detail);
+
 }

performance-web/src/main/java/com/clx/performance/struct/breakcontract/BreakContractSettlementDriverStruct.java

@@ -2,6 +2,7 @@ package com.clx.performance.struct.breakcontract;
 
 import com.clx.performance.enums.BreakContractSettlementDriverEnum;
 import com.clx.performance.model.breakcontract.BreakContractSettlementDriver;
+import com.clx.performance.model.breakcontract.BreakContractSettlementDriverDetail;
 import com.clx.performance.vo.pc.breakcontract.carrier.PageCarrierBreakContractSettlementDriverVO;
 import com.msl.common.utils.DateStructUtil;
 import com.msl.common.utils.DateUtils;
@@ -19,10 +20,12 @@ public interface BreakContractSettlementDriverStruct {
     @Named("toBaseVo")
     @Mapping(target = "settleStatusMsg", expression = "java(BreakContractSettlementDriverEnum.SettleStatus.getMsgByCode(detail.getSettleStatus()))")
     @Mapping(target = "settlePlatformMsg", expression = "java(BreakContractSettlementDriverEnum.SettlePlatform.getMsgByCode(detail.getSettlePlatform()))")
-    @Mapping(target = "breakContractPartyTypeMsg", expression = "java(BreakContractSettlementDriverEnum.BreachContractPartyType.getMsgByCode(detail.getBreakContractPartyType()))")
+    @Mapping(target = "breakContractPartyTypeMsg", expression = "java(BreakContractSettlementDriverEnum.BreakContractPartyType.getMsgByCode(detail.getBreakContractPartyType()))")
     PageCarrierBreakContractSettlementDriverVO convert(BreakContractSettlementDriver detail);
 
     @IterableMapping(qualifiedByName = "toBaseVo")
     List<PageCarrierBreakContractSettlementDriverVO> covertToCarrierList(List<BreakContractSettlementDriver> list);
 
+    BreakContractSettlementDriver convert(BreakContractSettlementDriverDetail detail);
+
 }

performance-web/src/main/java/com/clx/performance/struct/breakcontract/BreakContractSettlementOwnerDetailStruct.java

@@ -19,7 +19,7 @@ public interface BreakContractSettlementOwnerDetailStruct {
 
 
     @Named("toBaseVo")
-    @Mapping(target = "breakContractPartyTypeMsg", expression = "java(BreakContractSettlementDriverEnum.BreachContractPartyType.getMsgByCode(detail.getBreakContractPartyType()))")
+    @Mapping(target = "breakContractPartyTypeMsg", expression = "java(BreakContractSettlementDriverEnum.BreakContractPartyType.getMsgByCode(detail.getBreakContractPartyType()))")
     PageCarrierBreakContractSettlementOwnerDetailVO convert(BreakContractSettlementOwnerDetail detail);
 
     @IterableMapping(qualifiedByName = "toBaseVo")

performance-web/src/main/java/com/clx/performance/struct/breakcontract/BreakContractSettlementOwnerStruct.java

@@ -19,14 +19,14 @@ public interface BreakContractSettlementOwnerStruct {
 
 
     @Named("toBaseVo")
-    @Mapping(target = "breakContractPartyTypeMsg", expression = "java(BreakContractSettlementDriverEnum.BreachContractPartyType.getMsgByCode(detail.getBreakContractPartyType()))")
+    @Mapping(target = "breakContractPartyTypeMsg", expression = "java(BreakContractSettlementDriverEnum.BreakContractPartyType.getMsgByCode(detail.getBreakContractPartyType()))")
     @Mapping(target = "statusMsg", expression = "java(BreakContractSettlementOwnerEnum.Status.getMsgByCode(detail.getStatus()))")
     PageCarrierBreakContractSettlementOwnerVO convert(BreakContractSettlementOwner detail);
 
     @IterableMapping(qualifiedByName = "toBaseVo")
     List<PageCarrierBreakContractSettlementOwnerVO> covertToCarrierList(List<BreakContractSettlementOwner> list);
 
-    @Mapping(target = "breakContractPartyTypeMsg", expression = "java(BreakContractSettlementDriverEnum.BreachContractPartyType.getMsgByCode(settlementOwner.getBreakContractPartyType()))")
+    @Mapping(target = "breakContractPartyTypeMsg", expression = "java(BreakContractSettlementDriverEnum.BreakContractPartyType.getMsgByCode(settlementOwner.getBreakContractPartyType()))")
     @Mapping(target = "statusMsg", expression = "java(BreakContractSettlementOwnerEnum.Status.getMsgByCode(settlementOwner.getStatus()))")
     CarrierBreakContractSettlementOwnerDetailVO convertToDetail(BreakContractSettlementOwner settlementOwner);