From f5dce6d5caebc2296d135be6ff7bd004723a345b Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Mon, 01 Apr 2024 18:25:33 +0800
Subject: [PATCH] 1

---
 src/main/java/com/nq/service/impl/UserServiceImpl.java |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/nq/service/impl/UserServiceImpl.java b/src/main/java/com/nq/service/impl/UserServiceImpl.java
index 0c4ef39..c0a22c4 100644
--- a/src/main/java/com/nq/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserServiceImpl.java
@@ -1,5 +1,6 @@
 package com.nq.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -137,7 +138,7 @@
         }
 
 
-        User dbuser = this.userMapper.findByPhone(phone);
+        User dbuser = this.userMapper.selectOne(new LambdaQueryWrapper<User>().eq(User::getPhone,phone).last( " limit 1"));
         if (dbuser != null) {
             return ServerResponse.createByErrorMsg("Registration failed, the mobile phone number has been registered");
         }
@@ -185,7 +186,8 @@
 
             log.info("用户{}登陆成功, 登陆状态{} ,交易状态{}", new Object[]{user.getId(), user.getIsLogin(), user.getIsLock()});
 
-            userAssetsServices.assetsByTypeAndUserId(EStockType.HG.getCode(),user.getId());
+            userAssetsServices.assetsByTypeAndUserId(EStockType.MAS.getCode(),user.getId());
+            userAssetsServices.assetsByTypeAndUserId(EStockType.US.getCode(),user.getId());
             this.iSiteLoginLogService.saveLog(user, request);
             return ServerResponse.createBySuccess(user);
         }
@@ -672,7 +674,14 @@
         if(formAssets.getAvailableBalance().compareTo(amtBig)<0){
             return ServerResponse.createByErrorMsg("Insufficient amount");
         }
+        SiteSetting siteSetting = iSiteSettingService.getSiteSetting();
         userAssetsServices.availablebalanceChange(fromType,user.getId(), EUserAssets.TRANSFER,amtBig.negate(),"","");
+
+        if(fromType.equals(EStockType.MAS.getCode())){
+            amtBig = amtBig.divide(siteSetting.getExchangeRate(), BigDecimal.ROUND_CEILING);
+        }else{
+            amtBig = amtBig.multiply(siteSetting.getExchangeRate());
+        }
         userAssetsServices.availablebalanceChange(toType,user.getId(),EUserAssets.TRANSFER,amtBig,"","");
         return ServerResponse.createBySuccess();
     }

--
Gitblit v1.9.3