From fd7b8fb7c89832c28a838b0449bbb8a392433ee2 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 22 四月 2025 14:33:02 +0800
Subject: [PATCH] 将华为云短信替换成阿里云短信
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WalletController.java | 65 +++++++++++++-------------------
1 files changed, 26 insertions(+), 39 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..187f9b4 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,14 +8,17 @@
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;
import com.ruoyi.account.util.payment.model.UniPayCallbackResult;
import com.ruoyi.account.util.payment.model.UniPayResult;
+import com.ruoyi.account.vo.UserPointDetailVO;
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.core.web.page.PageInfo;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.order.feignClient.RemoteOrderGoodsClient;
@@ -46,6 +49,8 @@
public class WalletController extends BaseController {
@Resource
private BalanceChangeRecordService balanceChangeRecordService;
+ @Resource
+ private BalanceChangeRecordCopyService balanceChangeRecordCopyService;
@Resource
private TokenService tokenService;
@Resource
@@ -83,7 +88,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,
@@ -106,41 +111,9 @@
// 将最后一天转换为 LocalDateTime，并设置为当天的最后一秒 (23:59:59.999)
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));
-
- List<BalanceChangeRecord> list = page.getRecords();
-
- List<Long> orderIds = list.stream().map(BalanceChangeRecord::getOrderId).collect(Collectors.toList());
- 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);
- if(null != appUser){
- bc.setUserName(appUser.getName());
- bc.setAmount(o.getPaymentAmount());
- }
- });
-
- BigDecimal beforeAmount = bc.getBeforeAmount();
- BigDecimal afterAmount = bc.getAfterAmount();
- if (beforeAmount.compareTo(afterAmount) > 0){
- bc.setFlag(2);
- }else {
- bc.setFlag(1);
- }
- });
- }
- return R.ok(page);
+ Page<BalanceChangeRecordCopy> pageInfo = new Page<>(pageCurr, pageSize);
+ IPage<BalanceChangeRecordCopy> change = balanceChangeRecordService.change(pageInfo, changeType, startTime, endTime, userId);
+ return R.ok(change);
}
/**
@@ -156,7 +129,7 @@
String content = data.getContent();
if (!content.equals("-1")){
if (amount.compareTo(new BigDecimal(content)) > 0){
- return R.fail("充值金额不能小于" + content + "元");
+ return R.fail("充值金额不能大于" + content + "元");
}
}
}
@@ -180,6 +153,21 @@
long second = LocalDateTime.now().plusMinutes(15).toEpochSecond(ZoneOffset.UTC);
redisTemplate.opsForZSet().add("BalanceRecharge", balancePayment.getId(), second);
return R.ok(jsonObject.toJSONString());
+ }
+
+
+ /**
+ * 获取充值上限金额
+ */
+ @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"));
}
@@ -221,11 +209,10 @@
balanceChangeRecord.setVipId(appUser.getVipId());
balanceChangeRecord.setOrderId(balanceChangeRecord.getId());
balanceChangeRecord.setChangeType(1);
- balanceChangeRecord.setBeforeAmount(balance);
balanceChangeRecord.setChangeAmount(money);
- balanceChangeRecord.setAfterAmount(appUser.getBalance());
balanceChangeRecord.setDelFlag(0);
balanceChangeRecord.setCreateTime(LocalDateTime.now());
+ balanceChangeRecord.setChangeDirection(1);
balanceChangeRecordService.save(balanceChangeRecord);
balancePayment.setStatus(2);
--
Gitblit v1.7.1