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

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

@@ -20,4 +20,6 @@ public interface BreakContractOwnerRecordDao extends BaseDao<BreakContractOwnerR
 
     IPage<BreakContractOwnerRecord> pageOwnerBreakContractOwnerRecordList(PageOwnerBreakContractOwnerRecordParam param);
 
+    boolean uploadPayTime(BreakContractOwnerRecord breakContractOwnerRecord);
+
 }

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

@@ -48,4 +48,13 @@ public class BreakContractOwnerRecordDaoImpl extends BaseDaoImpl<BreakContractOw
         query.orderByDesc(BreakContractOwnerRecord::getId);
         return baseMapper.selectPage(Page.of(param.getPage(), param.getPageSize()),query);
     }
+
+    @Override
+    public boolean uploadPayTime(BreakContractOwnerRecord breakContractOwnerRecord) {
+        return update(lUdWrapper()
+                .eq(BreakContractOwnerRecord::getSettlementNo, breakContractOwnerRecord.getSettlementNo())
+                .set(BreakContractOwnerRecord::getPayStatus, breakContractOwnerRecord.getPayStatus())
+                .set(BreakContractOwnerRecord::getPayTime, breakContractOwnerRecord.getPayTime())
+        );
+    }
 }

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

@@ -9,6 +9,7 @@ import com.clx.order.feign.OrderFeign;
 import com.clx.order.vo.feign.FeignOrderVO;
 import com.clx.order.vo.pc.owner.OwnerQuotationDetailVO;
 import com.clx.performance.dao.OrderChildDao;
+import com.clx.performance.dao.breakcontract.BreakContractOwnerRecordDao;
 import com.clx.performance.dao.breakcontract.BreakContractOwnerRuleDao;
 import com.clx.performance.dao.breakcontract.BreakContractSettlementLogDao;
 import com.clx.performance.dao.breakcontract.BreakContractSettlementOwnerDao;
@@ -16,6 +17,7 @@ import com.clx.performance.dao.settle.SettlementPlatformAccountDao;
 import com.clx.performance.enums.*;
 import com.clx.performance.extranal.order.QuotationService;
 import com.clx.performance.model.OrderChild;
+import com.clx.performance.model.breakcontract.BreakContractOwnerRecord;
 import com.clx.performance.model.breakcontract.BreakContractOwnerRule;
 import com.clx.performance.model.breakcontract.BreakContractSettlementLog;
 import com.clx.performance.model.breakcontract.BreakContractSettlementOwner;
@@ -77,6 +79,7 @@ public class BreakContractSettlementOwnerServiceImpl  implements BreakContractSe
     private final OrderFeign orderFeign;
     private final QuotationService quotationService;
     private final BreakContractOwnerRecordService breakContractOwnerRecordService;
+    private final BreakContractOwnerRecordDao breakContractOwnerRecordDao;
 
     
 
@@ -200,6 +203,12 @@ public class BreakContractSettlementOwnerServiceImpl  implements BreakContractSe
         param.setStatus(BreakContractSettlementOwnerEnum.Status.OWNER_CONFIRMED_PLATFORM_PAYMENT.getCode());
         breakContractSettlementOwnerDao.saveCarrierBreakContractPayee(param);
 
+        BreakContractOwnerRecord record = new BreakContractOwnerRecord();
+        record.setSettlementNo(settlementOwner.getSettlementNo());
+        record.setPayStatus(BreakContractOwnerRecordEnum.PayStatus.YES.getCode());
+        record.setPayTime(LocalDateTime.now());
+        breakContractOwnerRecordDao.uploadPayTime(record);
+
         UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
         //保存结算单日志----平台付款
         breakContractSettlementLogService.saveBreakSettlementLog(settlementOwner.getSettlementNo(),