From 4affbdf8938d321c0926bc2b1832dfc81c317ffa Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Thu, 08 Jan 2026 18:49:30 +0800
Subject: [PATCH] ipo

---
 trading-order-service/src/main/java/com/yami/trading/service/dz/impl/StockDzServiceImpl.java |  165 +++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 149 insertions(+), 16 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 bbeb177..f37af6f 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
@@ -24,12 +24,13 @@
 import com.yami.trading.common.domain.Result;
 import com.yami.trading.common.exception.YamiShopBindException;
 import com.yami.trading.common.util.Arith;
-import com.yami.trading.common.util.DateUtils;
 import com.yami.trading.common.util.RandomUtil;
+import com.yami.trading.common.util.StringEscapeUtil;
 import com.yami.trading.dao.dz.ExchangeApplyOrderDzMapper;
 import com.yami.trading.dao.dz.StockDzMapper;
 import com.yami.trading.service.MarketOpenChecker;
 import com.yami.trading.service.MoneyLogService;
+import com.yami.trading.service.UsStockTradingDayCalculator;
 import com.yami.trading.service.WalletService;
 import com.yami.trading.service.data.DataService;
 import com.yami.trading.service.dz.StockDzService;
@@ -43,7 +44,8 @@
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.text.DecimalFormat;
@@ -95,6 +97,9 @@
                     double dayRate = BigDecimal.valueOf(stockDzDto.getDayRate()).multiply(BigDecimal.valueOf(100)).doubleValue();
                     stockDzDto.setDayRate(dayRate);
                 }
+                if (!stockDzDto.getStockName().isEmpty()) {
+                    stockDzDto.setStockName(StringEscapeUtil.unEscapeAmpersand(stockDzDto.getStockName()));
+                }
             });
             return Result.succeed(page);
         } catch (Exception e) {
@@ -116,6 +121,10 @@
                 return Result.failed("请输入股票名称");
             }
         }
