From 199861555473ab50f2fafa3d58e42e64e838c039 Mon Sep 17 00:00:00 2001
From: luofl <1442745593@qq.com>
Date: 星期一, 24 二月 2025 22:47:18 +0800
Subject: [PATCH] 修改物流信息导入模板
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WalletController.java | 34 ++++++++++++++++++++++++++--------
1 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WalletController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WalletController.java
index 7d2aa24..b5aa88c 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WalletController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WalletController.java
@@ -8,6 +8,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.account.api.model.AppUser;
import com.ruoyi.account.api.model.BalanceChangeRecord;
+import com.ruoyi.account.api.model.BalanceChangeRecordCopy;
import com.ruoyi.account.api.model.BalancePayment;
import com.ruoyi.account.service.*;
import com.ruoyi.account.util.payment.PaymentUtil;
@@ -47,6 +48,8 @@
@Resource
private BalanceChangeRecordService balanceChangeRecordService;
@Resource
+ private BalanceChangeRecordCopyService balanceChangeRecordCopyService;
+ @Resource
private TokenService tokenService;
@Resource
private WalletService walletService;
@@ -83,7 +86,7 @@
*/
@ApiOperation(value = "变更明细", notes = "变更明细")
@GetMapping("change")
- public R<IPage<BalanceChangeRecord>> change(@ApiParam(value = "变更类型")
+ public R<IPage<BalanceChangeRecordCopy>> change(@ApiParam(value = "变更类型")
@RequestParam(required = false) Integer changeType,
Integer pageCurr,
Integer pageSize,
@@ -107,14 +110,14 @@
endTime = lastDayOfMonth.atTime(LocalTime.MAX);
}
- Page<BalanceChangeRecord> page = balanceChangeRecordService.page(Page.of(pageCurr, pageSize), new LambdaQueryWrapper<BalanceChangeRecord>()
- .eq(changeType != null, BalanceChangeRecord::getChangeType, changeType)
- .between(startTime != null, BalanceChangeRecord::getCreateTime, startTime, endTime)
- .eq(BalanceChangeRecord::getAppUserId, userId).orderByDesc(BalanceChangeRecord::getCreateTime));
+ Page<BalanceChangeRecordCopy> page = balanceChangeRecordCopyService.page(Page.of(pageCurr, pageSize), new LambdaQueryWrapper<BalanceChangeRecordCopy>()
+ .eq(changeType != null, BalanceChangeRecordCopy::getChangeType, changeType)
+ .between(startTime != null, BalanceChangeRecordCopy::getCreateTime, startTime, endTime)
+ .eq(BalanceChangeRecordCopy::getAppUserId, userId).orderByDesc(BalanceChangeRecordCopy::getCreateTime));
- List<BalanceChangeRecord> list = page.getRecords();
+ List<BalanceChangeRecordCopy> list = page.getRecords();
- List<Long> orderIds = list.stream().map(BalanceChangeRecord::getOrderId).collect(Collectors.toList());
+ List<Long> orderIds = list.stream().map(BalanceChangeRecordCopy::getOrderId).collect(Collectors.toList());
if (CollectionUtil.isNotEmpty(orderIds)){
R<List<Order>> r = remoteOrderGoodsClient.getOrderListByIds(orderIds);
if (!R.isSuccess(r)){
@@ -156,7 +159,7 @@
String content = data.getContent();
if (!content.equals("-1")){
if (amount.compareTo(new BigDecimal(content)) > 0){
- return R.fail("充值金额不能小于" + content + "元");
+ return R.fail("充值金额不能大于" + content + "元");
}
}
}
@@ -184,6 +187,21 @@
/**
+ * 获取充值上限金额
+ */
+ @GetMapping("rechargeLimit")
+ public R<BigDecimal> rechargeLimit(){
+ R<BaseSetting> baseSetting = baseSettingClient.getBaseSetting(7);
+ BaseSetting data = baseSetting.getData();
+ if (data != null){
+ String content = data.getContent();
+ return R.ok(new BigDecimal(content));
+ }
+ return R.ok(new BigDecimal("-1"));
+ }
+
+
+ /**
* 充值支付回调
* @param callback
* @param response
--
Gitblit v1.7.1