From 693afdd881d1ffcd31dcf4e40e562fd0f88b309b Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 13 一月 2025 15:22:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java | 8 ++++++++
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WithdrawalRequestsController.java | 3 ++-
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/WithdrawalRequestsServiceImpl.java | 23 +++++++++++++++--------
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsServiceImpl.java | 6 +++---
4 files changed, 28 insertions(+), 12 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WithdrawalRequestsController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WithdrawalRequestsController.java
index 9b32a24..3faa99c 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WithdrawalRequestsController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WithdrawalRequestsController.java
@@ -95,7 +95,8 @@
return R.fail("查询账户余额出错");
}
Double useAbleSettAmount = accountBalanceQueryResult.getUseAbleSettAmount();
- if(useAbleSettAmount < withdrawal.getArrivalAmount().doubleValue()){
+ //计算代付手续费
+ if(useAbleSettAmount < (withdrawal.getArrivalAmount().doubleValue() + 1)){
return R.fail("账户可用余额不足，请先补充账户余额");
}
//银行卡转账
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/WithdrawalRequestsServiceImpl.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/WithdrawalRequestsServiceImpl.java
index e2133de..74cbc9f 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/WithdrawalRequestsServiceImpl.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/WithdrawalRequestsServiceImpl.java
@@ -1,20 +1,16 @@
package com.ruoyi.account.service.impl;
+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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.account.api.feignClient.AppUserClient;
-import com.ruoyi.account.api.model.AppUser;
-import com.ruoyi.account.api.model.BalanceChangeRecord;
-import com.ruoyi.account.api.model.UserClickLog;
-import com.ruoyi.account.api.model.WithdrawalRequests;
+import com.ruoyi.account.api.model.*;
import com.ruoyi.account.dto.WithQuery;
import com.ruoyi.account.dto.WithdrawalRequestsDTO;
import com.ruoyi.account.mapper.WithdrawalRequestsMapper;
-import com.ruoyi.account.service.AppUserService;
-import com.ruoyi.account.service.BalanceChangeRecordService;
-import com.ruoyi.account.service.VipSettingService;
-import com.ruoyi.account.service.WithdrawalRequestsService;
+import com.ruoyi.account.service.*;
+import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.bean.BeanUtils;
import com.ruoyi.common.security.service.TokenService;
@@ -50,6 +46,9 @@
public static final BigDecimal MAX_WITHDRAWAL_AMOUNT = new BigDecimal("200");
public static final BigDecimal VIP_WITHDRAWAL_FEE_DENOMINATOR = new BigDecimal("100");
+
+ @Resource
+ private AppUserBankService appUserBankService;
@Override
public void withdrawalApply(WithdrawalRequestsDTO params) {
@@ -84,6 +83,14 @@
WithdrawalRequests withdrawalRequests = new WithdrawalRequests();
BeanUtils.copyBeanProp(withdrawalRequests, params);
+ if(2 == params.getWithdrawalMethod()){
+ AppUserBank appUserBank = appUserBankService.getOne(new LambdaQueryWrapper<AppUserBank>().eq(AppUserBank::getAppUserId, loginUserApplet.getUserid()));
+ if(null == appUserBank){
+ throw new ServiceException("请先添加提款账户！");
+ }
+ withdrawalRequests.setAccountHolder(appUserBank.getBankName());
+ withdrawalRequests.setBankCardNumber(appUserBank.getBankNumber());
+ }
withdrawalRequests.setWithdrawalAmount(withdrawalAmount);
withdrawalRequests.setArrivalAmount(withdrawalRequests.getWithdrawalAmount());
withdrawalRequests.setServiceCharge(multiply);
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java
index 760d46f..81f8194 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java
@@ -711,6 +711,14 @@
}
}
}
+
+ if(goods.getStatus() == 1){
+ throw new RuntimeException(goods.getName() + "商品已被下架");
+ }
+ if(!goods.getCommodityAuthority().contains("-1") && !goods.getCommodityAuthority().contains(appUser.getVipId().toString())){
+ throw new RuntimeException("无权限购买" + goods.getName());
+ }
+
ids.add(id);
}
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsServiceImpl.java
index 9a6dd4e..f44c255 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsServiceImpl.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsServiceImpl.java
@@ -95,9 +95,9 @@
@Override
public PageInfo<GoodsVO> goodsList(Goods search) {
Integer vipId = 0;
- String provinceCode = null;
- String cityCode = null;
- String districtCode = null;
+ String provinceCode = "0";
+ String cityCode = "0";
+ String districtCode = "0";
String token = SecurityUtils.getToken(ServletUtils.getRequest());
if(StringUtils.isNotEmpty(token)){
Long userid = tokenService.getLoginUserApplet().getUserid();
--
Gitblit v1.7.1