From 6fafc29f8d92c0a3588d4a8a373c82d8b46cd3df Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 26 八月 2025 20:51:27 +0800
Subject: [PATCH] PC跳转小程序支付
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ChargeOrderServiceImpl.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 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 e028f8b..7e4c61c 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
@@ -17,6 +17,7 @@
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.web.page.PageInfo;
+import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.order.dto.GetImportOrderDTO;
import com.ruoyi.order.mapper.ChargeOrderMapper;
import com.ruoyi.order.mapper.OrderMapper;
@@ -313,7 +314,7 @@
throw new ServiceException(e.getMessage());
}
if(!result.isEmpty()){
- return R.ok(result);
+ return R.fail(result);
}
return R.ok();
}
@@ -380,10 +381,19 @@
List<SysUser> data = sysUserClient.getSysUserAll().getData();
SysUser sysUser = data.stream().filter(e -> e.getSiteId().equals(site.getId())).findFirst().orElse(null);
if (sysUser != null) {
+ if (sysUser.getIntegral()==null){
+ sysUser.setIntegral(0);
+ }
+ if (sysUser.getIntegral()< point){
+ return R.fail("站点积分不足");
+ }
sysUser.setIntegral(sysUser.getIntegral()==null?0:sysUser.getIntegral()-point);
sysUserClient.updateSysUser(sysUser);
}
}
+ //保存到数据库
+ chargeOrder.setPoint(point);
+ chargeOrderService.save(chargeOrder);
//添加用户积分流水
//转入用户
UserPoint userPoint = new UserPoint();
@@ -398,9 +408,7 @@
if (r.isError(r)) {
return R.fail("导入订单-保存用户积分流水失败");
}
- //保存到数据库
- chargeOrder.setPoint(point);
- chargeOrderService.save(chargeOrder);
+
return R.ok();
}
@@ -472,7 +480,7 @@
}
// 计算积分并向下取整（Floor）
int cashInt = cash.intValue();
- return cashInt*=num1;
+ return cashInt * num1;
} catch (NumberFormatException e) {
throw new RuntimeException("积分兑换比例配置值格式错误", e);
--
Gitblit v1.7.1