From 379e102ab43970faf18abab32bd40c30939fc4f5 Mon Sep 17 00:00:00 2001 From: yyb <1416014977@qq.com> Date: Thu, 25 Dec 2025 11:01:54 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E7=A7=9F=E8=B5=81=E7=B3=BB=E7=BB=9F1.?= =?UTF-8?q?1.0=20=E6=96=B0=E5=A2=9E=E7=99=BB=E5=BD=95=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=EF=BC=8C=E5=87=86=E5=A4=87=E8=BF=81=E7=A7=BB=E8=AF=A5=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E4=B8=BA=E7=8B=AC=E7=AB=8B=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/m2pool/lease/config/WebMvcConfig.java | 18 ++++++++++++++ .../lease/controller/LeaseAuthController.java | 1 - .../service/impl/LeaseMachineServiceImpl.java | 9 ++++--- .../impl/LeaseOrderInfoServiceImpl.java | 8 ++++--- .../service/impl/LeaseProductServiceImpl.java | 3 ++- .../service/impl/LeaseShopServiceImpl.java | 2 +- .../service/impl/LeaseUserServiceImpl.java | 24 +++++++++---------- 7 files changed, 44 insertions(+), 21 deletions(-) diff --git a/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/config/WebMvcConfig.java b/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/config/WebMvcConfig.java index e220596..0c20ca6 100644 --- a/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/config/WebMvcConfig.java +++ b/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/config/WebMvcConfig.java @@ -2,6 +2,7 @@ package com.m2pool.lease.config; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.config.annotation.CorsRegistry; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; @@ -18,4 +19,21 @@ public class WebMvcConfig implements WebMvcConfigurer { registry.addInterceptor(loginInterceptor) .addPathPatterns("/**"); } + + @Override + public void addCorsMappings(CorsRegistry registry) { + + // 设置允许跨域请求路径 + registry.addMapping("/**") + // 设置允许跨域请求的域名 + .allowedOriginPatterns("*") //或.allowedOriginPatterns("http://www.baidu.com") 指定域名 + //是否允许cookie + .allowCredentials(true) + // 设置允许的请求方式 + .allowedMethods("GET", "POST", "PUT", "DELETE") + // 设置允许的header属性 + .allowedHeaders("*") + // 允许跨域时间 + .maxAge(3600); + } } diff --git a/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/controller/LeaseAuthController.java b/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/controller/LeaseAuthController.java index 6d59fa8..7f73f95 100644 --- a/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/controller/LeaseAuthController.java +++ b/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/controller/LeaseAuthController.java @@ -49,7 +49,6 @@ public class LeaseAuthController { } @Decrypt - @LoginRequired @PostMapping("/updatePassword") @ApiOperation(value = "修改密码") public Result updatePassword(@RequestBody UserLoginVo userLoginVo){ diff --git a/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/service/impl/LeaseMachineServiceImpl.java b/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/service/impl/LeaseMachineServiceImpl.java index 96dca13..b80d357 100644 --- a/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/service/impl/LeaseMachineServiceImpl.java +++ b/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/service/impl/LeaseMachineServiceImpl.java @@ -70,7 +70,8 @@ public class LeaseMachineServiceImpl extends ServiceImpl shopIds = leaseMachineMapper.getShopIds(); if (shopIds.isEmpty()){ - return PageResult.fail(new ArrayList<>(), "暂无商品"); + //店铺不存在商品 + return PageResult.success(new ArrayList<>()); } PageHelper.startPage(productPageVo.getPageNum(), productPageVo.getPageSize()); List existsMachineShop = leaseMachineMapper.getExistsMachineShop(shopIds, productPageVo.getCoin(), productPageVo.getAlgorithm()); @@ -211,13 +212,15 @@ public class LeaseMachineServiceImpl extends ServiceImpl getShopMachineListForSeller(SellerMachineVo sellerMachineVo) { LeaseShop leaseShop = getShopById(); if (leaseShop == null){ - return PageResult.fail(new ArrayList<>(), "暂无店铺"); + //店铺未创建 + return PageResult.success(new ArrayList<>()); } PageHelper.startPage(sellerMachineVo.getPageNum(), sellerMachineVo.getPageSize()); List machineInfoDtoList = leaseMachineMapper.getShopMachineListForSeller(sellerMachineVo,leaseShop.getId()); PageInfo pageInfo = new PageInfo<>(machineInfoDtoList); if (machineInfoDtoList.isEmpty()){ - return PageResult.fail(new ArrayList<>(), "暂无矿机"); + //不存在矿机 + return PageResult.success(new ArrayList<>()); } PageResult success = PageResult.success(machineInfoDtoList); //获取矿机配置信息 diff --git a/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/service/impl/LeaseOrderInfoServiceImpl.java b/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/service/impl/LeaseOrderInfoServiceImpl.java index 9afbba8..8ff599d 100644 --- a/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/service/impl/LeaseOrderInfoServiceImpl.java +++ b/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/service/impl/LeaseOrderInfoServiceImpl.java @@ -444,7 +444,7 @@ public class LeaseOrderInfoServiceImpl extends ServiceImpl pageInfo = new PageInfo<>(ordersByStatus); List ids = ordersByStatus.stream().map(OrderInfoDto::getId).collect(Collectors.toList()); if (ids.isEmpty()){ - return PageResult.fail(new ArrayList<>(),"不存在订单"); + return PageResult.success(new ArrayList<>()); } //获取订单对应的订单详情列表 List leaseOrderItems = leaseOrderItemMapper.selectList(new QueryWrapper() @@ -467,13 +467,15 @@ public class LeaseOrderInfoServiceImpl extends ServiceImpl() .eq(LeaseShop::getUserEmail, SecurityUtils.getUsername())); if (leaseShop == null){ - return PageResult.fail(new ArrayList<>(),"不存在商铺"); + //店铺不存在 + return PageResult.success(new ArrayList<>()); } //查询到商铺的所有订单 List orderItemList = leaseOrderItemMapper.selectList(new LambdaQueryWrapper() .eq(LeaseOrderItem::getShopId, leaseShop.getId())); if (orderItemList.isEmpty()){ - return PageResult.fail(new ArrayList<>(),"不存在订单"); + //订单不存在 + return PageResult.success(new ArrayList<>()); } List orderInfoIds = orderItemList.stream().map(LeaseOrderItem::getOrderId).distinct().collect(Collectors.toList()); PageHelper.startPage(orderInfoStateVo.getPageNum(), orderInfoStateVo.getPageSize()); diff --git a/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/service/impl/LeaseProductServiceImpl.java b/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/service/impl/LeaseProductServiceImpl.java index c9afdee..a92ee20 100644 --- a/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/service/impl/LeaseProductServiceImpl.java +++ b/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/service/impl/LeaseProductServiceImpl.java @@ -251,7 +251,8 @@ public class LeaseProductServiceImpl extends ServiceImpl shopWalletInfo = leaseShopMapper.getShopWalletInfo(leaseShop.getId()); return Result.success(shopWalletInfo); diff --git a/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/service/impl/LeaseShopServiceImpl.java b/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/service/impl/LeaseShopServiceImpl.java index e2d64b9..e8e0132 100644 --- a/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/service/impl/LeaseShopServiceImpl.java +++ b/m2pool-modules/m2pool-lease/src/main/java/com/m2pool/lease/service/impl/LeaseShopServiceImpl.java @@ -186,7 +186,7 @@ public class LeaseShopServiceImpl extends ServiceImpl"+to); } catch (Exception e) { System.out.println("发送失败原因"+e.getMessage()); throw new AuthException("发送邮箱验证码失败,请稍后重试"); @@ -654,7 +653,7 @@ public class LeaseUserServiceImpl extends ServiceImpl collect = userWalletDataDto.stream().peek(item -> item.setBalance(item.getBalance().subtract(item.getBlockedBalance()))).collect(Collectors.toList()); return Result.success(collect); } - return Result.fail("未绑定钱包"); + return Result.success(null); } /** @@ -812,7 +811,6 @@ public class LeaseUserServiceImpl extends ServiceImpl balanceWithdrawList(BalancePageVo balancePageVo) { String userEmail = SecurityUtils.getUsername(); - System.out.println("用户"+userEmail+"提现列表"); List walletList = leaseUserWalletDataMapper.selectList(new LambdaQueryWrapper() .eq(LeaseUserWalletData::getUserId,userEmail)); PageHelper.startPage(balancePageVo.getPageNum(), balancePageVo.getPageSize()); @@ -821,7 +819,6 @@ public class LeaseUserServiceImpl extends ServiceImpl pageInfo = new PageInfo<>(payWithdrawMessageDtos); - System.out.println(userEmail + "用户提现" + payWithdrawMessageDtos); PageResult success = PageResult.success(payWithdrawMessageDtos); success.setTotal(pageInfo.getTotal()); success.setTotalPage(pageInfo.getPages()); @@ -849,13 +846,15 @@ public class LeaseUserServiceImpl extends ServiceImpl().eq(LeaseShop::getUserEmail, SecurityUtils.getUsername())); if (leaseShop == null){ - return PageResult.fail(null,"查看交易信息失败"); + //不存在店铺 + return PageResult.success(new ArrayList<>()); } //获取卖家的自定义钱包地址 List leaseShopConfigs = leaseShopConfigMapper.selectList(new LambdaQueryWrapper() .eq(LeaseShopConfig::getShopId, leaseShop.getId())); if(leaseShopConfigs.isEmpty()){ - return PageResult.fail(null,"未绑定钱包,不存在交易流水"); + //交易流水为空 + return PageResult.success(new ArrayList<>()); } PageHelper.startPage(balancePageVo.getPageNum(), balancePageVo.getPageSize()); List payRecordMessageDtos = leasePayRecordMessageMapper.balancePayList(leaseShopConfigs,balancePageVo.getStatus()); @@ -874,7 +873,8 @@ public class LeaseUserServiceImpl extends ServiceImpl walletList = leaseUserWalletDataMapper.selectList(new LambdaQueryWrapper() .eq(LeaseUserWalletData::getUserId, SecurityUtils.getUsername())); if (walletList.isEmpty()){ - return PageResult.fail(null,"未绑定钱包,不存在交易流水"); + //不存在钱包 + return PageResult.success(new ArrayList<>()); } PageHelper.startPage(recordTypePageVo.getPageNum(), recordTypePageVo.getPageSize()); List transactionRecordDtoList = new ArrayList<>(); @@ -903,8 +903,9 @@ public class LeaseUserServiceImpl extends ServiceImpl> getRecentlyTransaction() { List walletList = leaseUserWalletDataMapper.selectList(new LambdaQueryWrapper() .eq(LeaseUserWalletData::getUserId, SecurityUtils.getUsername())); + List recentlyTransaction = new ArrayList<>(); if (!walletList.isEmpty()){ - List recentlyTransaction = leasePayRecordMessageMapper.getRecentlyTransaction(walletList); + recentlyTransaction = leasePayRecordMessageMapper.getRecentlyTransaction(walletList); recentlyTransaction.addAll(leasePayWithdrawMessageMapper.getRecentlyTransaction(walletList)) ; recentlyTransaction.addAll(leasePayRechargeMessageMapper.getRecentlyTransaction(walletList)); // 按 updateTime 倒序排序，并取前五个元素 @@ -912,9 +913,8 @@ public class LeaseUserServiceImpl extends ServiceImpl dto2.getUpdateTime().compareTo(dto1.getUpdateTime())) .limit(5) .collect(Collectors.toList()); - return Result.success(recentlyTransaction); } - return Result.fail("交易记录为空"); + return Result.success(recentlyTransaction); }