From a8d2cb07f6440dc54dc4005b0b06d5a47cb1517d Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 16 十二月 2024 13:34:03 +0800
Subject: [PATCH] 12.16
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WalletController.java | 55 ++++++++++++++++++++++++++++++-------------------------
1 files changed, 30 insertions(+), 25 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 8c47f79..d8f9645 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
@@ -1,5 +1,6 @@
package com.ruoyi.account.controller;
+import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.account.api.model.AppUser;
import com.ruoyi.account.api.model.BalanceChangeRecord;
@@ -26,6 +27,7 @@
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
+import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
@@ -96,34 +98,37 @@
.eq(BalanceChangeRecord::getAppUserId, userId));
List<Long> orderIds = list.stream().map(BalanceChangeRecord::getOrderId).collect(Collectors.toList());
- R<List<Order>> r = remoteOrderGoodsClient.getOrderListByIds(orderIds);
- if (!R.isSuccess(r)){
- return R.fail(r.getMsg());
- }
- List<Order> orderList = r.getData();
- list.forEach(bc -> {
- 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 (CollectionUtil.isNotEmpty(orderIds)){
+ R<List<Order>> r = remoteOrderGoodsClient.getOrderListByIds(orderIds);
+ if (!R.isSuccess(r)){
+ return R.fail(r.getMsg());
+ }
+ List<Order> orderList = r.getData();
+ list.forEach(bc -> {
+ 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());
+ });
});
- });
+ }
return R.ok(list);
}
-// /**
-// * 充值
-// */
-// @GetMapping("recharge")
-// @ApiOperation(value = "充值", notes = "钱包充值")
-// public AjaxResult recharge(@ApiParam(value = "充值金额", required = true) @RequestParam BigDecimal amount) {
-// Long userId = SecurityUtils.getUserId();
-// String openId;
-// // 商户号
-// String partnerTradeNo;
-// // TODO 充值
-// return AjaxResult.success();
-// }
+ /**
+ * 充值
+ */
+ @GetMapping("recharge")
+ @ApiOperation(value = "充值", notes = "钱包充值")
+ public R<Void> recharge(@ApiParam(value = "充值金额", required = true) @RequestParam BigDecimal amount) {
+ LoginUser loginUserApplet = tokenService.getLoginUserApplet();
+ AppUser appUser = appUserService.getById(loginUserApplet.getUserid());
+ String wxOpenid = appUser.getWxOpenid();
+ // 商户号
+ String partnerTradeNo;
+ // TODO 充值
+ return R.ok();
+ }
}
--
Gitblit v1.7.1