Merge branch 'v2.1.7_nfby' of https://gogs.ywtinfo.com/ywt/download_service into v2.1.7_nfby

src/main/java/com/ywt/mg/domain/entities/OrderPaymentRepository.java

@@ -14,6 +14,8 @@ public interface OrderPaymentRepository extends JpaRepository<OrderPayment, Inte
     @Query(value = "select * from order_payment where order_no = ? order by id desc limit 1;", nativeQuery = true)
     OrderPayment getOrderPaymentByOrderNo(String orderNo);
 
-    @Query(value = "select * from order_payment where ( transaction_id = ? or alipay_trade_no = ? ) order by id desc limit 1;", nativeQuery = true)
-    OrderPayment getOrderPaymentByTransactionId(String transactionId, String alipayTradeNo);
+    // 本来想去搜索 alipay_trade_no 字段，后面发现 alipay_trade_no 字段里面的值（如果有的话）和 payment_no 的值一样，故进行替换
+    // @Query(value = "select * from order_payment where (transaction_id = ? or alipay_trade_no = ?) order by id desc limit 1;", nativeQuery = true)
+    @Query(value = "select * from order_payment where (transaction_id = ? or payment_no = ?) order by id desc limit 1;", nativeQuery = true)
+    OrderPayment getOrderPaymentByTransactionId(String transactionId, String paymentNo);
 }

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

@@ -48,7 +48,7 @@ public class OrderPaymentService extends ServiceBase {
      * @return {@link List<OrderPayment>}
      */
     public List<OrderPayment> getOrderPaymentListByOrderIds(List<Integer> orderIds) {
-        orderIds = orderIds.stream().filter(p-> !Checker.isNone(p) && Checker.getIntegerValue(p) > 0).collect(Collectors.toList());
+        orderIds = orderIds.stream().filter(p -> !Checker.isNone(p) && Checker.getIntegerValue(p) > 0).collect(Collectors.toList());
         int size = orderIds.size();
         if (!Checker.isNone(orderIds)) {
             // payment_status:2 表示支付成功
@@ -171,8 +171,11 @@ public class OrderPaymentService extends ServiceBase {
             if (orderPayment != null && !Checker.isNone(orderPayment.getTransactionId())) {
                 return orderPayment.getTransactionId();
             }
-            if (orderPayment != null && !Checker.isNone(orderPayment.getAlipayTradeNo())) {
-                return orderPayment.getAlipayTradeNo();
+            if (orderPayment != null
+                    && Checker.getIntegerValue(orderPayment.getPaymentChannel()) != PaymentChannelEnum.WeChat.getValue()
+                    && Checker.getIntegerValue(orderPayment.getPaymentStatus()) == PaymentStatusEnum.Success.getValue()
+                    && !Checker.isNone(orderPayment.getPaymentNo())) {
+                return orderPayment.getPaymentNo();
             }
         }
         return "";
@@ -202,8 +205,11 @@ public class OrderPaymentService extends ServiceBase {
             if (orderPayment != null && !Checker.isNone(orderPayment.getTransactionId())) {
                 return orderPayment.getTransactionId();
             }
-            if (orderPayment != null && !Checker.isNone(orderPayment.getAlipayTradeNo())) {
-                return orderPayment.getAlipayTradeNo();
+            if (orderPayment != null
+                    && Checker.getIntegerValue(orderPayment.getPaymentChannel()) != PaymentChannelEnum.WeChat.getValue()
+                    && Checker.getIntegerValue(orderPayment.getPaymentStatus()) == PaymentStatusEnum.Success.getValue()
+                    && !Checker.isNone(orderPayment.getPaymentNo())) {
+                return orderPayment.getPaymentNo();
             }
         }
         return "";