feature: 押金订单对账交易流水号问题

src/main/java/com/ywt/mg/services/DepositService.java

@@ -221,6 +221,7 @@ public class DepositService {
                     for (int i = 2; i <= size; i++) {
                         request.setPageIndex(i);
                         list = queryDepositPageList(request);
+                        orderPaymentList = orderPaymentService.getOrderPaymentListByDepositList(list.getItems());
                         map = setExcelDataMap(orderPaymentList, list, map, hospitalId, hosp, request,
                                 col0,
                                 col1,
@@ -280,7 +281,7 @@ public class DepositService {
         for (DepositOrderInfo p : list.getItems()) {
             hospitalId = Checker.getIntegerValue(p.getHospitalId());
             String hospitalName = hospitalCacheService.getCacheHospitalNameByHospitalId(hospitalId);
-            String transactionId = orderPaymentService.getTransactionIdByOrderId(orderPaymentList, Checker.getIntegerValue(p.getOrderId()));
+            String transactionId = Checker.getStringValue(orderPaymentService.getTransactionIdByOrderId(orderPaymentList, Checker.getIntegerValue(p.getOrderId())));
             String amount = FormatUtil.intShrink100ToStr(p.getAmount());
             int terminalId = Checker.getIntegerValue(p.getTerminal());
             String paymentChannel = PaymentChannelUtil.paymentChannel(terminalId);
@@ -355,6 +356,7 @@ public class DepositService {
                     for (int i = 2; i <= size; i++) {
                         request.setPageIndex(i);
                         depositPageList = queryDepositPageList(request);
+                        orderPaymentList = orderPaymentService.getOrderPaymentListByDepositList(depositPageList.getItems());
                         map = setBillDeposit(request, depositPageList, orderPaymentList, map,
                                 col0,
                                 col1,
@@ -398,7 +400,7 @@ public class DepositService {
                         String transactionId = "";
                         OrderPayment orderPayment = orderPaymentList.stream().filter(o -> o.getOrderId().intValue() == p.getOrderId().intValue()).findFirst().orElse(null);
                         if (orderPayment != null && !Checker.isNone(orderPayment.getTransactionId())) {
-                            transactionId = orderPayment.getTransactionId();
+                            transactionId = Checker.getStringValue(orderPayment.getTransactionId());
                         }
                         // 交易金额
                         String totalStr = FormatUtil.intShrink100ToStr(p.getAmount());