From 26581a43d52f6f6e62607c51b8224cdc50191a80 Mon Sep 17 00:00:00 2001
From: jack <zengjieli93@163.com>
Date: Mon, 22 Apr 2024 18:07:29 +0800
Subject: [PATCH] 增加流水日志
---
src/main/java/com/nq/service/impl/UserServiceImpl.java | 316 ++++++++++++++++++++++++++--------------------------
1 files changed, 159 insertions(+), 157 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/UserServiceImpl.java b/src/main/java/com/nq/service/impl/UserServiceImpl.java
index 9dfc106..2c4ab07 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;
@@ -66,6 +67,9 @@
IUserService userService;
@Autowired
+ IRateServices rateServices;
+
+ @Autowired
IUserAssetsServices userAssetsServices;
@Autowired
@@ -97,7 +101,10 @@
@Resource
- UserPositionMapper userPositionMapper;
+ MoneyLogMapper mapper;
+
+ @Resource
+ IUserPositionService userPositionService;
@Resource
SiteAmtTransLogMapper siteAmtTransLogMapper;
@Autowired
@@ -112,10 +119,13 @@
+
+
+
public ServerResponse reg(String yzmCode, String agentCode, String phone, String userPwd, HttpServletRequest request) {
if (StringUtils.isBlank(agentCode) || StringUtils.isBlank(phone) ||
StringUtils.isBlank(userPwd) || StringUtils.isBlank(yzmCode)) {
- return ServerResponse.createByErrorMsg("Registration failed. The parameter cannot be empty");
+ return ServerResponse.createByErrorMsg("注册失败。该参数不能为空",request);
}
@@ -124,22 +134,22 @@
log.info("redis_yzm = {},yzmCode = {}", redis_yzm, yzmCode);
if (!yzmCode.equals(redis_yzm) && !"6666".equals(yzmCode)) {
- return ServerResponse.createByErrorMsg("Registration failed because the verification code is incorrect. Procedure");
+ return ServerResponse.createByErrorMsg("由于验证码不正确，注册失败。过程",request);
}
AgentUser agentUser = this.iAgentUserService.findByCode(agentCode);
if (agentUser == null) {
- return ServerResponse.createByErrorMsg("Registration failed because the agent does not exist");
+ return ServerResponse.createByErrorMsg("由于代理不存在，注册失败",request);
}
if (agentUser.getIsLock().intValue() == 1) {
- return ServerResponse.createByErrorMsg("Registration failed. The agent is locked");
+ return ServerResponse.createByErrorMsg("注册失败。代理被锁定",request);
}
- 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");
+ return ServerResponse.createByErrorMsg("注册失败，手机号已注册",request);
}
@@ -168,34 +178,30 @@
log.info("用户注册成功 手机 {} , ip = {} 地址 = {}", new Object[]{phone, uip, uadd});
return ServerResponse.createBySuccessMsg("Registration successful. Please login");
}
- return ServerResponse.createBySuccessMsg("Registration error, please try again");
+ return ServerResponse.createBySuccessMsg("注册错误，请重试",request);
}
public ServerResponse login(String phone, String userPwd, HttpServletRequest request) {
if (StringUtils.isBlank(phone) || StringUtils.isBlank(userPwd)) {
- return ServerResponse.createByErrorMsg("The mobile phone number and password cannot be empty");
+ return ServerResponse.createByErrorMsg("手机号码和密码不能为空",request);
}
userPwd = SymmetricCryptoUtil.encryptPassword(userPwd);
User user = this.userMapper.login(phone, userPwd);
if (user != null) {
if (user.getIsLogin().intValue() == 1) {
- return ServerResponse.createByErrorMsg("Login failed. Account locked");
+ return ServerResponse.createByErrorMsg("登录失败。账户锁定",request);
}
-
- log.info("用户{}登陆成功, 登陆状态{} ,交易状态{}", new Object[]{user.getId(), user.getIsLogin(), user.getIsLock()});
-
- userAssetsServices.assetsByTypeAndUserId(EStockType.HG.getCode(),user.getId());
+ userAssetsServices.assetsByTypeAndUserId(EStockType.IN.getCode(),user.getId());
this.iSiteLoginLogService.saveLog(user, request);
return ServerResponse.createBySuccess(user);
}
- return ServerResponse.createByErrorMsg("Login failed, the user name and password are incorrect");
+ return ServerResponse.createByErrorMsg("登录失败，用户名和密码错误",request);
}
public User getCurrentUser(HttpServletRequest request) {
String property = PropertiesUtil.getProperty("user.cookie.name");
-// System.out.println(property);
String loginToken = request.getHeader(property);
if (loginToken == null) {
return null;
@@ -224,18 +230,15 @@
public ServerResponse addOption(String code, HttpServletRequest request) {
User user = getCurrentUser(request);
- if (user == null) {
- return ServerResponse.createBySuccessMsg("Please log in first");
- }
String stockcode = code;
StockOption dboption = this.stockOptionMapper.findMyOptionIsExistByCode(user.getId(), stockcode);
if (dboption != null) {
- return ServerResponse.createByErrorMsg("Failed to add the selected stock because it already exists");
+ return ServerResponse.createByErrorMsg("未能添加所选股票，因为它已经存在",request );
}
//期货逻辑
Stock stock = this.stockMapper.findStockByCode(code);
if (stock == null) {
- return ServerResponse.createByErrorMsg("Add failed, stock does not exist");
+ return ServerResponse.createByErrorMsg("添加失败，库存不存在",request );
}
StockOption stockOption = new StockOption();
stockOption.setUserId(user.getId());
@@ -248,47 +251,30 @@
int insertCount = this.stockOptionMapper.insert(stockOption);
if (insertCount > 0) {
- return ServerResponse.createBySuccessMsg("Adding self-selected stocks succeeded");
+ return ServerResponse.createBySuccessMsg("添加自选股票成功",request );
}
- return ServerResponse.createByErrorMsg("Failed to add, please try again");
+ return ServerResponse.createByErrorMsg("添加失败，请重试",request );
}
public ServerResponse delOption(String code, HttpServletRequest request) {
User user = getCurrentUser(request);
- if (user == null) {
- return ServerResponse.createBySuccessMsg("Please log in first");
- }
String stockcode = code;
- if (code.contains("hf")) {
- stockcode = code.split("_")[1].toString();
- }
- stockcode = stockcode.replace("sh", "").replace("sz", "").replace("bj", "");
StockOption dboption = this.stockOptionMapper.findMyOptionIsExistByCode(user.getId(), stockcode);
-
if (dboption == null) {
- return ServerResponse.createByErrorMsg("Failed to delete because the self-selected stock does not exist");
+ return ServerResponse.createByErrorMsg("删除失败，因为自选股票不存在",request);
}
-
int delCount = this.stockOptionMapper.deleteByPrimaryKey(dboption.getId());
if (delCount > 0) {
- return ServerResponse.createBySuccessMsg("Deleting self-selected stocks succeeded. Procedure");
+ return ServerResponse.createBySuccessMsg("删除自选成功",request);
}
- return ServerResponse.createByErrorMsg("Failed to delete, please try again");
+ return ServerResponse.createByErrorMsg("删除自选失败",request);
}
public ServerResponse isOption(String code, HttpServletRequest request) {
User user = getCurrentUser(request);
-
- if (user == null) {
- return ServerResponse.createBySuccessMsg("Please log in first");
- }
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);
}
@@ -307,24 +293,21 @@
public ServerResponse updatePwd(String oldPwd, String newPwd, HttpServletRequest request) {
if (StringUtils.isBlank(oldPwd) || StringUtils.isBlank(newPwd)) {
- return ServerResponse.createByErrorMsg("The parameter cannot be null");
+ return ServerResponse.createByErrorMsg("该参数不能为空",request);
}
User user = getCurrentRefreshUser(request);
- if (user == null) {
- return ServerResponse.createBySuccessMsg("Please log in first");
- }
oldPwd = SymmetricCryptoUtil.encryptPassword(oldPwd);
if (!oldPwd.equals(user.getUserPwd())) {
- return ServerResponse.createByErrorMsg("Password error");
+ return ServerResponse.createByErrorMsg("密码错误",request);
}
user.setUserPwd(SymmetricCryptoUtil.encryptPassword(newPwd));
int updateCount = this.userMapper.updateById(user);
if (updateCount > 0) {
- return ServerResponse.createBySuccessMsg("Modified successfully");
+ return ServerResponse.createBySuccessMsg("修改成功",request);
}
- return ServerResponse.createByErrorMsg("Modification failure");
+ return ServerResponse.createByErrorMsg("修改失败",request);
}
@@ -389,18 +372,16 @@
if (StringUtils.isBlank(realName) ||
StringUtils.isBlank(idCard)) {
- return ServerResponse.createByErrorMsg("The parameter cannot be null");
+ return ServerResponse.createByErrorMsg("该参数不能为空",request);
}
User user = getCurrentRefreshUser(request);
- if (user == null) {
- return ServerResponse.createByErrorMsg("Please log in！");
- }
if (((0 != user.getIsActive().intValue())) & ((3 != user.getIsActive().intValue()))) {
- return ServerResponse.createByErrorMsg("The current status cannot be authenticated");
+ return ServerResponse.createByErrorMsg("当前状态无法验证",request);
}
-
+ user.setImg1Key(img1key);
+ user.setImg2Key(img2key);
user.setNickName(realName);
user.setRealName(realName);
user.setIdCard(idCard);
@@ -411,9 +392,9 @@
int updateCount = this.userMapper.updateById(user);
if (updateCount > 0) {
- return ServerResponse.createBySuccessMsg("Real name authentication");
+ return ServerResponse.createBySuccessMsg("实名认证",request);
}
- return ServerResponse.createByErrorMsg("Real-name authentication failed. Procedure");
+ return ServerResponse.createByErrorMsg("实名认证失败",request);
}
@@ -452,36 +433,38 @@
@Override
public ServerResponse getMoney(HttpServletRequest request) {
+ return getMoney(getCurrentUser(request).getId());
+ }
- BigDecimal exchangeRate = iSiteSettingService.getSiteSetting().getExchangeRate();
- List<UserAssets> userAssetsList = userAssetsServices.assetsByUserId(getCurrentUser(request).getId());
- List<RUserAssets> rUserAssetsList = new ArrayList<>();
-
- /**
- * 浮动盈亏
- * */
- BigDecimal AllProfitAndLose = BigDecimal.ZERO;
+ @Override
+ public ServerResponse getMoney(Integer userId) {
+ List<UserAssets> userAssetsList = userAssetsServices.assetsByUserId(userId);
+ List<RUserAssets> rUserAssetsList = new ArrayList<>();
+ int s= 4;
+ /**
+ * 浮动盈亏
+ * */
+ BigDecimal AllProfitAndLose = BigDecimal.ZERO;
/**
* 总资产
* */
- BigDecimal allTotalAssets = BigDecimal.ZERO;
+ BigDecimal allTotalAssets = BigDecimal.ZERO;
/**
* 总可用余额
* */
- BigDecimal allAmt = BigDecimal.ZERO;
+ BigDecimal allAmt = BigDecimal.ZERO;
/**
* 累计盈亏
* */
- BigDecimal AllHProfitAndLose = BigDecimal.ZERO;
+ BigDecimal AllHProfitAndLose = BigDecimal.ZERO;
/**
* 总冻结资产
* */
- BigDecimal allFreeMoney = BigDecimal.ZERO;
+ BigDecimal allFreeMoney = BigDecimal.ZERO;
/**
* 总手续费
* */
- BigDecimal allHMoney = BigDecimal.ZERO;
-
+ BigDecimal allHMoney = BigDecimal.ZERO;
for (int i = 0; i <userAssetsList.size() ; i++) {
RUserAssets rUserAssets = new RUserAssets();
UserAssets userAssets = userAssetsList.get(i);
@@ -492,66 +475,89 @@
BigDecimal freeMoney = userAssets.getFreezeMoney();
BigDecimal hMoney = userAssets.getHandlingCharge();
BigDecimal hProfitAndLose = userAssets.getCumulativeProfitAndLoss();
-
- rUserAssets.setTotalMoney((totalAssets.setScale(2).toString()));
+ rUserAssets.setId(userAssets.getId());
+ rUserAssets.setTotalMoney((totalAssets.toString()));
rUserAssets.setAccectType(userAssets.getAccectType());
- rUserAssets.setAvailableBalance(amt.setScale(2).toString());
- rUserAssets.setFreezeMoney(freeMoney.setScale(2).toString());
- rUserAssets.setCumulativeProfitAndLoss(hProfitAndLose.setScale(2).toString());
- rUserAssets.setHandlingCharge(hMoney.setScale(2).toString());
- rUserAssets.setProfitAndLoss(profitAndLose.setScale(2).toString());
- if(userAssets.getAccectType().equals("US")){
- rUserAssets.setSymbol("$");
- rUserAssets.setSymbolCode("USD");
- AllProfitAndLose = AllProfitAndLose.add(profitAndLose);
- allTotalAssets = allTotalAssets.add(totalAssets);
- allAmt = allAmt.add(amt);
- AllHProfitAndLose = AllHProfitAndLose.add(hProfitAndLose);
- allFreeMoney = allFreeMoney.add(freeMoney);
- allHMoney = allHMoney.add(hMoney);
- rUserAssets.setAvailableBalanceUSD(rUserAssets.getAvailableBalance());
- rUserAssets.setFreezeMoneyUSD(rUserAssets.getFreezeMoney());
- rUserAssets.setTotalMoneyUSD(rUserAssets.getTotalMoney());
- rUserAssets.setCumulativeProfitAndLossUSD(hProfitAndLose.setScale(2).toString());
- rUserAssets.setHandlingChargeUSD(hMoney.setScale(2).toString());
- rUserAssets.setProfitAndLossUSD(hProfitAndLose.setScale(2).toString());
+ rUserAssets.setAvailableBalance(amt.toString());
+ rUserAssets.setFreezeMoney(freeMoney.toString());
+ rUserAssets.setCumulativeProfitAndLoss(hProfitAndLose.toString());
+ rUserAssets.setHandlingCharge(hMoney.toString());
+ rUserAssets.setProfitAndLoss(profitAndLose.toString());
- }else{
- rUserAssets.setAvailableBalanceUSD(userAssets.getAvailableBalance().divide(exchangeRate,BigDecimal.ROUND_CEILING).toString());
- rUserAssets.setFreezeMoneyUSD(userAssets.getFreezeMoney().divide(exchangeRate,BigDecimal.ROUND_CEILING).toString());
- rUserAssets.setTotalMoneyUSD(userAssets.getTotleAssets().divide(exchangeRate,BigDecimal.ROUND_CEILING).toString());
- rUserAssets.setSymbol("RM");
- rUserAssets.setSymbolCode("MYR");
- rUserAssets.setCumulativeProfitAndLossUSD(hProfitAndLose.divide(exchangeRate,BigDecimal.ROUND_CEILING).toString());
- rUserAssets.setHandlingChargeUSD(hMoney.divide(exchangeRate,BigDecimal.ROUND_CEILING).toString());
- rUserAssets.setProfitAndLossUSD(hProfitAndLose.divide(exchangeRate,BigDecimal.ROUND_CEILING).toString());
+ BigDecimal rate = rateServices.currencyRate(
+ EStockType.getEStockTypeByCode(userAssets.getAccectType()),EStockType.US);
- AllProfitAndLose = AllProfitAndLose.add(profitAndLose.divide(exchangeRate,BigDecimal.ROUND_CEILING));
- allTotalAssets = allTotalAssets.add(totalAssets.divide(exchangeRate,BigDecimal.ROUND_CEILING));
- allAmt = allAmt.add(amt.divide(exchangeRate,BigDecimal.ROUND_CEILING));
- AllHProfitAndLose = AllHProfitAndLose.add(hProfitAndLose.divide(exchangeRate,BigDecimal.ROUND_CEILING));
- allFreeMoney = allFreeMoney.add(freeMoney.divide(exchangeRate,BigDecimal.ROUND_CEILING));
- allHMoney = allHMoney.add(hMoney.divide(exchangeRate,BigDecimal.ROUND_CEILING));
+ BigDecimal availableBalanceUSD = amt;
+ if(amt.compareTo(BigDecimal.ZERO)>0){
+ availableBalanceUSD = amt.multiply(rate);
+ }
+
+ BigDecimal freezeMoneyUSD = freeMoney;
+ if(freeMoney.compareTo(BigDecimal.ZERO)>0){
+ freezeMoneyUSD = freeMoney.multiply(rate);
+ }
+
+ BigDecimal totleMoneyUSD = totalAssets;
+ if(totalAssets.compareTo(BigDecimal.ZERO)>0){
+ totleMoneyUSD = totleMoneyUSD.multiply(rate);
}
+
+ BigDecimal cumulativeProfitAndLossUSD = hProfitAndLose;
+ if(hProfitAndLose.compareTo(BigDecimal.ZERO)>0){
+ cumulativeProfitAndLossUSD = hProfitAndLose.multiply(rate);
+ }
+
+ BigDecimal handlingChargeUSD = hMoney;
+ if(hMoney.compareTo(BigDecimal.ZERO)>0){
+ handlingChargeUSD =hMoney.multiply(rate);
+ }
+ BigDecimal profitAndLossUSD = profitAndLose;
+ if(profitAndLose.compareTo(BigDecimal.ZERO)>0){
+ profitAndLossUSD =profitAndLose.multiply(rate);
+ }
+
+
+
+ rUserAssets.setAvailableBalanceUSD(availableBalanceUSD.setScale(s,BigDecimal.ROUND_UP).toString());
+ rUserAssets.setFreezeMoneyUSD(freezeMoneyUSD.setScale(s,BigDecimal.ROUND_UP).toString());
+ rUserAssets.setTotalMoneyUSD(totleMoneyUSD.setScale(s,BigDecimal.ROUND_UP).toString());
+ rUserAssets.setSymbol(EStockType.getEStockTypeByCode(userAssets.getAccectType()).getSymbol1());
+ rUserAssets.setSymbolCode(EStockType.getEStockTypeByCode(userAssets.getAccectType()).getSymbol());
+ rUserAssets.setCumulativeProfitAndLossUSD(cumulativeProfitAndLossUSD.setScale(s,BigDecimal.ROUND_UP).toString());
+ rUserAssets.setHandlingChargeUSD(handlingChargeUSD.setScale(s,BigDecimal.ROUND_UP).toString());
+ rUserAssets.setProfitAndLossUSD(profitAndLossUSD.setScale(s,BigDecimal.ROUND_UP).toString());
+
+ AllProfitAndLose = AllProfitAndLose.add(profitAndLossUSD);
+ allTotalAssets = allTotalAssets.add(totleMoneyUSD);
+ allAmt = allAmt.add(availableBalanceUSD);
+ AllHProfitAndLose = AllHProfitAndLose.add(handlingChargeUSD);
+ allFreeMoney = allFreeMoney.add(freezeMoneyUSD);
+ allHMoney = allHMoney.add(handlingChargeUSD);
+
+
+
+
+
rUserAssetsList.add(rUserAssets);
}
+
RUserAssets rUserAssets = new RUserAssets();
rUserAssets.setAccectType("ALL");
- rUserAssets.setProfitAndLoss(AllProfitAndLose.setScale(2).toString());
- rUserAssets.setProfitAndLossUSD(AllProfitAndLose.setScale(2).toString());
- rUserAssets.setHandlingCharge(allHMoney.setScale(2).toString());
- rUserAssets.setHandlingChargeUSD(allHMoney.setScale(2).toString());
- rUserAssets.setCumulativeProfitAndLoss(AllHProfitAndLose.setScale(2).toString());
- rUserAssets.setCumulativeProfitAndLossUSD(AllHProfitAndLose.setScale(2).toString());
- rUserAssets.setTotalMoney(allTotalAssets.setScale(2).toString());
- rUserAssets.setTotalMoneyUSD(allTotalAssets.setScale(2).toString());
- rUserAssets.setAvailableBalance(allAmt.setScale(2).toString());
- rUserAssets.setAvailableBalanceUSD(allAmt.setScale(2).toString());
- rUserAssets.setFreezeMoney(allFreeMoney.setScale(2).toString());
- rUserAssets.setFreezeMoneyUSD(allFreeMoney.setScale(2).toString());
+ rUserAssets.setProfitAndLoss(AllProfitAndLose.setScale(s,BigDecimal.ROUND_DOWN).toString());
+ rUserAssets.setProfitAndLossUSD(AllProfitAndLose.setScale(s,BigDecimal.ROUND_DOWN).toString());
+ rUserAssets.setHandlingCharge(allHMoney.setScale(s,BigDecimal.ROUND_DOWN).toString());
+ rUserAssets.setHandlingChargeUSD(allHMoney.setScale(s,BigDecimal.ROUND_DOWN).toString());
+ rUserAssets.setCumulativeProfitAndLoss(AllHProfitAndLose.setScale(s,BigDecimal.ROUND_DOWN).toString());
+ rUserAssets.setCumulativeProfitAndLossUSD(AllHProfitAndLose.setScale(s,BigDecimal.ROUND_DOWN).toString());
+ rUserAssets.setTotalMoney(allTotalAssets.setScale(s,BigDecimal.ROUND_DOWN).toString());
+ rUserAssets.setTotalMoneyUSD(allTotalAssets.setScale(s,BigDecimal.ROUND_DOWN).toString());
+ rUserAssets.setAvailableBalance(allAmt.setScale(s,BigDecimal.ROUND_DOWN).toString());
+ rUserAssets.setAvailableBalanceUSD(allAmt.setScale(s,BigDecimal.ROUND_DOWN).toString());
+ rUserAssets.setFreezeMoney(allFreeMoney.setScale(s,BigDecimal.ROUND_DOWN).toString());
+ rUserAssets.setFreezeMoneyUSD(allFreeMoney.setScale(s,BigDecimal.ROUND_DOWN).toString());
rUserAssets.setSymbol("$");
rUserAssets.setSymbolCode("USD");
rUserAssetsList.add(rUserAssets);
@@ -560,16 +566,16 @@
}
@Override
- public ServerResponse transfer(String fromType, String toType, String amt,HttpServletRequest paramHttpServletRequest) {
-
- User user = userService.getCurrentUser(paramHttpServletRequest);
+ public ServerResponse transfer(String fromType, String toType, String amt,HttpServletRequest request) {
+ User user = userService.getCurrentUser(request);
UserAssets formAssets = userAssetsServices.assetsByTypeAndUserId(fromType,user.getId());
BigDecimal amtBig = new BigDecimal(amt);
if(formAssets.getAvailableBalance().compareTo(amtBig)<0){
- return ServerResponse.createByErrorMsg("Insufficient amount");
+ return ServerResponse.createByErrorMsg("余额不足",request);
}
- userAssetsServices.availablebalanceChange(fromType,user.getId(), EUserAssets.TRANSFER,amtBig.negate(),"","");
- userAssetsServices.availablebalanceChange(toType,user.getId(),EUserAssets.TRANSFER,amtBig,"","");
+ userAssetsServices.availablebalanceChange(fromType,user.getId(), EUserAssets.TRANSFER,amtBig.negate(),fromType+"/"+toType,"");
+ amtBig = rateServices.currencyRate(EStockType.getEStockTypeByCode(fromType),EStockType.getEStockTypeByCode(toType)).multiply(amtBig);
+ userAssetsServices.availablebalanceChange(toType,user.getId(),EUserAssets.TRANSFER,amtBig.setScale(5,RoundingMode.HALF_DOWN),fromType+"/"+toType,"");
return ServerResponse.createBySuccess();
}
@@ -694,22 +700,20 @@
}
+ @Transactional
public ServerResponse addSimulatedAccount(Integer agentId, String phone, String pwd, String amt, Integer accountType, HttpServletRequest request) {
if (StringUtils.isBlank(phone) || StringUtils.isBlank(pwd)) {
return ServerResponse.createByErrorMsg("The parameter cannot be null");
}
-
- User dbUser = this.userMapper.findByPhone(phone);
+ QueryWrapper queryWrapper = new QueryWrapper();
+ queryWrapper.eq("phone",phone);
+ User dbUser = userMapper.selectOne(queryWrapper);
if (dbUser != null) {
return ServerResponse.createByErrorMsg("The phone number is registered");
}
- if ((new BigDecimal(amt)).compareTo(new BigDecimal("200000")) == 1) {
- return ServerResponse.createByErrorMsg("The phone number is registered");
- }
- amt = "0"; //代理后台添加用户时金额默认为0
User user = new User();
user.setAccountType(accountType);
user.setPhone(phone);
@@ -717,6 +721,7 @@
user.setIsLogin(Integer.valueOf(0));
user.setIsActive(Integer.valueOf(0));
user.setRegTime(new Date());
+
if (accountType.intValue() == 1) {
user.setNickName("模拟用户");
@@ -730,6 +735,9 @@
}
int insertCount = this.userMapper.insert(user);
+ dbUser = userMapper.selectOne(queryWrapper);
+ userAssetsServices.getAvailableBalance(EStockType.IN.getCode(),dbUser.getId() );
+ userAssetsServices.availablebalanceChange(EStockType.IN.getCode(),dbUser.getId(),EUserAssets.TOP_UP,new BigDecimal(amt),"","");
if (insertCount > 0) {
return ServerResponse.createBySuccessMsg("Success");
}
@@ -897,6 +905,9 @@
user.setAuthMsg(authMsg);
}
+ if(state == 2){
+ user.setIsLock(0);
+ }
user.setIsActive(state);
int updateCount = this.userMapper.updateById(user);
@@ -1018,16 +1029,6 @@
userInfoVO.setIsActive(user.getIsActive());
userInfoVO.setAuthMsg(user.getAuthMsg());
userInfoVO.setVaildNumber(user.getVaildNumber());
- BigDecimal exchangRate = iSiteSettingService.getSiteSetting().getExchangeRate();
- BigDecimal totalUsMoney = userAssetsServices.getAvailableBalance(EStockType.US.getCode(),user.getId());
- BigDecimal totalMasMoney = userAssetsServices.getAvailableBalance(EStockType.IN.getCode(), user.getId())
- .divide(exchangRate,BigDecimal.ROUND_CEILING).setScale(2,
- RoundingMode.UP);
-
-
- userInfoVO.setMasTotalAssets(totalMasMoney.setScale(2).toString());
- userInfoVO.setUsTotalAssets(totalUsMoney.setScale(2).toString());
- userInfoVO.setTotalAssets((totalUsMoney.add(totalMasMoney)).setScale(2).toString());
return userInfoVO;
}
@@ -1055,20 +1056,21 @@
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