Merge remote-tracking branch 'origin/v6.3_small_version_20231102' into v6.3_small_version_20231102

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

 package com.clx.performance.service.impl.settle;
 
+import com.clx.performance.dao.OrderGoodsDao;
 import com.clx.performance.dao.settle.SettlementDriverDao;
 import com.clx.performance.dao.settle.SettlementDriverDetailDao;
 import com.clx.performance.dao.settle.SettlementOwnerDao;
@@ -11,6 +12,7 @@ import com.clx.performance.enums.settle.SettlementLogEnum;
 import com.clx.performance.enums.settle.SettlementOwnerEnum;
 import com.clx.performance.enums.settle.SettlementPlatformEnum;
 import com.clx.performance.extranal.user.OwnerInfoService;
+import com.clx.performance.model.OrderGoods;
 import com.clx.performance.model.settle.SettlementDriver;
 import com.clx.performance.model.settle.SettlementDriverDetail;
 import com.clx.performance.model.settle.SettlementOwner;
@@ -60,6 +62,10 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
     private  SettlementLogService settlementLogService;
 
 
+    @Autowired
+    private OrderGoodsDao orderGoodsDao;
+
+
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -71,7 +77,9 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
         SettlementOwner settlementOwner = null;
 
         OwnerInfoFeignVO ownerInfo = ownerInfoService.getOwnerInfo(settlementOwnerDetail.getOwnerUserNo());
-        if (Objects.equals(ownerInfo.getSettlementAccountPeriod(),2)){  //月结
+
+        OrderGoods orderGoods = orderGoodsDao.getByOrderGoodsNo(settlementOwnerDetail.getOrderGoodsNo()).get();
+        if (Objects.equals(orderGoods.getSettlementAccountPeriod(),2)){  //月结
 
             LocalDateTime settlementPeriodTime = LocalDateTimeUtils.getBeginMonthDate();
             settlementOwner = settlementOwnerDao.selectUnlockOfSettlementPeriodMonth(settlementOwnerDetail.getOrderNo(), settlementPeriodTime, settlementOwnerDetail.getInvoiceType()).orNull();