Merge branch 'refs/heads/v17.5_order_child_sync_broker_20240617' into test

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

@@ -174,7 +174,7 @@ public class SettlementOwnerDetailDaoImpl extends BaseDaoImpl<SettlementOwnerDet
     @Override
     public List<SettlementOwnerDetail> listInvoiceStatusSync() {
         return list(lUdWrapper()
-                .gt(SettlementOwnerDetail::getCreateTime, LocalDateTime.now().minusMonths(3))
+                .gt(SettlementOwnerDetail::getCreateTime, LocalDateTime.now().minusMonths(1))
                 .eq(SettlementOwnerDetail::getInvoiceChannel, SettlementOwnerDetailEnum.InvoiceChannel.BROKER.getCode())
                 .eq(SettlementOwnerDetail::getInvoiceStatus, SettlementOwnerDetailEnum.InvoiceStatus.NO.getCode())
                 .eq(SettlementOwnerDetail::getPayStatus, SettlementOwnerDetailEnum.PayStatus.YES.getCode())
@@ -184,11 +184,21 @@ public class SettlementOwnerDetailDaoImpl extends BaseDaoImpl<SettlementOwnerDet
     @Override
     public List<SettlementOwnerDetail> listPayStatusSync() {
         return list(lUdWrapper()
-                .gt(SettlementOwnerDetail::getCreateTime, LocalDateTime.now().minusMonths(3))
+                .gt(SettlementOwnerDetail::getCreateTime, LocalDateTime.now().minusMonths(1))
                 .eq(SettlementOwnerDetail::getInvoiceChannel, SettlementOwnerDetailEnum.InvoiceChannel.BROKER.getCode())
                 .eq(SettlementOwnerDetail::getPayStatus, SettlementOwnerDetailEnum.PayStatus.NO.getCode())
                 .eq(SettlementOwnerDetail::getInvoiceType, SettlementOwnerEnum.InvoiceType.ONLINE.getCode())
         );
     }
 
+    @Override
+    public List<SettlementOwnerDetail> listInvoiceTypeSync() {
+        return list(lUdWrapper()
+                .gt(SettlementOwnerDetail::getCreateTime, LocalDateTime.now().minusMonths(1))
+                .le(SettlementOwnerDetail::getCreateTime, LocalDateTime.now().minusMinutes(3))
+                .eq(SettlementOwnerDetail::getInvoiceChannel, SettlementOwnerDetailEnum.InvoiceChannel.BROKER.getCode())
+                .isNull(SettlementOwnerDetail::getInvoiceType)
+        );
+    }
+
 }

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

@@ -52,4 +52,5 @@ public interface SettlementOwnerDetailDao extends BaseDao<SettlementOwnerDetailM
     List<SettlementOwnerDetail>listInvoiceStatusSync();
 
     List<SettlementOwnerDetail> listPayStatusSync();
+    List<SettlementOwnerDetail> listInvoiceTypeSync();
 }

performance-web/src/main/java/com/clx/performance/job/settlement/SettlementJob.java

@@ -34,23 +34,16 @@ public class SettlementJob {
     @XxlJob("settlementInvoiceTypeSync")
     public void settlementInvoiceTypeSync() {
         // 首次
-        List<OrderChildSyncTransportInvoiceRecord> recordList = orderChildSyncTransportInvoiceRecordDao
-                .selectListForJobOfFirst();
-        // 异常
-        List<OrderChildSyncTransportInvoiceRecord> recordList1 = orderChildSyncTransportInvoiceRecordDao
-                .selectListForJob();
-        recordList.addAll(recordList1);
+        List<SettlementOwnerDetail> recordList = settlementOwnerDetailDao
+                .listInvoiceTypeSync();
 
         log.info("待同步无车承运运单状态，size:{}", recordList.size());
         if (recordList.isEmpty()) {return;}
 
-        for (OrderChildSyncTransportInvoiceRecord item : recordList) {
+        for (SettlementOwnerDetail item : recordList) {
 
             settlementMqService.invoiceTypeSync(item.getChildNo());
         }
-
-        orderChildSyncTransportInvoiceRecordDao.deleteByKeys(
-                recordList.stream().map(item->item.getId()).collect(Collectors.toList()));
     }
 
     /**

performance-web/src/main/java/com/clx/performance/listener/OrderChildSyncTransportListener.java

@@ -125,12 +125,6 @@ public class OrderChildSyncTransportListener {
             } catch (Exception e) {
                 log.info("当前OrderChildSyncTransportListener监听同步网络货运失败,运单号{}, 错误信息{}", orderChild.getChildNo(), ExceptionUtils.getStackTrace(e));
 
-            } finally {
-                OrderChildSyncTransportInvoiceRecord entity = new OrderChildSyncTransportInvoiceRecord();
-                entity.setChildNo(orderChild.getChildNo());
-                entity.setType(TransportSyncTypeEnum.Type.RESULT.getCode());
-                entity.setRemark("异步查询状态");
-                orderChildSyncTransportInvoiceRecordDao.saveEntity(entity);
             }
 
         }
@@ -154,15 +148,6 @@ public class OrderChildSyncTransportListener {
 
         OrderGoods orderGoods = orderGoodsDao.getByOrderGoodsNo(orderChild.getOrderGoodsNo()).get();
 
-//        // 开票服务费
-//        settlementOwnerDetail.setInvoiceServiceFee(settlementCommonService.invoiceServiceFeeCalc(orderChild.getSettlementWay(), settlementOwnerDetail));
-//        // 开票金额
-//        settlementOwnerDetail.setInvoiceFreight(settlementCommonService.invoiceFreightCalc(orderChild.getSettlementWay(),
-//                orderGoods.getInvoiceServiceFeeRate(), settlementOwnerDetail));
-
-        // 结算金额
-        settlementOwnerDetail.setSettlementFreight(settlementCommonService.settlementFreightCalc(orderChild.getSettlementWay(), settlementOwnerDetail));
-
         // 未税 卸车减货损不用生成扣除相关流水逻辑
         if (Objects.equals(invoiceType, SettlementOwnerEnum.InvoiceType.ONLINE.getCode())
                 && Objects.equals(orderGoods.getPlatformFreightQuotationTaxType(),QuotationEnum.PlatformFreightQuotationTaxType.NO.getCode())

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

@@ -269,22 +269,14 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
             }
 
             if (Objects.equals(result.getSyncStatus(), 0)) {
-                OrderChildSyncTransportInvoiceRecord entity = new OrderChildSyncTransportInvoiceRecord();
-                entity.setChildNo(orderChild.getChildNo());
-                entity.setType(TransportSyncTypeEnum.Type.EXCEPTION.getCode());
-                entity.setRemark("处理中");
-                orderChildSyncTransportInvoiceRecordDao.saveEntity(entity);
+
                 return;
             }
 
             // 发送mq （结算）
             settlementMqService.settle(orderChild.getChildNo(), invoiceType, remark);
         }catch (Exception e){
-            OrderChildSyncTransportInvoiceRecord entity = new OrderChildSyncTransportInvoiceRecord();
-            entity.setChildNo(orderChild.getChildNo());
-            entity.setType(TransportSyncTypeEnum.Type.EXCEPTION.getCode());
-            entity.setRemark("接口调用失败");
-            orderChildSyncTransportInvoiceRecordDao.saveEntity(entity);
+            log.info("结算获取状态失败， 运单号 {}",mq.getChildNo(),e);
         }
     }