From 4046f94a57f0c10e9509a49ad0d37d701aeb8186 Mon Sep 17 00:00:00 2001
From: jack <zengjieli93@163.com>
Date: Tue, 02 Apr 2024 23:47:51 +0800
Subject: [PATCH] 修复自选bug 和 增加流水日志
---
src/main/java/com/nq/service/impl/UserServiceImpl.java | 46 ++++++++++++++++++++++++++++++----------------
1 files changed, 30 insertions(+), 16 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..4668440 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;
@@ -97,6 +98,9 @@
@Resource
+ MoneyLogMapper mapper;
+
+ @Resource
UserPositionMapper userPositionMapper;
@Resource
SiteAmtTransLogMapper siteAmtTransLogMapper;
@@ -137,7 +141,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 +189,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 +677,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();
}
@@ -1159,20 +1171,22 @@
userMapper.updateUserAmt(amt, user_id);
}
-// @Override
-// public ServerResponse queryMyOption(String code, HttpServletRequest request) {
-// User user = getCurrentUser(request);
-//
-// if (user == null) {
-// return ServerResponse.createBySuccessMsg("請先登錄");
-// }
-// String stockcode = code;
-// if(code.contains("hf")){
-// stockcode = code.split("_")[1].toString();
-// }
-// stockcode = stockcode.replace("sh","").replace("sz","").replace("bj","");
-// return this.iStockOptionService.isOption(user.getId(), stockcode);
-// }
+
+ @Override
+ public ServerResponse queryMyOption(String code, HttpServletRequest request) {
+ User user = getCurrentUser(request);
+
+ return this.iStockOptionService.isOption(user.getId(), code);
+ }
+
+ @Override
+ public ServerResponse getMoenyLog(String type,HttpServletRequest request) {
+ User user = getCurrentUser(request);
+ QueryWrapper<MoneyLog> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("type",type);
+ queryWrapper.eq("user_id",user.getId());
+ return ServerResponse.createBySuccess(mapper.selectList(queryWrapper));
+ }
}
--
Gitblit v1.9.3