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

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

@@ -6,6 +6,7 @@ import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.ToString;
 
+import javax.validation.constraints.Max;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
@@ -20,26 +21,32 @@ public class CarrierBreakContractSavePayeeParam {
     private Integer id;
 
     @NotBlank(message = "收款人不能为空")
+    @Max(value=64,message = "收款人最多输入64个字符")
     @ApiModelProperty(value = "收款人", example = "收款人")
     private String payee;
 
     @NotBlank(message = "收款银行不能为空")
+    @Max(value=64,message = "收款银行最多输入64个字符")
     @ApiModelProperty(value = "收款银行", example = "浙江银行")
     private String payeeBankName;
 
     @NotBlank(message = "收款银行卡卡号不能为空")
+    @Max(value=32,message = "收款银行卡卡号最多输入32个字符")
     @ApiModelProperty(value = "收款银行卡卡号", example = "62213545878787")
     private String payeeBankCardNo;
 
     @NotBlank(message = "付款凭证不能为空")
+    @Max(value=255,message = "付款凭证最多输入255个字符")
     @ApiModelProperty(value = "付款凭证", example = "/a.png")
     private String paymentImg;
 
     @NotBlank(message = "付款银行不能为空")
+    @Max(value=64,message = "付款银行最多输入64个字符")
     @ApiModelProperty(value = "付款银行", example = "浙江银行")
     private String paymentBankName;
 
     @NotBlank(message = "付款银行卡卡号不能为空")
+    @Max(value=32,message = "付款银行卡卡号最多输入32个字符")
     @ApiModelProperty(value = "付款银行卡卡号", example = "62213545878787")
     private String paymentBankCardNo;
 

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

@@ -6,6 +6,7 @@ import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.ToString;
 
+import javax.validation.constraints.Max;
 import javax.validation.constraints.NotNull;
 
 @Setter
@@ -19,6 +20,7 @@ public class CarrierUploadInvoiceImgParam  {
     private Integer id;
 
     @NotNull(message = "结算凭证不能为空")
+    @Max(value=255,message = "结算凭证最多输入255个字符")
     @ApiModelProperty(value="结算凭证",example = "/123.img")
     private String invoiceImg;
 

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

@@ -17,6 +17,9 @@ public class PageCarrierBreakContractSettlementDriverParam extends PageParam {
     @ApiModelProperty(value="运单编号",example = "201457878")
     private String childNo;
 
+    @ApiModelProperty(value="结算单号",example = "201457878")
+    private String settlementNo;
+
     @ApiModelProperty(value="车主编号",example = "201457878")
     private Long truckOwnUserNo;
 

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

@@ -13,7 +13,7 @@ import lombok.ToString;
 @NoArgsConstructor
 public class PageCarrierBreakContractSettlementOwnerParam extends PageParam {
 
-    @ApiModelProperty(value="货主编号",example = "201457878",hidden = true)
+    @ApiModelProperty(value="货主编号",example = "201457878")
     private Long ownerUserNo;
 
     @ApiModelProperty("货主名称")

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

@@ -22,6 +22,7 @@ import com.msl.common.result.Result;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.exception.ExceptionUtils;
 import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
@@ -87,6 +88,7 @@ public class GoodsOrderController {
             goodsOrderStrategyContext.strategyContext.get(truckDemand).saveGoodsOrder(orderGoodsParams, orderInfo, now, rabbitTemplate);
 
         } catch (Exception e) {
+            log.error(ExceptionUtils.getStackTrace(e));
             throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, e.getMessage());
         } finally {
             try {

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

@@ -27,6 +27,7 @@ public class BreakContractSettlementDriverDaoImpl extends BaseDaoImpl<BreakContr
         LambdaQueryWrapper<BreakContractSettlementDriver> query = new LambdaQueryWrapper<>();
         query.eq(StringUtils.isNotBlank(param.getChildNo()),BreakContractSettlementDriver :: getChildNo,param.getChildNo());
         query.eq(StringUtils.isNotBlank(param.getTruckOwnName()),BreakContractSettlementDriver :: getTruckOwnName,param.getTruckOwnName());
+        query.eq(StringUtils.isNotBlank(param.getSettlementNo()),BreakContractSettlementDriver :: getSettlementNo,param.getSettlementNo());
         query.eq(Objects.nonNull(param.getSettleStatus()),BreakContractSettlementDriver :: getSettleStatus,param.getSettleStatus());
         query.eq(Objects.nonNull(param.getTruckOwnUserNo()),BreakContractSettlementDriver :: getTruckOwnUserNo,param.getTruckOwnUserNo());
         query.eq(Objects.nonNull(param.getBreakContractPartyType()),BreakContractSettlementDriver :: getBreakContractPartyType,param.getBreakContractPartyType());