From 2afce3afa1b9a111b20d2d372fb9867751a50ad2 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Fri, 01 Mar 2024 14:18:35 +0800
Subject: [PATCH] 抽奖

---
 src/main/java/cc/mrbird/febs/common/utils/AppContants.java                   |    2 +-
 src/main/java/cc/mrbird/febs/common/enumerates/MoneyFlowTypeNewEnum.java     |    4 ++--
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java |    3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/common/enumerates/MoneyFlowTypeNewEnum.java b/src/main/java/cc/mrbird/febs/common/enumerates/MoneyFlowTypeNewEnum.java
index eb4e4ae..fe34a7b 100644
--- a/src/main/java/cc/mrbird/febs/common/enumerates/MoneyFlowTypeNewEnum.java
+++ b/src/main/java/cc/mrbird/febs/common/enumerates/MoneyFlowTypeNewEnum.java
@@ -28,14 +28,14 @@
     BASIC_PERK_DIRECT(16,"即将获得直推奖励"),
     SYSTEM_PEY(15,"系统拨付"),
     NFT_OUT_FEE_FCM(14,"消耗GFA"),
-    TOKEN_BUY_FROZEN_RETURN(13,"预约宝石"),
+    TOKEN_BUY_FROZEN_RETURN(13,"消耗宝石"),
     PAY(12,"支付"),
     NFT_OUT_FEE(11,"卡牌提现手续费"),
     NFT_OUT(10,"卖出"),
     NFT_IN(9,"GFA动态兑换"),
     FCM_OUT_FEE(8,"动态兑换手续费"),
     FCM_OUT(7,"GFA动态兑换"),
-    TOKEN_BUY_FROZEN(6,"消耗宝石"),
+    TOKEN_BUY_FROZEN(6,"预约宝石"),
     TOKEN_INSIDE_IN(5,"宝石转入"),
     TOKEN_INSIDE_OUT(4,"宝石转出"),
     FCM_INSIDE_IN(3,"GFA代币转入"),
diff --git a/src/main/java/cc/mrbird/febs/common/utils/AppContants.java b/src/main/java/cc/mrbird/febs/common/utils/AppContants.java
index de1717f..c501d9a 100644
--- a/src/main/java/cc/mrbird/febs/common/utils/AppContants.java
+++ b/src/main/java/cc/mrbird/febs/common/utils/AppContants.java
@@ -42,7 +42,7 @@
     /**
      * 每次销毁10000个,价格增加0.1
      */
-    public static final BigDecimal FCM_BASIC = new BigDecimal(10000);
+    public static final BigDecimal FCM_BASIC = new BigDecimal(1000);
     public static final BigDecimal FCM_BASIC_ADD_PRICE = new BigDecimal("0.1");
 
 
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
index a665988..3468e39 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
@@ -83,7 +83,8 @@
         if (mallMember != null) {
             throw new FebsException("账号已使用,请重新注册。");
         }
-        String userKey = registerDto.getUserKey();
+        Integer selectCount = this.baseMapper.selectCount(null);
+        String userKey = ShareCodeUtil.toSerialCode(selectCount);
         MallMember mallMemberKey = this.baseMapper.selectByUserKey(userKey);
         if (mallMemberKey != null) {
             throw new FebsException("账号已使用,请重新注册。");

--
Gitblit v1.9.1