From b9f26b3f2ea4ebc3344868b2ab2bcc399df0bde5 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期五, 24 一月 2025 16:15:29 +0800
Subject: [PATCH] 12.18
---
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 db23e80..99f177d 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
@@ -4,6 +4,8 @@
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+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.BalancePayment;
@@ -18,7 +20,9 @@
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.order.feignClient.RemoteOrderGoodsClient;
import com.ruoyi.order.model.Order;
+import com.ruoyi.other.api.domain.BaseSetting;
import com.ruoyi.other.api.domain.VipSetting;
+import com.ruoyi.other.api.feignClient.BaseSettingClient;
import com.ruoyi.system.api.model.LoginUser;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -56,6 +60,8 @@
private BalancePaymentService balancePaymentService;
@Resource
private RedisTemplate redisTemplate;
+ @Resource
+ private BaseSettingClient baseSettingClient;
@@ -77,9 +83,11 @@
*/
@ApiOperation(value = "变更明细", notes = "变更明细")
@GetMapping("change")
- public R<List<BalanceChangeRecord>> change(@ApiParam(value = "变更类型")
+ public R<IPage<BalanceChangeRecord>> change(@ApiParam(value = "变更类型")
@RequestParam(required = false) Integer changeType,
- @ApiParam(value = "创建时间")
+ Integer pageCurr,
+ Integer pageSize,
+ @ApiParam(value = "创建时间")
@RequestParam(required = false)
@DateTimeFormat(pattern = "yyyy-MM-dd")
LocalDate createTime) {
@@ -99,10 +107,12 @@
endTime = lastDayOfMonth.atTime(LocalTime.MAX);
}
- List<BalanceChangeRecord> list = balanceChangeRecordService.list(new LambdaQueryWrapper<BalanceChangeRecord>()
+ 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));
+
+ List<BalanceChangeRecord> list = page.getRecords();
List<Long> orderIds = list.stream().map(BalanceChangeRecord::getOrderId).collect(Collectors.toList());
if (CollectionUtil.isNotEmpty(orderIds)){
@@ -115,8 +125,10 @@
orderList.stream().filter(o -> o.getId().equals(bc.getOrderId())).findFirst().ifPresent(o -> {
Long appUserId = o.getAppUserId();
AppUser appUser = appUserService.getById(appUserId);
- bc.setUserName(appUser.getName());
- bc.setAmount(o.getPaymentAmount());
+ if(null != appUser){
+ bc.setUserName(appUser.getName());
+ bc.setAmount(o.getPaymentAmount());
+ }
});
BigDecimal beforeAmount = bc.getBeforeAmount();
@@ -128,7 +140,7 @@
}
});
}
- return R.ok(list);
+ return R.ok(page);
}
/**
@@ -137,6 +149,14 @@
@GetMapping("recharge")
@ApiOperation(value = "充值", notes = "钱包充值")
public R<String> recharge(@ApiParam(value = "充值金额", required = true) @RequestParam BigDecimal amount) {
+
+ R<BaseSetting> baseSetting = baseSettingClient.getBaseSetting(7);
+ BaseSetting data = baseSetting.getData();
+ if (data != null){
+ if (amount.compareTo(new BigDecimal(data.getContent())) < 0){
+ return R.fail("充值金额不能小于" + data.getContent() + "元");
+ }
+ }
LoginUser loginUserApplet = tokenService.getLoginUserApplet();
AppUser appUser = appUserService.getById(loginUserApplet.getUserid());
BalancePayment balancePayment = new BalancePayment();
@@ -222,7 +242,5 @@
out.flush();
out.close();
}
-
-
}
}
--
Gitblit v1.7.1