From b6b2dc6058db92baf2fc58e89ffb22604ff39dbb Mon Sep 17 00:00:00 2001
From: yuyang <YU930814yang>
Date: Wed, 26 Jan 2022 09:49:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=BA=E6=9E=84=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=85=85=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/xhpc/payment/controller/WxPaymentController.java | 2 +-
 .../com/xhpc/user/service/impl/XhpcCommonServiceImpl.java     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/WxPaymentController.java b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/WxPaymentController.java
index c1af930b..6b73492f 100644
--- a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/WxPaymentController.java
+++ b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/WxPaymentController.java
@@ -400,7 +400,7 @@ public class WxPaymentController {
                 //充电中
                 postRefreshBalance(money, serialMumber);
             }
-            if(UserTypeUtil.USER_TYPE.equals(xhpcRechargeOrder.getSource())){
+            if(UserTypeUtil.USER_TYPE.equals(source)){
                 //增加用户余额
                 XhpcAppUser xhpcAppUser = new XhpcAppUser();
                 xhpcAppUser.setAppUserId(xhpcRechargeOrder.getUserId());
diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcCommonServiceImpl.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcCommonServiceImpl.java
index f97db2cf..622061a0 100644
--- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcCommonServiceImpl.java
+++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcCommonServiceImpl.java
@@ -53,7 +53,7 @@ public class XhpcCommonServiceImpl implements IXhpcCommonService {
             if(communityUser!=null){
                 if(UserTypeUtil.INSERT_BALANCE.equals(status)){
                     XhpcCommunityPersonnel xhpcCommunityPersonnel=new XhpcCommunityPersonnel();
-                    xhpcCommunityPersonnel.setCommunityPersonnelId(Long.valueOf(communityUser.get("communityUser").toString()));
+                    xhpcCommunityPersonnel.setCommunityPersonnelId(Long.valueOf(communityUser.get("appUserId").toString()));
                     xhpcCommunityPersonnel.setRechargeMoney(money);
                     xhpcCommunityPersonnel.setRemark(remark);
                     xhpcCommunityPersonnel.setRechargeType(type);
@@ -67,7 +67,7 @@ public class XhpcCommonServiceImpl implements IXhpcCommonService {
             if(customersUser!=null){
                 if(UserTypeUtil.INSERT_BALANCE.equals(status)){
                     XhpcCustomersPersonnel xhpcCustomersPersonnel =new XhpcCustomersPersonnel();
-                    xhpcCustomersPersonnel.setCustomersPersonnelId(Long.valueOf(customersUser.get("communityUser").toString()));
+                    xhpcCustomersPersonnel.setCustomersPersonnelId(Long.valueOf(customersUser.get("appUserId").toString()));
                     xhpcCustomersPersonnel.setRechargeMoney(money);
                     xhpcCustomersPersonnel.setRemark(remark);
                     xhpcCustomersPersonnel.setRechargeType(type);