+
+        /*if (!stockName.isEmpty()) {
+            stockName = StringEscapeUtil.escapeAmpersand(stockName);
+        }*/
 
         //该类型是否已添加
         Long count = stockDzMapper.selectCount(new LambdaQueryWrapper<StockDz>()
@@ -155,6 +164,7 @@
         stockDz.setSwitchType(switchType);
         stockDz.setNowPrice(new BigDecimal(nowPrice));
         stockDz.setDayRate(dayRate);
+
         if (save(stockDz)) {
             return Result.succeed("添加成功");
         }
@@ -166,6 +176,31 @@
         try {
             Page page = new Page(pageNum, pageSize);
             stockDzMapper.getDzListByAdmin(page, Keywords, stockType);
+
+            page.getRecords().forEach(stockDzObj -> {
+                // 1. 判空 + 强转为HashMap(兼容所有Map子类,如LinkedHashMap)
+                if (stockDzObj == null || !(stockDzObj instanceof HashMap)) {
+                    return;
+                }
+
+                // 强转为HashMap<String, Object>(确保key是字符串类型)
+                HashMap<String, Object> stockDzMap = (HashMap<String, Object>) stockDzObj;
+
+                // 2. 获取stock_name字段值(注意:key的拼写/大小写要和Map中完全一致!)
+                Object oldValue = stockDzMap.get("stock_name");
+
+                // 3. 空值防护 + 处理&转义
+                if (oldValue instanceof String) {
+                    String oldStr = (String) oldValue;
+                    // 反转义&amp;为&
+                    String newStr = oldStr.replace("&amp;", "&");
+                    // 4. 重新赋值回HashMap
+                    stockDzMap.put("stock_name", newStr);
+                } else {
+                    // 字段值不是字符串/为null时的提示(方便排查)
+                    System.out.println("stock_name字段值异常:" + oldValue);
+                }
+            });
             return Result.succeed(page);
         } catch (Exception e) {
             log.error(e.getMessage());
@@ -186,6 +221,11 @@
         if(stockDz == null){
             return Result.failed("不存在该大宗信息");
         }
+
+        /*if (!model.getStockName().isEmpty()) {
+            System.out.println(model.getStockName());
+            //model.setStockName(StringEscapeUtil.escapeAmpersand(model.getStockName()));
+        }*/
 
         if (!stockDz.getStockType().equalsIgnoreCase(Item.indices)) {
             Item item = itemService.findBySymbol(model.getStockCode());
@@ -232,11 +272,34 @@
                     }
                     if (dz.getDayRate() > 0) {
                         Date startTime = dz.getCreateTime();
+                        Date now = new Date();
+                        Calendar calendar = Calendar.getInstance();
+                        calendar.setTime(startTime);
+                        calendar.add(Calendar.DATE, dz.getPeriod());
+                        // 锁仓截至时间
+                        Date resultTime = calendar.getTime();
+                        //显示收益不超过 锁仓截至时间
+                        if(now.getTime() > resultTime.getTime()){
+                            now = resultTime;
+                        }
+                        // 计算美股交易天数
+                        int num = UsStockTradingDayCalculator.countUsStockTradingDays(startTime, now);
                         // 计算相差天数
-                        int num = com.yami.trading.common.util.DateUtil.dateNum(startTime, new Date());
+                        int days = com.yami.trading.common.util.DateUtil.dateNum(startTime, now);
+                        if (days >= dz.getPeriod()) {
+                            num--;
+                        }
                         num = Math.max(1, Math.min(num, dz.getPeriod()));
-                        double dayEarnings = dz.getDayRate() * dz.getVolume();
-                        double profitLoss = dayEarnings * num;
+
+                        double dayEarnings = 0; //日收益
+                        double profitLoss = 0;  //盈利
+                        double volume = dz.getVolume();  //本金
+                        for (int i = 0; i < num; i++) {
+                            dayEarnings = dz.getDayRate() * volume;
+                            profitLoss += dayEarnings;
+                            volume += dayEarnings;
+                        }
+
                         DecimalFormat df = new DecimalFormat("#.##");
                         String resultStr = df.format(profitLoss);
                         String resultStr2 = df.format(dayEarnings);
@@ -257,6 +320,11 @@
                         String resultPer = df.format(profitPercentage);
                         dz.setProfitLossPercentage(Double.parseDouble(resultPer));
                     }
+
+                    if (!dz.getStockName().isEmpty()) {
+                        dz.setStockName(StringEscapeUtil.unEscapeAmpersand(dz.getStockName()));
+                    }
+
                 });
             }
 
@@ -273,9 +341,37 @@
             Page page = new Page(pageNum, pageSize);
 
             stockDzMapper.getDzCheckList(page ,state, stockCode, stockType, userName, checkedList);
+
+            page.getRecords().forEach(stockDzObj  -> {
+                if (stockDzObj == null) {
+                    return;
+                }
+
+                try {
+                    // ========== 第一步:获取字段值(以stockName为例) ==========
+                    // 1. 获取getter方法(JavaBean规范:字段名stockName → 方法名getStockName)
+                    Method getter = stockDzObj.getClass().getMethod("getStockName");
+                    // 2. 执行方法获取值
+                    Object oldValue = getter.invoke(stockDzObj);
+
+                    // ========== 第二步:处理字段值(仅当值不为null时) ==========
+                    if (oldValue instanceof String) { // 确保字段类型是String(根据实际字段类型调整)
+                        String newValue = ((String) oldValue).replace("&amp;", "&"); // 自定义处理逻辑
+
+                        // ========== 第三步:重新赋值 ==========
+                        // 1. 获取setter方法(参数为字段类型,比如String)
+                        Method setter = stockDzObj.getClass().getMethod("setStockName", String.class);
+                        // 2. 执行setter方法赋值
+                        setter.invoke(stockDzObj, newValue);
+                    }
+                } catch (Exception e) {
+                    // 捕获反射异常(方法不存在、权限不足等),避免循环中断
+                    log.error(e.getMessage());
+                }
+            });
             return Result.succeed(page);
         } catch (Exception e) {
-            log.error(e.getMessage());
+            log.error(e.getMessage(), e);
         }
         return Result.failed("获取失败");
     }
