...

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

 package com.clx.performance.controller.pc.carrier;
 
+import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.param.pc.owner.*;
 import com.clx.performance.service.settle.SettlementOwnerService;
@@ -110,6 +111,7 @@ public class CarrierSettlementOwnerController {
     @ApiOperation(value = "编辑结算单状态",notes = "<br>By:姜文业")
     @PostMapping("/updateStatusByOrderNo")
     public Result updateStatusByOrderNo(@RequestBody @Validated UpdateStatusParam param) {
+        log.info("履约服务进行结算单状态更改，参数{}", JSONUtil.parse(param));
         settlementOwnerService.updateStatusByOrderNo(param.getOrderNo(), param.getSettlementPeriodType(), param.getFromStatus(), param.getToStatus());
         return Result.ok();
     }

performance-web/src/main/java/com/clx/performance/mapper/OwnerRunningWaterRecordMapper.java

@@ -10,6 +10,7 @@ import com.clx.performance.param.pc.PagePlatformPrepaidFreightAccountParam;
 import com.clx.performance.sqlProvider.OwnerRunningWaterRecordSqlProvider;
 import com.clx.performance.vo.pc.OwnerAccountRunningWaterRecordVO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.SelectProvider;
 
 import java.util.List;
@@ -30,12 +31,12 @@ public interface OwnerRunningWaterRecordMapper extends BaseMapper<OwnerRunningWa
     IPage<OwnerAccountRunningWaterRecordVO> ownerAccountRunningWaterPageList(Page<OwnerAccountRunningWaterRecordVO> page, PageOwnerAccountRunningWaterParam param);
 
     @SelectProvider(type = OwnerRunningWaterRecordSqlProvider.class, method = "ownerAccountRunningWaterList")
-    List<OwnerAccountRunningWaterRecordVO> ownerAccountRunningWaterList(PageOwnerAccountRunningWaterParam param);
+    List<OwnerAccountRunningWaterRecordVO> ownerAccountRunningWaterList(@Param(value = "param") PageOwnerAccountRunningWaterParam param);
 
     @SelectProvider(type = OwnerRunningWaterRecordSqlProvider.class, method = "prepaidFreightAccountList")
-    List<OwnerAccountRunningWaterRecordVO> prepaidFreightAccountList(PagePlatformPrepaidFreightAccountParam param);
+    List<OwnerAccountRunningWaterRecordVO> prepaidFreightAccountList(@Param(value = "param") PagePlatformPrepaidFreightAccountParam param);
 
     @SelectProvider(type = OwnerRunningWaterRecordSqlProvider.class, method = "marginAccountList")
-    List<OwnerAccountRunningWaterRecordVO> marginAccountList(PagePlatformMarginAccountParam param);
+    List<OwnerAccountRunningWaterRecordVO> marginAccountList(@Param(value = "param") PagePlatformMarginAccountParam param);
 
 }
\ No newline at end of file

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

@@ -37,8 +37,8 @@ public class OwnerRunningWaterRecordServiceImpl implements OwnerRunningWaterReco
 
     @Override
     public SXSSFWorkbook exportOwnerAccountRunningWaterPageList(PageOwnerAccountRunningWaterParam param) {
-        UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
-        param.setOwnerUserNo(loginUserInfo.getUserNo());
+        //UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
+//        param.setOwnerUserNo(loginUserInfo.getUserNo());
         List<OwnerAccountRunningWaterRecordVO> list = ownerRunningWaterRecordDao.ownerAccountRunningWaterList(param);
         // 组装表头
         List<ExcelField> fieldList = new ArrayList<>();

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

@@ -396,7 +396,8 @@ public class SettlementOwnerServiceImpl  implements SettlementOwnerService {
 
     @Override
     public void updateStatusByOrderNo(String orderNo, Integer settlementPeriodType, Integer fromStatus, Integer toStatus){
-        settlementOwnerDao.updateStatusByOrderNo( orderNo,  settlementPeriodType,  fromStatus,  toStatus);
+        boolean b = settlementOwnerDao.updateStatusByOrderNo(orderNo, settlementPeriodType, fromStatus, toStatus);
+        log.info("结算单更改状态结果:{}", b);
     }
 
     @Override

performance-web/src/test/java/com/clx/performance/JobTest.java

@@ -12,6 +12,7 @@ import com.clx.performance.constant.RedisConstants;
 import com.clx.performance.dao.OrderGoodsDao;
 import com.clx.performance.dao.OwnerAccountDao;
 import com.clx.performance.dao.OwnerCaseOutDao;
+import com.clx.performance.dao.settle.SettlementOwnerDao;
 import com.clx.performance.enums.OrderGoodsStatusEnum;
 import com.clx.performance.enums.OrderGoodsTruckBindEnum;
 import com.clx.performance.enums.PerformanceResultEnum;
@@ -23,6 +24,7 @@ import com.clx.performance.model.OwnerCaseOut;
 import com.clx.performance.param.pc.OwnerCaseOutParam;
 import com.clx.performance.param.pc.owner.FrozenAccountParam;
 import com.clx.performance.param.pc.owner.ThawAccountParam;
+import com.clx.performance.param.pc.owner.UpdateStatusParam;
 import com.clx.performance.service.OwnerAccountService;
 import com.msl.common.base.Optional;
 import com.msl.common.exception.ServiceSystemException;
@@ -77,13 +79,21 @@ public class JobTest {
     @Autowired
     private OwnerCaseOutDao ownerCaseOutDao;
 
+    @Autowired
+    private SettlementOwnerDao settlementOwnerDao;
+
+
 
 
     @Test
     public void test1() {
-        ThawAccountParam param = new ThawAccountParam();
-        param.setOrderType("1");
-        param.setOrderNo("PT2023102500436");
-        ownerAccountService.ownerAccountThaw(param);
+        UpdateStatusParam param = new UpdateStatusParam();
+        param.setSettlementPeriodType(1);
+        param.setOrderNo("PT2023102500446");
+        param.setFromStatus(10);
+        param.setToStatus(20);
+        performanceFeign.updateStatusByOrderNo(param);
+        System.out.println();
+
     }
 }