From 80fa35048cac7670a8f631b8159915175bba6771 Mon Sep 17 00:00:00 2001
From: Sum1Dream <418471657@qq.com>
Date: Tue, 25 Jan 2022 11:31:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/cweb/controller/OutRechargeOrderController.java  | 2 +-
 .../main/java/com/cweb/controller/pay/UnionPayController.java | 4 ++--
 .../com/hai/service/impl/OutRechargeOrderServiceImpl.java     | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/hai-cweb/src/main/java/com/cweb/controller/OutRechargeOrderController.java b/hai-cweb/src/main/java/com/cweb/controller/OutRechargeOrderController.java
index 5a3c4146..ae99191d 100644
--- a/hai-cweb/src/main/java/com/cweb/controller/OutRechargeOrderController.java
+++ b/hai-cweb/src/main/java/com/cweb/controller/OutRechargeOrderController.java
@@ -474,7 +474,7 @@ public class OutRechargeOrderController {
 
             outRechargeOrderService.goldPayOrder(userInfoModel.getHighUser().getId(), order.getId());
 
-            if (order.getRechargeType() == 1) {
+            if (order.getRechargeType() != null && order.getRechargeType() == 1) {
                 outRechargeOrderService.getMobile(order.getRechargeContent() , order.getOrderPrice().intValue() , order.getOrderNo());
             }
 
diff --git a/hai-cweb/src/main/java/com/cweb/controller/pay/UnionPayController.java b/hai-cweb/src/main/java/com/cweb/controller/pay/UnionPayController.java
index 258eb4c4..f0bb6ec4 100644
--- a/hai-cweb/src/main/java/com/cweb/controller/pay/UnionPayController.java
+++ b/hai-cweb/src/main/java/com/cweb/controller/pay/UnionPayController.java
@@ -386,7 +386,7 @@ public class UnionPayController {
 
                     order.setPaySerialNo(body.getString("wtorderid")); // 支付流水号
                     order.setPayRealPrice(order.getPayPrice()); // 实付金额
-                    if (order.getRechargeType() == 1) {
+                    if (order.getRechargeType() != null && order.getRechargeType() == 1) {
                         outRechargeOrderService.getMobile(order.getRechargeContent() , order.getOrderPrice().intValue() , order.getOrderNo());
                     }
 
@@ -394,7 +394,7 @@ public class UnionPayController {
                     order.setPayType(4);
                     order.setPayTime(new Date()); // 支付时间
                     outRechargeOrderService.updateOrder(order);
-                    if (order.getRechargeType() == 1) {
+                    if (order.getRechargeType() != null && order.getRechargeType() == 1) {
                         outRechargeOrderService.getMobile(order.getRechargeContent() , order.getPayPrice().intValue() , order.getOrderNo());
                     }
                 }
diff --git a/hai-service/src/main/java/com/hai/service/impl/OutRechargeOrderServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/OutRechargeOrderServiceImpl.java
index 3a61b9e0..5d3b6e66 100644
--- a/hai-service/src/main/java/com/hai/service/impl/OutRechargeOrderServiceImpl.java
+++ b/hai-service/src/main/java/com/hai/service/impl/OutRechargeOrderServiceImpl.java
@@ -346,7 +346,7 @@ public class OutRechargeOrderServiceImpl implements OutRechargeOrderService {
         }
         order.setPaySerialNo(consumptionResult.getString("orderId")); // 支付流水号
         order.setPayRealPrice(order.getPayPrice()); // 实付金额
-        if (order.getRechargeType() == 1) {
+        if (order.getRechargeType() != null && order.getRechargeType() == 1) {
             outRechargeOrderService.getMobile(order.getRechargeContent() , order.getOrderPrice().intValue() , order.getOrderNo());
         }
         order.setStatus(2);
@@ -370,7 +370,7 @@ public class OutRechargeOrderServiceImpl implements OutRechargeOrderService {
         highUserService.goldHandle(userId, goldNum, 2, 2, order.getId());
         order.setPayRealPrice(order.getPayPrice()); // 实付金额
         order.setStatus(2);
-        if (order.getRechargeType() == 1) {
+        if (order.getRechargeType() != null && order.getRechargeType() == 1) {
             outRechargeOrderService.getMobile(order.getRechargeContent() , order.getPayPrice().intValue() , order.getOrderNo());
         }
         order.setPayType(3);