@@ -583,19 +679,25 @@
                 throw new YamiShopBindException("股票价格0,请重试");
             }
 
-            Date now = new Date();
-            if (!isAdmin) {
-                if (stockDz.getPeriod() != null && stockDz.getPeriod() > 0) {
-                    Calendar calendar = Calendar.getInstance();
-                    calendar.setTime(order.getCreateTime());
-                    calendar.add(Calendar.DATE, stockDz.getPeriod());
-                    // 锁仓时间
-                    Date resultTime = calendar.getTime();
 
-                    if(now.getTime() < resultTime.getTime()){
+            Date now = new Date();
+            Calendar calendar = Calendar.getInstance();
+            calendar.setTime(order.getCreateTime());
+            calendar.add(Calendar.DATE, stockDz.getPeriod());
+            // 锁仓截至时间
+            Date resultTime = calendar.getTime();
+            if (!isAdmin) {
+
+                if (stockDz.getPeriod() != null && stockDz.getPeriod() > 0) {
+                    if ((order.getUnLock() == null || order.getUnLock() == 0) && now.getTime() < resultTime.getTime()) {
+                        return Result.failed("未到平仓时间");
+                    }
+                } else {
+                    if (order.getUnLock() == null || order.getUnLock() == 0) {
                         return Result.failed("未到平仓时间");
                     }
                 }
+
                 if (!stockDz.getStockName().contains("测试")) {
                     boolean isOpen = MarketOpenChecker.isMarketOpenByItemCloseType(Item.US_STOCKS);
                     if (!isOpen) {
@@ -627,7 +729,14 @@
             if (isETF) {
                 //按日收益率结算
                 closeAmt = order.getPrice();
-                closeAmt = closeAmt + stockDz.getDayRate() * closeAmt * stockDz.getPeriod();
+                Date startTime = order.getCreateTime();
+                // 计算美股交易天数
+                int day = UsStockTradingDayCalculator.countUsStockTradingDays(startTime, resultTime) - 1;
+                day = Math.max(1, Math.min(day, stockDz.getPeriod()));
+                // 复利总金额 = 本金 × (1 + 日收益率) ^ 交易日数
+                closeAmt = closeAmt * Math.pow(1 + stockDz.getDayRate(), day);
+                closeAmt = BigDecimal.valueOf(closeAmt).setScale(4, RoundingMode.DOWN).doubleValue();
+
                 closePrice = closeAmt;
                 closeAmt = closeAmt - orderFree.doubleValue();
             } else {
@@ -692,4 +801,28 @@
     }
 
 
+    public static void main(String[] args) {
+        double dayEarnings = 0; //日收益
+        double profitLoss = 0;  //盈利
+        double volume = 6000;  //本金
+        double price = volume;
+        int num = 11;
+        double dayRate = 0.12;
+        for (int i = 0; i < num; i++) {
+            dayEarnings = dayRate * volume;
+            profitLoss += dayEarnings;
+            volume += dayEarnings;
+        }
+        System.out.println("dayEarnings:" + dayEarnings);
+        System.out.println("profitLoss:" + profitLoss);
+        System.out.println("volume:" + volume);
+
+
+        // 复利总金额 = 本金 × (1 + 日收益率) ^ 交易日数
+        double compoundAmount = price * Math.pow(1 + dayRate, num);
+        // 复利总盈亏 = 复利总金额 - 本金
+        double profitLoss2 = compoundAmount - price;
+        System.out.println("compoundAmount:" + compoundAmount);
+        System.out.println("profitLoss2:" + profitLoss2);
+    }
 }

--
Gitblit v1.9.3