feature: 获取交易流水号

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

@@ -233,19 +233,19 @@ public class OrderPaymentService extends ServiceBase {
         return getOrderPaymentListByOrderIds(orderIds);
     }
 
-    public String getTransactionIdByOrderIdAndPaymentChannel(List<OrderPayment> orderPaymentList, int orderId, int paymentChannel) {
-        if (!Checker.isNone(orderPaymentList) && orderId > 0) {
-            OrderPayment orderPayment = orderPaymentList.stream().filter(o -> Checker.getIntegerValue(o.getOrderId()) == orderId).findFirst().orElse(null);
-            if (orderPayment != null && (!Checker.isNone(orderPayment.getTransactionId()) || !Checker.isNone(orderPayment.getAlipayTradeNo()))) {
-                if(paymentChannel == PaymentChannelEnum.AliPay.getValue()){
-                    return Checker.getStringValue(orderPayment.getAlipayTradeNo());
-                }
-
-                return orderPayment.getTransactionId();
-            }
-        }
-        return "";
-    }
+//    public String getTransactionIdByOrderIdAndPaymentChannel(List<OrderPayment> orderPaymentList, int orderId, int paymentChannel) {
+//        if (!Checker.isNone(orderPaymentList) && orderId > 0) {
+//            OrderPayment orderPayment = orderPaymentList.stream().filter(o -> Checker.getIntegerValue(o.getOrderId()) == orderId).findFirst().orElse(null);
+//            if (orderPayment != null && (!Checker.isNone(orderPayment.getTransactionId()) || !Checker.isNone(orderPayment.getAlipayTradeNo()))) {
+//                if(paymentChannel == PaymentChannelEnum.AliPay.getValue()){
+//                    return Checker.getStringValue(orderPayment.getAlipayTradeNo());
+//                }
+//
+//                return orderPayment.getTransactionId();
+//            }
+//        }
+//        return "";
+//    }
 
     public int getPaymentChannelIntByOrderPayment(OrderPayment orderPayment) {
         if (orderPayment != null && !Checker.isNone(orderPayment.getPaymentChannel())) {
@@ -253,4 +253,5 @@ public class OrderPaymentService extends ServiceBase {
         }
         return PaymentChannelEnum.UNKNOWN.getValue();
     }
+
 }

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

@@ -396,7 +396,7 @@ public class PrescriptionServices {
                     map.getStringListSafely(col0).add(p.getOrderNo());
                     map.getStringListSafely(col1).add(p.getPaymentNo());
                     int deliveryMethodInt = Checker.getIntegerValue(p.getDeliveryMethod());
-                    String transactionId = orderPaymentService.getTransactionIdByOrderIdAndPaymentChannel(orderPaymentList, Checker.getIntegerValue(p.getOrderId()), p.getPaymentChannel());
+                    String transactionId = orderPaymentService.getTransactionIdByOrderId(orderPaymentList, Checker.getIntegerValue(p.getOrderId()));
                     map.getStringListSafely(col20).add(transactionId);
                     String deliveryMethodStr =  getAdverDeliveryMethodStr(deliveryMethodInt);
                     map.getStringListSafely(col2).add(deliveryMethodStr);
@@ -1136,7 +1136,7 @@ public class PrescriptionServices {
                     map.getStringListSafely(col1).add(p.getPaymentNo());
                     int deliveryMethodInt = Checker.getIntegerValue(p.getDeliveryMethod());
                     String deliveryMethodStr =  getAdverDeliveryMethodStr(deliveryMethodInt);
-                    String transactionId = orderPaymentService.getTransactionIdByOrderIdAndPaymentChannel(orderPaymentList, Checker.getIntegerValue(p.getOrderId()), p.getPaymentChannel());
+                    String transactionId = orderPaymentService.getTransactionIdByOrderId(orderPaymentList, Checker.getIntegerValue(p.getOrderId()));
                     map.getStringListSafely(col20).add(transactionId);
                     map.getStringListSafely(col2).add(deliveryMethodStr);
                     map.getStringListSafely(col3).add(p.getDoctorName());