From 01112667bbc7aba4e6fc889d9287324d5b888607 Mon Sep 17 00:00:00 2001
From: wuxicheng <1441859745@qq.com>
Date: Thu, 11 May 2023 17:49:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=B7=A5=E5=8E=82=E6=9E=84?=
 =?UTF-8?q?=E9=80=A0=E7=A7=81=E6=9C=89=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/bnyer/pay/design/factory/PayFactory.java | 4 ++++
 .../com/bnyer/pay/service/impl/UnifiedPayServiceImpl.java  | 7 ++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/design/factory/PayFactory.java b/bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/design/factory/PayFactory.java
index 0f3da2e..c9afe6c 100644
--- a/bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/design/factory/PayFactory.java
+++ b/bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/design/factory/PayFactory.java
@@ -22,6 +22,10 @@ public class PayFactory {
             .put(EnumPayType.KS_PAY.getType(),new WxPayStrategy())
             .build();
 
+    private PayFactory(){
+
+    }
+
     public static class SingletonHolder{
         public static PayFactory payStrategy = new PayFactory();
     }
diff --git a/bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/service/impl/UnifiedPayServiceImpl.java b/bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/service/impl/UnifiedPayServiceImpl.java
index c0ade61..9ca0618 100644
--- a/bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/service/impl/UnifiedPayServiceImpl.java
+++ b/bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/service/impl/UnifiedPayServiceImpl.java
@@ -1,6 +1,5 @@
 package com.bnyer.pay.service.impl;
 
-import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.bnyer.common.core.domain.PayInfo;
 import com.bnyer.common.core.domain.R;
@@ -13,8 +12,8 @@ import com.bnyer.common.core.utils.ip.IpUtils;
 import com.bnyer.common.core.vo.UserInfoVo;
 import com.bnyer.common.security.utils.SecurityUtils;
 import com.bnyer.order.api.bean.query.VipOrderExtQuery;
-import com.bnyer.order.api.remote.RemoteVipOrderService;
 import com.bnyer.order.api.bean.vo.VipOrderVo;
+import com.bnyer.order.api.remote.RemoteVipOrderService;
 import com.bnyer.pay.bean.bo.QueryOrderBo;
 import com.bnyer.pay.bean.bo.UnifiedOrderBo;
 import com.bnyer.pay.bean.dto.AddPayInfoDto;
@@ -34,8 +33,6 @@ import com.bnyer.pay.service.UnifiedPayService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.ObjectUtils;
 
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
@@ -200,7 +197,7 @@ public class UnifiedPayServiceImpl implements UnifiedPayService {
         //先查询系统支付单是否已经完成支付，如果因为延迟导致没有及时同步，在调用第三方接口查询支付状态返回
         PayInfoDetailsVo payInfoDetailsVo = payInfoService.queryPayInfoDetails(dto.getPayId());
         if (Objects.isNull(payInfoDetailsVo)){
-            throw new ServiceException(ResponseEnum.NOT_EXIST);
+            throw new ServiceException(ResponseEnum.NOT_EXIST,"支付订单");
         }
         Integer payStatus = payInfoDetailsVo.getPayStatus();
         EnumPayStatus enumPayStatus = EnumPayStatus.getEnumPayStatusByStatus(payStatus);