update 修复部分请求参数因驼峰问题导致的在knief4j显示异常问题

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<String> deleteShopConfig(@RequestBody BaseVo baseVo) {
+    public Result<String> deleteShopConfig(@RequestBody WalletIdAndCodeVo baseVo) {
         return leaseShopService.deleteShopConfig(baseVo);
     }
 

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<LeaseShop> {
      * @param baseVo
      * @return
      */
-    Result<String> deleteShopConfig(BaseVo baseVo);
+    Result<String> deleteShopConfig(WalletIdAndCodeVo baseVo);
 
     /**
      * 获取链和链列表

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<LeaseShopMapper, LeaseShop
     }
 
     @Override
-    public Result<String> deleteShopConfig(BaseVo baseVo) {
+    public Result<String> 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<LeaseShopConfig>()

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;
 
     /**

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;
+
+}