From a2744ed2fccdc1f6e417022876945a7e30b949f7 Mon Sep 17 00:00:00 2001
From: jack <zengjieli93@163.com>
Date: Wed, 27 Mar 2024 21:20:01 +0800
Subject: [PATCH] 分支再次提交
---
target/classes/mapper/SitePayMapper.xml | 22 ++--
src/main/java/com/nq/service/impl/UserAssetsServices.java | 29 +++++++
target/classes/application.yml | 4
src/main/java/com/nq/service/IUserAssetsServices.java | 2
src/main/java/com/nq/controller/backend/AdminController.java | 22 +++++
src/main/java/com/nq/dao/SitePayMapper.java | 2
target/stock-0.0.1-SNAPSHOT.jar.original | 0
src/main/resources/mapper/SitePayMapper.xml | 22 ++--
src/main/java/com/nq/service/impl/SitePayServiceImpl.java | 3
src/main/java/com/nq/service/IUserService.java | 2
src/main/resources/application.yml | 4
src/main/java/com/nq/service/impl/UserServiceImpl.java | 108 ++++++++++++++++++++++++++
12 files changed, 188 insertions(+), 32 deletions(-)
diff --git a/src/main/java/com/nq/controller/backend/AdminController.java b/src/main/java/com/nq/controller/backend/AdminController.java
index ebf5723..7b0d769 100644
--- a/src/main/java/com/nq/controller/backend/AdminController.java
+++ b/src/main/java/com/nq/controller/backend/AdminController.java
@@ -66,6 +66,12 @@
@Autowired
IPayChnnelServices iPayChnnelServices;
+ @Autowired
+ IUserService iUserService;
+
+ @Autowired
+ IUserAssetsServices iUserAssetsServices;
+
//分页查询管理设置 所有管理列表数据及模糊查询
@RequestMapping({"list.do"})
@ResponseBody
@@ -321,4 +327,20 @@
}
+ @RequestMapping("getMoney.do")
+ @ResponseBody
+ public ServerResponse updateayChnnel(
+ @RequestParam("userId") Integer id){
+
+ return iUserService.getMoney(id);
+ }
+
+
+ @RequestMapping("updateMoney.do")
+ @ResponseBody
+ public ServerResponse updateayChnnel(
+ @RequestParam("id") Integer id, @RequestParam("amt") String amt){
+ return iUserAssetsServices.updateUserAssets(id,amt);
+ }
+
}
diff --git a/src/main/java/com/nq/dao/SitePayMapper.java b/src/main/java/com/nq/dao/SitePayMapper.java
index 25c128d..0978062 100644
--- a/src/main/java/com/nq/dao/SitePayMapper.java
+++ b/src/main/java/com/nq/dao/SitePayMapper.java
@@ -13,7 +13,7 @@
public interface SitePayMapper extends BaseMapper<SitePay> {
int deleteByPrimaryKey(Integer paramInteger);
- int insert(SitePay paramSitePay);
+// int insert(SitePay paramSitePay);
int insertSelective(SitePay paramSitePay);
diff --git a/src/main/java/com/nq/service/IUserAssetsServices.java b/src/main/java/com/nq/service/IUserAssetsServices.java
index c2e5b24..0d5998f 100644
--- a/src/main/java/com/nq/service/IUserAssetsServices.java
+++ b/src/main/java/com/nq/service/IUserAssetsServices.java
@@ -1,5 +1,6 @@
package com.nq.service;
+import com.nq.common.ServerResponse;
import com.nq.enums.EUserAssets;
import com.nq.pojo.Bank;
import com.nq.pojo.UserAssets;
@@ -20,6 +21,7 @@
+ ServerResponse updateUserAssets(Integer id, String amt);
List<UserAssets> assetsByUserId(Integer userId);
diff --git a/src/main/java/com/nq/service/IUserService.java b/src/main/java/com/nq/service/IUserService.java
index 2c0439c..56a7930 100644
--- a/src/main/java/com/nq/service/IUserService.java
+++ b/src/main/java/com/nq/service/IUserService.java
@@ -39,6 +39,8 @@
ServerResponse getMoney(HttpServletRequest request);
+ ServerResponse getMoney(Integer userId);
+
ServerResponse transfer(String fromType,String toType,String amt,HttpServletRequest paramHttpServletRequest);
void ForceSellTask();
diff --git a/src/main/java/com/nq/service/impl/SitePayServiceImpl.java b/src/main/java/com/nq/service/impl/SitePayServiceImpl.java
index f9b63d0..a8d4cb3 100644
--- a/src/main/java/com/nq/service/impl/SitePayServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/SitePayServiceImpl.java
@@ -62,8 +62,7 @@
if (sitePay.getId() == null) {
return ServerResponse.createByErrorMsg("修改id不能为空");
}
-
- int updateCount = this.sitePayMapper.updateByPrimaryKeySelective(sitePay);
+ int updateCount = this.sitePayMapper.updateById(sitePay);
if (updateCount > 0) {
return ServerResponse.createBySuccessMsg("修改成功");
}
diff --git a/src/main/java/com/nq/service/impl/UserAssetsServices.java b/src/main/java/com/nq/service/impl/UserAssetsServices.java
index 7610fd6..b77a3e6 100644
--- a/src/main/java/com/nq/service/impl/UserAssetsServices.java
+++ b/src/main/java/com/nq/service/impl/UserAssetsServices.java
@@ -1,6 +1,7 @@
package com.nq.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.nq.common.ServerResponse;
import com.nq.dao.UserAssetsMapper;
import com.nq.enums.EUserAssets;
import com.nq.pojo.UserAssets;
@@ -21,6 +22,9 @@
@Override
public UserAssets assetsByTypeAndUserId(String accetType, Integer userId) {
+ if(accetType.equals("SZHB")){
+ accetType = "US";
+ }
QueryWrapper<UserAssets> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("accect_type",accetType);
queryWrapper.eq("user_id",userId);
@@ -35,6 +39,24 @@
return userAssets;
}
+ @Override
+ public ServerResponse updateUserAssets(Integer id, String amt) {
+ UserAssets userAssets = userAssetsMapper.selectById(id);
+
+ BigDecimal bigAmt = new BigDecimal(amt);
+ if(amt.contains("-")){
+ if(userAssets.getAvailableBalance().compareTo(bigAmt.negate())<0){
+ return ServerResponse.createByErrorMsg("账户余额不足");
+ }
+ }
+ userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(bigAmt));
+ if( userAssetsMapper.updateById(userAssets)>0){
+ return ServerResponse.createBySuccess();
+ }else{
+ return ServerResponse.createByErrorMsg("修改金额失败");
+ }
+
+ }
@Override
@@ -46,6 +68,9 @@
@Override
public BigDecimal getAvailableBalance(String accetType, Integer userId) {
+ if(accetType.equals("SZHB")){
+ accetType = "US";
+ }
return assetsByTypeAndUserId(accetType,userId).getAvailableBalance();
}
@@ -53,7 +78,9 @@
@Override
public Boolean availablebalanceChange(String accetType, Integer userId, EUserAssets eUserAssets, BigDecimal amount, String desc, String descType) {
-
+ if(accetType.equals("SZHB")){
+ accetType = "US";
+ }
UserAssets userAssets = assetsByTypeAndUserId(accetType,userId);
if(Objects.equals(eUserAssets.getCode(), EUserAssets.BUY.getCode())){
userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(amount));
diff --git a/src/main/java/com/nq/service/impl/UserServiceImpl.java b/src/main/java/com/nq/service/impl/UserServiceImpl.java
index 9dfc106..0c4ef39 100644
--- a/src/main/java/com/nq/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserServiceImpl.java
@@ -452,11 +452,9 @@
@Override
public ServerResponse getMoney(HttpServletRequest request) {
-
BigDecimal exchangeRate = iSiteSettingService.getSiteSetting().getExchangeRate();
List<UserAssets> userAssetsList = userAssetsServices.assetsByUserId(getCurrentUser(request).getId());
List<RUserAssets> rUserAssetsList = new ArrayList<>();
-
/**
* 浮动盈亏
* */
@@ -560,6 +558,112 @@
}
@Override
+ public ServerResponse getMoney(Integer userId) {
+ BigDecimal exchangeRate = iSiteSettingService.getSiteSetting().getExchangeRate();
+ List<UserAssets> userAssetsList = userAssetsServices.assetsByUserId(userId);
+ List<RUserAssets> rUserAssetsList = new ArrayList<>();
+ /**
+ * 浮动盈亏
+ * */
+ BigDecimal AllProfitAndLose = BigDecimal.ZERO;
+ /**
+ * 总资产
+ * */
+ BigDecimal allTotalAssets = BigDecimal.ZERO;
+ /**
+ * 总可用余额
+ * */
+ BigDecimal allAmt = BigDecimal.ZERO;
+ /**
+ * 累计盈亏
+ * */
+ BigDecimal AllHProfitAndLose = BigDecimal.ZERO;
+ /**
+ * 总冻结资产
+ * */
+ BigDecimal allFreeMoney = BigDecimal.ZERO;
+ /**
+ * 总手续费
+ * */
+ BigDecimal allHMoney = BigDecimal.ZERO;
+ for (int i = 0; i <userAssetsList.size() ; i++) {
+ RUserAssets rUserAssets = new RUserAssets();
+ UserAssets userAssets = userAssetsList.get(i);
+ // 浮动盈亏
+ BigDecimal profitAndLose = userAssets.getProfitAndLoss();
+ BigDecimal amt = userAssets.getAvailableBalance();
+ BigDecimal totalAssets = userAssets.getAvailableBalance().add(userAssets.getFreezeMoney());
+ BigDecimal freeMoney = userAssets.getFreezeMoney();
+ BigDecimal hMoney = userAssets.getHandlingCharge();
+ BigDecimal hProfitAndLose = userAssets.getCumulativeProfitAndLoss();
+ rUserAssets.setId(userAssets.getId());
+ rUserAssets.setTotalMoney((totalAssets.setScale(2).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());
+
+ }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());
+
+ 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));
+ }
+ 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.setSymbol("$");
+ rUserAssets.setSymbolCode("USD");
+ rUserAssetsList.add(rUserAssets);
+
+ return ServerResponse.createBySuccess(rUserAssetsList);
+ }
+
+ @Override
public ServerResponse transfer(String fromType, String toType, String amt,HttpServletRequest paramHttpServletRequest) {
User user = userService.getCurrentUser(paramHttpServletRequest);
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index d3f9d35..521fda7 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -122,9 +122,9 @@
datasource:
type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://45.204.85.67111:6306/stock?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ url: jdbc:mysql://45.204.85.67:7306/stock?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
name: root
- password: f6fac591b6fcd9d6
+ password: Tji7mxYsCxsxCLsG
druid:
# 初始连接数
initialSize: 5
diff --git a/src/main/resources/mapper/SitePayMapper.xml b/src/main/resources/mapper/SitePayMapper.xml
index 129bea7..40d6c7b 100644
--- a/src/main/resources/mapper/SitePayMapper.xml
+++ b/src/main/resources/mapper/SitePayMapper.xml
@@ -36,17 +36,17 @@
delete from site_pay
where id = #{id,jdbcType=INTEGER}
</delete>
- <insert id="insert" parameterType="com.nq.pojo.SitePay" >
- insert into site_pay (id, c_type,form_url,form_code,channel_type, channel_name,
- channel_desc, channel_account, channel_img,
- channel_min_limit, channel_max_limit, is_show,
- is_lock, totalPrice)
- values (#{id,jdbcType=INTEGER}, #{cType,jdbcType=INTEGER},#{formUrl,jdbcType=VARCHAR},#{formCode,jdbcType=VARCHAR},
- #{channelType,jdbcType=VARCHAR}, #{channelName,jdbcType=VARCHAR},
- #{channelDesc,jdbcType=VARCHAR}, #{channelAccount,jdbcType=VARCHAR}, #{channelImg,jdbcType=VARCHAR},
- #{channelMinLimit,jdbcType=INTEGER}, #{channelMaxLimit,jdbcType=INTEGER}, #{isShow,jdbcType=INTEGER},
- #{isLock,jdbcType=INTEGER},#{totalPrice,jdbcType=DECIMAL})
- </insert>
+<!-- <insert id="insert" parameterType="com.nq.pojo.SitePay" >-->
+<!-- insert into site_pay (id, c_type,form_url,form_code,channel_type, channel_name,-->
+<!-- channel_desc, channel_account, channel_img,-->
+<!-- channel_min_limit, channel_max_limit, is_show,-->
+<!-- is_lock, total_price)-->
+<!-- values (#{id,jdbcType=INTEGER}, #{cType,jdbcType=INTEGER},#{formUrl,jdbcType=VARCHAR},#{formCode,jdbcType=VARCHAR},-->
+<!-- #{channelType,jdbcType=VARCHAR}, #{channelName,jdbcType=VARCHAR},-->
+<!-- #{channelDesc,jdbcType=VARCHAR}, #{channelAccount,jdbcType=VARCHAR}, #{channelImg,jdbcType=VARCHAR},-->
+<!-- #{channelMinLimit,jdbcType=INTEGER}, #{channelMaxLimit,jdbcType=INTEGER}, #{isShow,jdbcType=INTEGER},-->
+<!-- #{isLock,jdbcType=INTEGER},#{totalPrice,jdbcType=DECIMAL})-->
+<!-- </insert>-->
<insert id="insertSelective" parameterType="com.nq.pojo.SitePay" >
insert into site_pay
<trim prefix="(" suffix=")" suffixOverrides="," >
diff --git a/target/classes/application.yml b/target/classes/application.yml
index 1f7c668..521fda7 100644
--- a/target/classes/application.yml
+++ b/target/classes/application.yml
@@ -122,9 +122,9 @@
datasource:
type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://14.128.50.174:6306/stock?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ url: jdbc:mysql://45.204.85.67:7306/stock?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
name: root
- password: f6fac591b6fcd9d6
+ password: Tji7mxYsCxsxCLsG
druid:
# 初始连接数
initialSize: 5
diff --git a/target/classes/mapper/SitePayMapper.xml b/target/classes/mapper/SitePayMapper.xml
index 129bea7..40d6c7b 100644
--- a/target/classes/mapper/SitePayMapper.xml
+++ b/target/classes/mapper/SitePayMapper.xml
@@ -36,17 +36,17 @@
delete from site_pay
where id = #{id,jdbcType=INTEGER}
</delete>
- <insert id="insert" parameterType="com.nq.pojo.SitePay" >
- insert into site_pay (id, c_type,form_url,form_code,channel_type, channel_name,
- channel_desc, channel_account, channel_img,
- channel_min_limit, channel_max_limit, is_show,
- is_lock, totalPrice)
- values (#{id,jdbcType=INTEGER}, #{cType,jdbcType=INTEGER},#{formUrl,jdbcType=VARCHAR},#{formCode,jdbcType=VARCHAR},
- #{channelType,jdbcType=VARCHAR}, #{channelName,jdbcType=VARCHAR},
- #{channelDesc,jdbcType=VARCHAR}, #{channelAccount,jdbcType=VARCHAR}, #{channelImg,jdbcType=VARCHAR},
- #{channelMinLimit,jdbcType=INTEGER}, #{channelMaxLimit,jdbcType=INTEGER}, #{isShow,jdbcType=INTEGER},
- #{isLock,jdbcType=INTEGER},#{totalPrice,jdbcType=DECIMAL})
- </insert>
+<!-- <insert id="insert" parameterType="com.nq.pojo.SitePay" >-->
+<!-- insert into site_pay (id, c_type,form_url,form_code,channel_type, channel_name,-->
+<!-- channel_desc, channel_account, channel_img,-->
+<!-- channel_min_limit, channel_max_limit, is_show,-->
+<!-- is_lock, total_price)-->
+<!-- values (#{id,jdbcType=INTEGER}, #{cType,jdbcType=INTEGER},#{formUrl,jdbcType=VARCHAR},#{formCode,jdbcType=VARCHAR},-->
+<!-- #{channelType,jdbcType=VARCHAR}, #{channelName,jdbcType=VARCHAR},-->
+<!-- #{channelDesc,jdbcType=VARCHAR}, #{channelAccount,jdbcType=VARCHAR}, #{channelImg,jdbcType=VARCHAR},-->
+<!-- #{channelMinLimit,jdbcType=INTEGER}, #{channelMaxLimit,jdbcType=INTEGER}, #{isShow,jdbcType=INTEGER},-->
+<!-- #{isLock,jdbcType=INTEGER},#{totalPrice,jdbcType=DECIMAL})-->
+<!-- </insert>-->
<insert id="insertSelective" parameterType="com.nq.pojo.SitePay" >
insert into site_pay
<trim prefix="(" suffix=")" suffixOverrides="," >
diff --git a/target/stock-0.0.1-SNAPSHOT.jar.original b/target/stock-0.0.1-SNAPSHOT.jar.original
index e4f6ea1..2a92bcb 100644
--- a/target/stock-0.0.1-SNAPSHOT.jar.original
+++ b/target/stock-0.0.1-SNAPSHOT.jar.original
Binary files differ
--
Gitblit v1.9.3