From 05f53069a91f979ec3d18e0a7abc8ce67c2656b2 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 04 九月 2025 14:35:01 +0800
Subject: [PATCH] bug修改
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ChargeOrderServiceImpl.java | 29 +++++++++++++----------------
1 files changed, 13 insertions(+), 16 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ChargeOrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ChargeOrderServiceImpl.java
index 7a17878..032a9fc 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ChargeOrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ChargeOrderServiceImpl.java
@@ -59,10 +59,7 @@
import java.time.LocalTime;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
@Slf4j
@Service
@@ -346,12 +343,6 @@
public R importData(ChargeOrder chargeOrder) {
Site site = siteClient.getSiteAll().getData().stream().filter(e -> e.getId()
.equals(chargeOrder.getPowerStationId())).findFirst().orElse(null);
- if (site==null){
- return R.fail("站点不存在");
- }
- // 扣除站点系统用户的积分数
- List<SysUser> data = sysUserClient.getSysUserAll().getData();
- SysUser sysUser = data.stream().filter(e -> site.getId().equals(e.getSiteId())).findFirst().orElse(null);
Integer point=0;
AppUser appuser = appUserClient.getAppUserByPhone1(chargeOrder.getPhone()).getData();
//获取用户,更改积分数
@@ -373,12 +364,18 @@
}else{
point = getPointSite(chargeOrder.getTotalAmount(),site.getId());
}
- if (sysUser != null) {
- if (sysUser.getIntegral()< point){
- return R.fail("站点积分不足");
+ // 扣除站点系统用户的积分数
+ SysUser sysUser=null;
+ if(Objects.nonNull(site)){
+ List<SysUser> data = sysUserClient.getSysUserAll().getData();
+ sysUser = data.stream().filter(e -> site.getId().equals(e.getSiteId())).findFirst().orElse(null);
+ if (sysUser != null) {
+ if (sysUser.getIntegral()< point){
+ return R.fail("站点积分不足");
+ }
+ }else {
+ return R.fail("站点用户不存在");
}
- }else {
- return R.fail("站点用户不存在");
}
Integer chargePoint=appuser.getRechargePoint()==null?0:appuser.getRechargePoint();//充值积分
@@ -442,7 +439,7 @@
throw new IllegalArgumentException("金额不能为null或负数");
}
// 获取积分兑换比例配置
- R<SysConfig> info = sysConfigClient.getInfo(8L);
+ R<SysConfig> info = sysConfigClient.getInfo(10L);
if (info == null || info.getData() == null) {
throw new RuntimeException("获取积分兑换比例配置失败");
}
--
Gitblit v1.7.1