承运与无车承运对接

performance-web/src/main/java/com/clx/performance/dao/impl/settle/SettlementOwnerDaoImpl.java

@@ -173,9 +173,11 @@ public class SettlementOwnerDaoImpl extends BaseDaoImpl<SettlementOwnerMapper, S
     }
 
     @Override
-    public Optional<SettlementOwner> selectUnlockOfSettlementPeriodMonth(String orderNo, LocalDateTime settlementPeriodTime, Integer invoiceType) {
+    public Optional<SettlementOwner> selectUnlockOfSettlementPeriodMonth(String orderNo, Integer invoicingCompanyId,
+                                                                         LocalDateTime settlementPeriodTime, Integer invoiceType) {
         return Optional.of(lQrWrapper()
                         .eq(SettlementOwner::getOrderNo, orderNo)
+                        .eq(SettlementOwner::getInvoicingCompanyId, invoicingCompanyId)
                         .eq(SettlementOwner::getSettlementPeriodType,
                                 SettlementOwnerEnum.SettlementPeriodType.MONTH.getCode())
                         .eq(SettlementOwner::getSettlementPeriodTime, settlementPeriodTime)
@@ -186,10 +188,12 @@ public class SettlementOwnerDaoImpl extends BaseDaoImpl<SettlementOwnerMapper, S
     }
     @Override
     public Optional<SettlementOwner> selectUnlockOfSettlementPeriodDaily(String orderNo,
+                                                                         Integer invoicingCompanyId,
                                                                          LocalDateTime settlementPeriodTime,
                                                                          Integer invoiceType) {
         return Optional.of(lQrWrapper()
                         .eq(SettlementOwner::getOrderNo, orderNo)
+                        .eq(SettlementOwner::getInvoicingCompanyId, invoicingCompanyId)
                         .eq(SettlementOwner::getSettlementPeriodType,
                                 SettlementOwnerEnum.SettlementPeriodType.DAILY.getCode())
                         .eq(SettlementOwner::getSettlementPeriodTime, settlementPeriodTime)
@@ -200,9 +204,12 @@ public class SettlementOwnerDaoImpl extends BaseDaoImpl<SettlementOwnerMapper, S
     }
 
     @Override
-    public Optional<SettlementOwner> selectUnlockOfSettlementPeriodImmediate(String orderNo, Integer invoiceType) {
+    public Optional<SettlementOwner> selectUnlockOfSettlementPeriodImmediate(String orderNo,
+                                                                             Integer invoicingCompanyId,
+                                                                             Integer invoiceType) {
         return Optional.of(lQrWrapper()
                         .eq(SettlementOwner::getOrderNo, orderNo)
+                        .eq(SettlementOwner::getInvoicingCompanyId, invoicingCompanyId)
                         .eq(SettlementOwner::getSettlementPeriodType, SettlementOwnerEnum.SettlementPeriodType.IMMEDIATE.getCode())
                         .eq(SettlementOwner::getInvoiceType, invoiceType)
                         .eq(SettlementOwner::getStatus, SettlementOwnerEnum.Status.TO_BE_LOCKED.getCode())

performance-web/src/main/java/com/clx/performance/dao/settle/SettlementOwnerDao.java

@@ -36,14 +36,17 @@ public interface SettlementOwnerDao extends BaseDao<SettlementOwnerMapper, Settl
     IPage<SettlementOwner> pageSettlementOwner(Long userNo,PageOwnerSettlementParam param);
 
     Optional<SettlementOwner> selectUnlockOfSettlementPeriodMonth(@Param("orderNo")String orderNo,
+                                                                  @Param("invoicingCompanyId") Integer invoicingCompanyId,
                                                                   @Param("settlementPeriodTime") LocalDateTime settlementPeriodTime,
                                                                   @Param("invoiceType")Integer invoiceType);
 
     Optional<SettlementOwner> selectUnlockOfSettlementPeriodDaily(String orderNo,
+                                                                  Integer invoicingCompanyId,
                                                                   LocalDateTime settlementPeriodTime,
                                                                   Integer invoiceType);
 
     Optional<SettlementOwner> selectUnlockOfSettlementPeriodImmediate(@Param("orderNo")String orderNo,
+                                                                      @Param("invoicingCompanyId") Integer invoicingCompanyId,
                                                                       @Param("invoiceType")Integer invoiceType);
     List<SettlementOwner> listToBeLockOfSettlementPeriodMonth(@Param("settlementPeriodTime") LocalDateTime settlementPeriodTime);
 

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

@@ -132,6 +132,7 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
             log.info("月结初始化货主结算单");
             LocalDateTime settlementPeriodTime = LocalDateTimeUtils.getBeginMonthDate();
             settlementOwner = settlementOwnerDao.selectUnlockOfSettlementPeriodMonth(settlementOwnerDetail.getOrderNo(),
+                    settlementOwnerDetail.getInvoicingCompanyId(),
                     settlementPeriodTime, settlementOwnerDetail.getInvoiceType()).orNull();
             if (settlementOwner == null){   // 月结初始化
                 settlementNo = settlementPeriodMonthInit(settlementOwnerDetail, settlementPeriodTime,
@@ -147,6 +148,7 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
             log.info("日结初始化货主结算单");
             LocalDateTime settlementPeriodTime = LocalDateTimeUtils.getDayStart();
             settlementOwner = settlementOwnerDao.selectUnlockOfSettlementPeriodDaily(settlementOwnerDetail.getOrderNo(),
+                    settlementOwnerDetail.getInvoicingCompanyId(),
                     settlementPeriodTime, settlementOwnerDetail.getInvoiceType()).orNull();
             if (settlementOwner == null){   // 日结初始化
                 settlementNo = settlementPeriodMonthInit(settlementOwnerDetail, settlementPeriodTime,
@@ -161,6 +163,7 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
             log.info("拉运完成结初始化货主结算单");
 
             settlementOwner = settlementOwnerDao.selectUnlockOfSettlementPeriodImmediate(settlementOwnerDetail.getOrderNo(),
+                    settlementOwnerDetail.getInvoicingCompanyId(),
                     settlementOwnerDetail.getInvoiceType()).orNull();
             if (settlementOwner == null){   // 拉运完成初始化
                 settlementNo = settlementPeriodMonthInit(settlementOwnerDetail, null,
@@ -324,7 +327,8 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
                                              OwnerInfoFeignVO ownerInfo){
 
 
-        FeignOrderInfoVO orderInfo = orderService.getOrderInfo(settlementOwnerDetail.getOrderNo()).orElseThrow(PerformanceResultEnum.ORDER_INVALID);
+        FeignOrderInfoVO orderInfo = orderService.getOrderInfo(settlementOwnerDetail.getOrderNo())
+                .orElseThrow(PerformanceResultEnum.ORDER_INVALID);
 
         //获取所有detail
 
@@ -337,7 +341,7 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
         settlementOwner.setOwnerName(settlementOwnerDetail.getOwnerName());
         settlementOwner.setOrderNo(settlementOwnerDetail.getOrderNo());
 
-        settlementOwner.setSettlementPeriodType(SettlementOwnerEnum.SettlementPeriodType.MONTH.getCode());
+        settlementOwner.setSettlementPeriodType(settlementPeriodType);
         settlementOwner.setSettlementPeriodTime(settlementPeriodTime);
 
         settlementOwner.setWeight(settlementOwnerDetail.getWeight());
@@ -366,10 +370,12 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
         settlementOwner.setCompanyContactAddress(ownerInfo.getContactsAddress());
         settlementOwner.setSettlementWay(settlementOwnerDetail.getSettlementWay());
         //设置开票公司
-        settlementOwner.setInvoicingCompanyId(orderInfo.getInvoicingCompanyId());
-        settlementOwner.setInvoicingCompanyShorterName(orderInfo.getInvoicingCompanyShorterName());
-        settlementOwner.setInvoicingCompanyGroupCode(orderInfo.getInvoicingCompanyGroupCode());
+        settlementOwner.setInvoicingCompanyId(settlementOwnerDetail.getInvoicingCompanyId());
+        settlementOwner.setInvoicingCompanyShorterName(settlementOwnerDetail.getInvoicingCompanyShorterName());
+        settlementOwner.setInvoicingCompanyGroupCode(settlementOwnerDetail.getInvoicingCompanyGroupCode());
         settlementOwner.setReportFlag(orderInfo.getReportFlag());
+        // 开票服务费
+        settlementOwner.setInvoiceServiceFee(settlementOwnerDetail.getInvoiceServiceFee());
         settlementOwnerDao.saveEntity(settlementOwner);
 
         //保存结算单日志----创建结算单
@@ -416,6 +422,7 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
     /**
      * 创建结算单号
      */
+    @Override
     public String settlementNoGenerate(){
         return uniqueOrderNumService.getUniqueOrderNum(com.msl.common.utils.LocalDateTimeUtils.convertLocalDateTimeToString(LocalDateTime.now(), com.msl.common.utils.LocalDateTimeUtils.DATE_DAY));
     }