From 9dd29e5b9460b82c9348f9974d24f654c82004d9 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Fri, 31 Oct 2025 18:40:47 +0800
Subject: [PATCH] 1

---
 trading-order-service/src/main/java/com/yami/trading/service/dz/impl/StockDzServiceImpl.java |   29 ++++++++++++++++++-----------
 1 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/trading-order-service/src/main/java/com/yami/trading/service/dz/impl/StockDzServiceImpl.java b/trading-order-service/src/main/java/com/yami/trading/service/dz/impl/StockDzServiceImpl.java
index 3fc3892..e57cf20 100644
--- a/trading-order-service/src/main/java/com/yami/trading/service/dz/impl/StockDzServiceImpl.java
+++ b/trading-order-service/src/main/java/com/yami/trading/service/dz/impl/StockDzServiceImpl.java
@@ -42,6 +42,7 @@
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.text.DecimalFormat;
 import java.util.*;
 
@@ -90,13 +91,15 @@
     }
 
     @Override
-    public Result addByAdmin(String stockCode, String stockNum, String password, String startTime, String endTime, String discount,Integer period,String nowPrice,Integer switchType) {
-        if (stockCode == null || stockCode.isEmpty() ||stockNum == null || stockNum.isEmpty() || startTime == null || startTime.isEmpty() ||endTime == null || endTime.isEmpty() || period == null || nowPrice == null){
+    public Result addByAdmin(String stockCode, String stockNum, String password, String startTime, String endTime, String discount,Integer period,String nowPrice,Integer switchType, String stockType) {
+        if (stockCode == null || stockCode.isEmpty() ||stockNum == null || stockNum.isEmpty() || startTime == null || startTime.isEmpty() ||endTime == null || endTime.isEmpty() || nowPrice == null){
             return Result.failed("参数不能为空");
         }
 
+        //该类型是否已添加
         Long count = stockDzMapper.selectCount(new LambdaQueryWrapper<StockDz>()
-                .eq(StockDz::getStockCode,stockCode));
+                .eq(StockDz::getStockCode,stockCode)
+                .eq(StockDz::getStockType,stockType));
         if(count > 0){
             return Result.failed("股票代码已存在");
         }
@@ -109,7 +112,7 @@
         StockDz stockDz = new StockDz();
         stockDz.setStockName(item.getSymbolFullName());
         stockDz.setStockCode(item.getSymbol());
-        stockDz.setStockType(item.getType());
+        stockDz.setStockType(stockType);
         stockDz.setStockSpell(item.getSymbolData());
         stockDz.setIsLock(0);
         stockDz.setIsShow(1);
@@ -160,7 +163,7 @@
         }
         model.setStockName(item.getSymbolFullName());
         model.setStockCode(item.getSymbol());
-        model.setStockType(item.getType());
+        model.setStockType(stockDz.getStockType());
         model.setStockSpell(item.getSymbolData());
         return stockDzMapper.updateById(model) > 0 ? Result.succeed("修改成功") : Result.failed("修改失败");
     }
@@ -195,6 +198,10 @@
                     DecimalFormat df = new DecimalFormat("#.##");
                     String resultStr = df.format(profitLoss);
                     dz.setProfitLoss(Double.parseDouble(resultStr));
+
+                    double profitPercentage = (profitLoss / dz.getVolume()) * 100;
+                    String resultPer = df.format(profitPercentage);
+                    dz.setProfitLossPercentage(Double.parseDouble(resultPer));
                 });
             }
 
@@ -268,7 +275,7 @@
             BigDecimal orderFree = buyAmt.multiply(BigDecimal.valueOf(feeRate));
             BigDecimal orderAmt = buyAmt.add(orderFree);
             if (wallet.getMoney().compareTo(orderAmt) < 0) {
-                throw new YamiShopBindException("订单失败，资金不足");
+                return Result.failed("余额不足");
             }
 
             BigDecimal amountBefore = wallet.getMoney();
@@ -317,7 +324,7 @@
             return Result.succeed("购买成功");
         } catch (Exception e) {
             log.error(e.getMessage());
-            return Result.failed("操作失败:" + e.getMessage());
+            return Result.failed("失败");
         }
     }
 
@@ -464,7 +471,7 @@
             }
 
             Date now = new Date();
-            if (stockDz.getPeriod() > 0) {
+            if (stockDz.getPeriod() != null && stockDz.getPeriod() > 0) {
                 Calendar calendar = Calendar.getInstance();
                 calendar.setTime(order.getCreateTime());
                 calendar.add(Calendar.DATE, stockDz.getPeriod());
@@ -472,7 +479,7 @@
                 Date resultTime = calendar.getTime();
 
                 if(now.getTime() < resultTime.getTime()){
-                    throw new YamiShopBindException("Lock-up period:" + stockDz.getPeriod());
+                    throw new YamiShopBindException("锁仓中");
                 }
             }
 
@@ -489,7 +496,7 @@
             //结算金额
             double closeAmt = closePrice * num - orderFree.doubleValue();
             if (closeAmt < 0) {
-                throw new YamiShopBindException("手续费资金不足");
+                return Result.failed("余额不足");
             }
 
             //拆分订单
@@ -537,7 +544,7 @@
             return Result.succeed("平仓成功");
         } catch (Exception e) {
             log.error(e.getMessage());
-            return Result.failed("操作失败:" + e.getMessage());
+            return Result.failed("失败");
         }
     }
 

--
Gitblit v1.9.3