From de4c1a5257dfaa7ab26265f474b7176f6b55524d Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Mon, 29 Apr 2024 14:31:04 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/pojo/OrderEchoOut.java | 9 +++++++--
src/main/java/com/nq/service/impl/EchoServices.java | 2 ++
src/main/java/com/nq/service/impl/UserPositionServiceImpl.java | 6 ++++--
src/main/resources/mapper/OrderEchoMapper.xml | 2 +-
target/classes/mapper/OrderEchoMapper.xml | 2 +-
5 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/nq/pojo/OrderEchoOut.java b/src/main/java/com/nq/pojo/OrderEchoOut.java
index 03defd8..7b8606f 100644
--- a/src/main/java/com/nq/pojo/OrderEchoOut.java
+++ b/src/main/java/com/nq/pojo/OrderEchoOut.java
@@ -3,8 +3,11 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.springframework.data.annotation.Transient;
+
+import java.util.Date;
/**
* @program: dabao
@@ -20,9 +23,11 @@
private String returnOfRate;
- private String buyTime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Kolkata")
+ private Date buyTime;
- private String endTime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Kolkata")
+ private Date endTime;
private String userId;
diff --git a/src/main/java/com/nq/service/impl/EchoServices.java b/src/main/java/com/nq/service/impl/EchoServices.java
index 3db3492..29e0f66 100644
--- a/src/main/java/com/nq/service/impl/EchoServices.java
+++ b/src/main/java/com/nq/service/impl/EchoServices.java
@@ -76,6 +76,7 @@
.eq(UserAssets::getAccectType, "IN")
);
userAssets.setAvailableBalance(userAssets.getAvailableBalance().subtract(money));
+ userAssets.setFreezeMoney(userAssets.getFreezeMoney().add(money));
userAssetsMapper.updateById(userAssets);
return orderEchoMapper.insert(orderEchoBean) >= 1;
}
@@ -129,6 +130,7 @@
}else{
userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(aml));
}
+ userAssets.setFreezeMoney(userAssets.getFreezeMoney().subtract(money));
userAssetsMapper.updateById(userAssets);
orderEchoBean.setState("2");
orderEchoBean.setEarnings(incomeAmount.toString());
diff --git a/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java b/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
index 2d3e8c1..e08fd38 100644
--- a/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
@@ -59,6 +59,9 @@
IUserAssetsServices userAssetsServices;
@Autowired
+ UserAssetsMapper userAssetsMapper;
+
+ @Autowired
ISiteSettingService iSiteSettingService;
@Autowired
@@ -117,8 +120,6 @@
@Autowired
IStockConfigServices iStockConfigServices;
- @Autowired
- private UserAssetsMapper userAssetsMapper;
@Transactional
public ServerResponse buy(Integer stockId, Integer buyNum, Integer buyType, Integer lever, BigDecimal profitTarget, BigDecimal stopTarget, HttpServletRequest request) {
@@ -1250,6 +1251,7 @@
return ServerResponse.createByErrorMsg("新股转持仓失败");
}
userAssets.setFreezeMoney(userAssets.getFreezeMoney().add(userPosition.getOrderTotalPrice()));
+ userAssetsMapper.updateById(userAssets);
if (ret > 0) {
userStockSubscribe.setStatus(5);
userStockSubscribeMapper.update1(userStockSubscribe);
diff --git a/src/main/resources/mapper/OrderEchoMapper.xml b/src/main/resources/mapper/OrderEchoMapper.xml
index 52d1b8f..12eae6e 100644
--- a/src/main/resources/mapper/OrderEchoMapper.xml
+++ b/src/main/resources/mapper/OrderEchoMapper.xml
@@ -35,7 +35,7 @@
from order_echo o
join echo e
on o.eid = e.id
- where user_id = #{id}
+ where user_id = #{id} GROUP BY o.buy_time desc
</select>
<select id="queryAll" resultType="com.nq.pojo.reponse.OrderEChoReponse">
diff --git a/target/classes/mapper/OrderEchoMapper.xml b/target/classes/mapper/OrderEchoMapper.xml
index 52d1b8f..12eae6e 100644
--- a/target/classes/mapper/OrderEchoMapper.xml
+++ b/target/classes/mapper/OrderEchoMapper.xml
@@ -35,7 +35,7 @@
from order_echo o
join echo e
on o.eid = e.id
- where user_id = #{id}
+ where user_id = #{id} GROUP BY o.buy_time desc
</select>
<select id="queryAll" resultType="com.nq.pojo.reponse.OrderEChoReponse">
--
Gitblit v1.9.3