From 02dfdb37bd57c58076768d93bd1abc78cf02e674 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 28 四月 2026 15:02:59 +0800
Subject: [PATCH] p0功能 小程序
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java | 4 ++++
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TExchangeCodeUseRecord.java | 10 ----------
2 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TExchangeCodeUseRecord.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TExchangeCodeUseRecord.java
index f2e8db8..e1392d4 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TExchangeCodeUseRecord.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TExchangeCodeUseRecord.java
@@ -46,21 +46,11 @@
@TableField("used_amount")
@ApiModelProperty("本次使用金额")
private BigDecimal usedAmount;
- @TableField("refund_no")
- @ApiModelProperty("退款单号/退款流水号")
- private String refundNo;
-
- @TableField("change_type")
- @ApiModelProperty("变动类型：1=兑换入账，2=充电消费，3=退款返还")
- private Integer recordChangeType;
@TableField("gift_used_amount")
@ApiModelProperty("本次使用赠送金额")
private BigDecimal giftUsedAmount;
- @TableField("gift_used_amount")
- @ApiModelProperty("本次使用赠送金额")
- private BigDecimal giftUsedAmount;
@TableField(exist = false)
private String uid;
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
index 418653f..31e5fea 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
@@ -450,6 +450,10 @@
BigDecimal userBalance = money(appUser.getBalance());
BigDecimal balancePayAmount = BigDecimal.ZERO.setScale(2, RoundingMode.HALF_UP);
BigDecimal thirdPayAmount = rechargeAmount;
+ if (payMethod == 2 && userBalance.compareTo(rechargeAmount) >= 0) {
+ payMethod = 1;
+ addChargingOrder.setPayMethod(1);
+ }
if (isBalancePayMode(payMethod)) {
addChargingOrder.setAppUserCouponId(null);
if (payMethod == 1 && userBalance.compareTo(rechargeAmount) < 0) {
--
Gitblit v1.7.1