From f610ac3c18097f2f66bb4331be2cc26cc11e1e6c Mon Sep 17 00:00:00 2001
From: wuxicheng <1441859745@qq.com>
Date: Thu, 4 May 2023 09:35:16 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=B8=8B=E5=8D=95openid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/bnyer/common/core/domain/AlipayConfig.java     | 6 ------
 .../main/java/com/bnyer/common/core/domain/VipOrder.java    | 6 ------
 .../java/com/bnyer/pay/design/strategy/KSPayStrategy.java   | 2 +-
 .../java/com/bnyer/pay/design/strategy/WxPayStrategy.java   | 2 +-
 4 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/AlipayConfig.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/AlipayConfig.java
index d3fd3dc..1378c7a 100644
--- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/AlipayConfig.java
+++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/AlipayConfig.java
@@ -28,12 +28,6 @@ import lombok.ToString;
 @NoArgsConstructor
 @TableName(value = "pay_alipay_config")
 public class AlipayConfig extends BaseDomain {
-    /**
-     * 主键
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    @ApiModelProperty(value="主键")
-    private Long id;
 
     /**
      * appid
diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/VipOrder.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/VipOrder.java
index 5da1a71..b103165 100644
--- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/VipOrder.java
+++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/VipOrder.java
@@ -30,12 +30,6 @@ import lombok.ToString;
 @NoArgsConstructor
 @TableName(value = "order_vip_order")
 public class VipOrder extends BaseDomain {
-    /**
-     * 主键
-     */
-    @TableId(value = "id", type = IdType.ASSIGN_ID)
-    @ApiModelProperty(value="主键")
-    private Long id;
 
     /**
      * 订单id
diff --git a/bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/design/strategy/KSPayStrategy.java b/bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/design/strategy/KSPayStrategy.java
index 497daf2..13c1555 100644
--- a/bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/design/strategy/KSPayStrategy.java
+++ b/bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/design/strategy/KSPayStrategy.java
@@ -65,7 +65,7 @@ public class KSPayStrategy extends AbstractPayStrategy{
                 throw new ServiceException(ResponseEnum.PAY_CONFIG_ERROR);
             }
             KspayConfig kspayConfig = kspayConfigList.get(0);
-            String openId = SecurityContextHolder.get("fhCode");
+            String openId = SecurityContextHolder.getFhOpenId();
             String appId = kspayConfig.getAppid();
             String backurl = kspayConfig.getBackurl();
             String secret = kspayConfig.getSecret();
diff --git a/bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/design/strategy/WxPayStrategy.java b/bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/design/strategy/WxPayStrategy.java
index 0538d04..5202bf4 100644
--- a/bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/design/strategy/WxPayStrategy.java
+++ b/bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/design/strategy/WxPayStrategy.java
@@ -83,7 +83,7 @@ public class WxPayStrategy extends AbstractPayStrategy {
     private PayInOrderVo jsApiPay(UnifiedOrderDto dto) {
         WxpayConfig wxPayConfig = wxPayManager.getWxPayConfigByTradeType(dto.getTradeType());
         WxPayService wxPayService = wxPayManager.getWxPayService(wxPayConfig);
-        String openId = SecurityContextHolder.get("wxCode");
+        String openId = SecurityContextHolder.getWechatOpenId();
         try {
             WxPayUnifiedOrderRequest orderRequest = new WxPayUnifiedOrderRequest();
             orderRequest.setOpenid(openId);