基础配置

dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/paymentchannelorder/processor/wechat/WeChatPayProcessor.java

@@ -118,17 +118,22 @@ public class WeChatPayProcessor extends IChannelPayService {
     }
 
     private PaymentOrderRefundStatusEnum transformRefundStatus(String status) {
+        PaymentOrderRefundStatusEnum refundStatus = null;
         switch (status) {
             case "SUCCESS":
-                return PaymentOrderRefundStatusEnum.SUCCESS;
+                refundStatus = PaymentOrderRefundStatusEnum.SUCCESS;
+                break;
             case "CLOSED":
-                return PaymentOrderRefundStatusEnum.CLOSED;
+                refundStatus = PaymentOrderRefundStatusEnum.CLOSED;
+                break;
             case "PROCESSING":
-                return PaymentOrderRefundStatusEnum.PROCESSING;
+                refundStatus = PaymentOrderRefundStatusEnum.PROCESSING;
+                break;
             case "ABNORMAL":
-                return PaymentOrderRefundStatusEnum.ABNORMAL;
+                refundStatus = PaymentOrderRefundStatusEnum.ABNORMAL;
+                break;
             default:
-                return null;
         }
+        return refundStatus;
     }
 }

dating-agency-mall-server/src/main/java/com/qniao/dam/query/marriagebounty/impl/MarriageBountyOrderQueryServiceImpl.java

@@ -32,7 +32,8 @@ public class MarriageBountyOrderQueryServiceImpl implements MarriageBountyOrderQ
     private MarriageBountyOrderRewardDao marriageBountyOrderRewardDao;
 
     @Override
-    public MarriageBountyOrder queryBy(Long userId, Long miId, MarriageBountyOrderStatusEnum status, MarriageBountyOrderPaymentStatusEnum paymentStatus) {
+    public MarriageBountyOrder queryBy(Long userId, Long miId, MarriageBountyOrderStatusEnum status,
+                                       MarriageBountyOrderPaymentStatusEnum paymentStatus) {
         MarriageBountyOrder marriageBountyOrder = marriageBountyOrderDao.selectOne(new LambdaQueryWrapper<MarriageBountyOrder>()
                 .eq(MarriageBountyOrder::getUserId, userId)
                 .eq(MarriageBountyOrder::getMiId, miId)

dating-agency-mall-server/src/main/java/com/qniao/dam/query/paymentorderrefund/impl/PaymentOrderRefundQueryServiceImpl.java

@@ -9,6 +9,7 @@ import com.qniao.dam.query.paymentorderrefund.PaymentOrderRefundQueryService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.Arrays;
 import java.util.List;
 
 @Service
@@ -24,7 +25,7 @@ public class PaymentOrderRefundQueryServiceImpl implements PaymentOrderRefundQue
             for (Long tradeOrderId : tradeOrderIdList) {
                 if (paymentOrderRefundDao.selectCount(new LambdaQueryWrapper<PaymentOrderRefund>()
                         .eq(PaymentOrderRefund::getTradeOrderId, tradeOrderId)
-                        .eq(PaymentOrderRefund::getStatus, PaymentOrderRefundStatusEnum.SUCCESS)) == 0) {
+                        .in(PaymentOrderRefund::getStatus, Arrays.asList(PaymentOrderRefundStatusEnum.SUCCESS, PaymentOrderRefundStatusEnum.PROCESSING))) == 0) {
                     status = false;
                     break;
                 }