From e7dc77fc456950b9aa651fffb2fd7ff0d9e55ace Mon Sep 17 00:00:00 2001 From: yyb <1416014977@qq.com> Date: Tue, 13 Jan 2026 15:31:53 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86?= =?UTF-8?q?=E8=AF=B7=E6=B1=82=E5=8F=82=E6=95=B0=E5=9B=A0=E9=A9=BC=E5=B3=B0?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=AF=BC=E8=87=B4=E7=9A=84=E5=9C=A8knief4j?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lease/controller/LeaseShopController.java | 3 +- .../lease/service/LeaseShopService.java | 3 +- .../service/impl/LeaseShopServiceImpl.java | 12 +++++++- .../com/m2pool/lease/vo/v2/GoogleBindVo.java | 3 ++ .../m2pool/lease/vo/v2/WalletIdAndCodeVo.java | 28 +++++++++++++++++++ 5 files changed, 46 insertions(+), 3 deletions(-) create mode 100644 src/main/java/com/m2pool/lease/vo/v2/WalletIdAndCodeVo.java diff --git a/src/main/java/com/m2pool/lease/controller/LeaseShopController.java b/src/main/java/com/m2pool/lease/controller/LeaseShopController.java index 38408e7..15c7126 100644 --- a/src/main/java/com/m2pool/lease/controller/LeaseShopController.java +++ b/src/main/java/com/m2pool/lease/controller/LeaseShopController.java @@ -7,6 +7,7 @@ import com.m2pool.lease.service.LeaseShopService; import com.m2pool.lease.vo.BaseVo; import com.m2pool.lease.vo.ShopConfigVo; import com.m2pool.lease.vo.ShopVo; +import com.m2pool.lease.vo.v2.WalletIdAndCodeVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; @@ -150,7 +151,7 @@ public class LeaseShopController { */ @ApiOperation("钱包配置----根据配置id 删除商铺收款钱包配置") @PostMapping("/deleteShopConfig") - public Result deleteShopConfig(@RequestBody BaseVo baseVo) { + public Result deleteShopConfig(@RequestBody WalletIdAndCodeVo baseVo) { return leaseShopService.deleteShopConfig(baseVo); } diff --git a/src/main/java/com/m2pool/lease/service/LeaseShopService.java b/src/main/java/com/m2pool/lease/service/LeaseShopService.java index e492909..d6b1a3d 100644 --- a/src/main/java/com/m2pool/lease/service/LeaseShopService.java +++ b/src/main/java/com/m2pool/lease/service/LeaseShopService.java @@ -7,6 +7,7 @@ import com.m2pool.lease.dto.v2.ShopWalletInfoDto; import com.m2pool.lease.entity.LeaseShop; import com.m2pool.lease.vo.*; import com.m2pool.lease.vo.v2.ShopWalletInfoVo; +import com.m2pool.lease.vo.v2.WalletIdAndCodeVo; import java.util.List; @@ -100,7 +101,7 @@ public interface LeaseShopService extends IService { * @param baseVo * @return */ - Result deleteShopConfig(BaseVo baseVo); + Result deleteShopConfig(WalletIdAndCodeVo baseVo); /** * 获取链和链列表 diff --git a/src/main/java/com/m2pool/lease/service/impl/LeaseShopServiceImpl.java b/src/main/java/com/m2pool/lease/service/impl/LeaseShopServiceImpl.java index b7e8637..bc8a10b 100644 --- a/src/main/java/com/m2pool/lease/service/impl/LeaseShopServiceImpl.java +++ b/src/main/java/com/m2pool/lease/service/impl/LeaseShopServiceImpl.java @@ -20,6 +20,7 @@ import com.m2pool.lease.service.LeaseShopService; import com.m2pool.lease.utils.*; import com.m2pool.lease.vo.*; import com.m2pool.lease.vo.v2.ShopWalletInfoVo; +import com.m2pool.lease.vo.v2.WalletIdAndCodeVo; import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -472,12 +473,21 @@ public class LeaseShopServiceImpl extends ServiceImpl deleteShopConfig(BaseVo baseVo) { + public Result deleteShopConfig(WalletIdAndCodeVo baseVo) { + String userEmail = SecurityUtils.getUsername(); //1.根据id找到要删除的钱包配置 LeaseShopConfig config = leaseShopConfigMapper.selectById(baseVo.getId()); if (config.getBalance().compareTo(BigDecimal.ZERO) > 0){ return Result.fail("删除失败,钱包余额不为0"); } + GoogleInfo googleInfo = leaseUserMapper.getGoogleInfoByEmail(userEmail); + if(googleInfo == null || StringUtils.isBlank(googleInfo.getSecret())){ + //未绑定定谷歌验证器 + return Result.fail("您的账号未开启双重验证,请先开启验证!"); + } + if(!GoogleAuthenticator.checkCode(googleInfo.getSecret(), baseVo.getGCode(), System.currentTimeMillis())){ + return Result.fail("谷歌验证码错误"); + } //2.校验当前用户还有几个卖家钱包 Long configNums = leaseShopConfigMapper.selectCount(new LambdaQueryWrapper() diff --git a/src/main/java/com/m2pool/lease/vo/v2/GoogleBindVo.java b/src/main/java/com/m2pool/lease/vo/v2/GoogleBindVo.java index 24d36da..a08d5a2 100644 --- a/src/main/java/com/m2pool/lease/vo/v2/GoogleBindVo.java +++ b/src/main/java/com/m2pool/lease/vo/v2/GoogleBindVo.java @@ -1,5 +1,6 @@ package com.m2pool.lease.vo.v2; +import com.fasterxml.jackson.annotation.JsonProperty; import com.m2pool.lease.annotation.EncryptedField; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -28,6 +29,7 @@ public class GoogleBindVo { * 谷歌验证器验证码 */ @ApiModelProperty(value = "谷歌验证码",required = true) + @JsonProperty("gCode") public long gCode; /** @@ -35,6 +37,7 @@ public class GoogleBindVo { */ @NotBlank @ApiModelProperty(value = "邮箱验证码",required = true) + @JsonProperty("eCode") public String eCode; /** diff --git a/src/main/java/com/m2pool/lease/vo/v2/WalletIdAndCodeVo.java b/src/main/java/com/m2pool/lease/vo/v2/WalletIdAndCodeVo.java new file mode 100644 index 0000000..fcb75ef --- /dev/null +++ b/src/main/java/com/m2pool/lease/vo/v2/WalletIdAndCodeVo.java @@ -0,0 +1,28 @@ +package com.m2pool.lease.vo.v2; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.m2pool.lease.vo.BaseVo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +/** + * @Description 支付订单请求对象 + * @Date 2025/7/25 11:15 + * @Author yyb + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(description = "卖家钱包id 和 谷歌验证码请求对象",value = "WalletIdAndCodeVo" ) +public class WalletIdAndCodeVo extends BaseVo{ + + @ApiModelProperty(value = "谷歌验证码") + @JsonProperty("gCode") + private Long gCode; + +}