From c87a187930ede0b403a662d6eb692a70adebb7be Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期日, 10 八月 2025 20:21:16 +0800
Subject: [PATCH] 订单导入

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/WXCallBackController.java |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/WXCallBackController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/WXCallBackController.java
index 8b3dbc9..8a5e3e9 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/WXCallBackController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/WXCallBackController.java
@@ -105,12 +105,11 @@
             integralRecord.setDelFlag(0);
             integralRecord.setCreateTime(LocalDateTime.now());
             integralRecordService.save(integralRecord);
-            data.setIntegral(data.getIntegral() + integralPay.getIntegralCount());
+            data.setIntegral(data.getIntegral()!=null?data.getIntegral() + integralPay.getIntegralCount():integralPay.getIntegralCount());
             sysUserClient.updateSysUser(data);
             return R.ok(null, "success");
         }
         return R.ok(null, "error");
-
     }
 
     @ResponseBody

--
Gitblit v1.7.1