Merge remote-tracking branch 'origin/v5.5_settlement_20231011' into v5.5_settlement_20231011

performance-api/src/main/java/com/clx/performance/vo/pc/carrier/settle/CarrierPageSettlementDriverVO.java

@@ -40,7 +40,7 @@ public class CarrierPageSettlementDriverVO {
     @ApiModelProperty(value = "结算单号")
     private String settlementNo;
     @ApiModelProperty(value = "实际净重（吨）")
-    private BigDecimal weight;                      
+    private BigDecimal weight;
     @MoneyOutConvert
     @ApiModelProperty(value = "运费单价")
     private BigDecimal freightPrice;
@@ -61,6 +61,8 @@ public class CarrierPageSettlementDriverVO {
     @MoneyOutConvert
     @ApiModelProperty(value = "结算金额")
     private BigDecimal settlementFreight;
+    @ApiModelProperty(value = "状态")
+    private Integer status;
     @ApiModelProperty(value = "创建时间")
     private String createTime;
     @ApiModelProperty(value = "结算平台 1：马上来  2：网运平台")

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

@@ -13,6 +13,7 @@ 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;
 
@@ -30,7 +31,7 @@ public class CarrierSettlementDriverController {
     @ApiOperation(value = "结算单列表（车主）",notes = "<br>By:刘海泉")
     @PostMapping("/pageCarrierSettlementDriver")
     @UnitCovert(param = false)
-    public Result<PageData<CarrierPageSettlementDriverVO>> pageCarrierSettlementDriver(PageCarrierSettlementDriverParam param) {
+    public Result<PageData<CarrierPageSettlementDriverVO>> pageCarrierSettlementDriver(@RequestBody @Validated PageCarrierSettlementDriverParam param) {
         IPage<CarrierPageSettlementDriverVO> page  = settlementDriverService.pageCarrierSettlementDriver(param);
         return Result.page(page.getRecords(),page.getTotal(),page.getPages());
     }

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

@@ -98,6 +98,7 @@ public class OwnerSettlementOwnerController {
 
     @ApiOperation(value = "货主端-结算单列表" ,notes = "<br>By:李瑞新")
     @PostMapping("/pageSettlementOwner")
+    @UnitCovert(param = false)
     public Result<PageData<OwnerPageSettlementOwnerVO>> pageSettlementOwner(@RequestBody @Validated PageOwnerSettlementParam param){
         IPage<OwnerPageSettlementOwnerVO> page = settlementOwnerService.pageSettlementOwner(param);
         return Result.page(page.getRecords(), page.getTotal(), page.getPages());

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

@@ -242,7 +242,7 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
         settlementOwner.setInvoiceFreight(settlementOwnerDetail.getInvoiceFreight());
 
         settlementOwner.setPrepayFreight(settlementOwnerDetail.getPrepayFreight());
-        settlementOwner.setStatus(SettlementOwnerEnum.Status.TO_BE_ACCOUNT.getCode());
+        settlementOwner.setStatus(SettlementOwnerEnum.Status.TO_BE_LOCKED.getCode());
 
         settlementOwnerDao.saveEntity(settlementOwner);