From 4f6bb20241c02ed3f63783a318489fafc3c07462 Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期四, 05 十二月 2024 10:36:13 +0800
Subject: [PATCH] 1.完成开发门店打分接口
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WalletController.java | 42 +++++++++++++++++++++++++++---------------
1 files changed, 27 insertions(+), 15 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 c96b15b..a9e78a6 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,22 +1,25 @@
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;
import com.ruoyi.account.service.AppUserService;
import com.ruoyi.account.service.BalanceChangeRecordService;
+import com.ruoyi.account.service.VipSettingService;
import com.ruoyi.account.service.WalletService;
import com.ruoyi.account.vo.WalletVO;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.system.api.model.LoginUser;
import com.ruoyi.order.feignClient.RemoteOrderGoodsClient;
+import com.ruoyi.order.model.Order;
+import com.ruoyi.other.api.domain.VipSetting;
+import com.ruoyi.system.api.model.LoginUser;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
-import com.ruoyi.order.model.Order;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -24,7 +27,10 @@
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
-import java.time.*;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.YearMonth;
import java.util.List;
import java.util.stream.Collectors;
@@ -42,6 +48,8 @@
private RemoteOrderGoodsClient remoteOrderGoodsClient;
@Resource
private AppUserService appUserService;
+ @Resource
+ private VipSettingService vipSettingService;
/**
* 钱包详情
@@ -50,7 +58,9 @@
@ApiOperation(value = "钱包详情", notes = "钱包详情")
public R<WalletVO> detail() {
LoginUser loginUserApplet = tokenService.getLoginUserApplet();
+ VipSetting vipSetting = vipSettingService.getVipSettingByUserId(loginUserApplet.getUserid());
WalletVO walletVO = walletService.getWalletByUserId(loginUserApplet.getUserid());
+ walletVO.setVipWithdrawalFee(vipSetting.getVipWithdrawalFee());
return R.ok(walletVO);
}
@@ -87,19 +97,21 @@
.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);
}
--
Gitblit v1.7.1