修复bug

Author: wangdingfu

src/main/java/cn/fudoc/trade/util/NumberFormatUtil.java

@@ -4,25 +4,30 @@
 import org.apache.commons.lang3.StringUtils;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.text.DecimalFormat;
 import java.util.Objects;
 
 public class NumberFormatUtil {
 
+    private static final BigDecimal ONE_HUNDRED = new BigDecimal(100);
 
     public static String format(BigDecimal value) {
         DecimalFormat decimalFormat = new DecimalFormat(",###.##");
         return decimalFormat.format(value);
     }
 
-    public static String formatRate(BigDecimal value) {
+    public static String formatRate(BigDecimal value, boolean flag) {
         DecimalFormat decimalFormat = new DecimalFormat("#.##%");
+        if (flag) {
+            value = value.divide(ONE_HUNDRED, 5, RoundingMode.CEILING);
+        }
         return decimalFormat.format(value);
     }
 
 
     public static BigDecimal convertBigDecimal(Object value) {
-        if(Objects.isNull(value)){
+        if (Objects.isNull(value)) {
             return BigDecimal.ZERO;
         }
         String strValue = value.toString().trim();

src/main/java/cn/fudoc/trade/view/render/StockColorTableCellRenderer.java

@@ -22,7 +22,7 @@ public StockColorTableCellRenderer(Integer left) {
     public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
         if (Objects.nonNull(value)) {
             BigDecimal bigDecimal = NumberFormatUtil.convertBigDecimal(value);
-            value = NumberFormatUtil.formatRate(bigDecimal);
+            value = NumberFormatUtil.formatRate(bigDecimal,true);
             JBColor textColor = getTextColor(bigDecimal);
             if (Objects.nonNull(textColor)) {
                 setForeground(textColor);

src/main/java/cn/fudoc/trade/view/table/HoldStockGroupTableView.java

@@ -45,7 +45,7 @@ public HoldStockGroupTableView(String tabName) {
         int rowHeight = stockTable.getRowHeight();
         stockTable.setRowHeight(rowHeight * 2);
         for (String columnName : getColumnNames()) {
-            stockTable.getColumn(columnName).setCellRenderer(new MultiLineTableCellRenderer(Lists.newArrayList(1, 4), Lists.newArrayList( 1, 3, 4)));
+            stockTable.getColumn(columnName).setCellRenderer(new MultiLineTableCellRenderer(Lists.newArrayList(1, 4), Lists.newArrayList(1, 3, 4)));
         }
         TableColumn idColumn = stockTable.getColumnModel().getColumn(0);
         // 从视图中移除，模型仍保留
@@ -149,7 +149,7 @@ protected Vector<Object> toTableData(RealStockInfo realStockInfo) {
 
         //今日收益计算 （当前价-上一日收盘价）*持仓数量
         BigDecimal yesterdayPrice = new BigDecimal(realStockInfo.getYesterdayPrice());
-        BigDecimal increaseRate = new BigDecimal(realStockInfo.getIncreaseRate()).divide(new BigDecimal("100"), 5, RoundingMode.CEILING);
+        BigDecimal increaseRate = new BigDecimal(realStockInfo.getIncreaseRate());
         BigDecimal todayProfit = currentPrice.subtract(yesterdayPrice).multiply(countDecimal).setScale(4, RoundingMode.CEILING);
 
         //表格数据
@@ -161,15 +161,15 @@ protected Vector<Object> toTableData(RealStockInfo realStockInfo) {
         //持仓盈亏
         String PLRatePrefix = PLRate.compareTo(BigDecimal.ZERO) > 0 ? "+" : "";
         String PLPrefix = PL.compareTo(BigDecimal.ZERO) > 0 ? "+" : "";
-        vector.add(new String[]{PLPrefix + NumberFormatUtil.format(PL), PLRatePrefix + NumberFormatUtil.formatRate(PLRate)});
+        vector.add(new String[]{PLPrefix + NumberFormatUtil.format(PL), PLRatePrefix + NumberFormatUtil.formatRate(PLRate, false)});
         //持仓数量
         vector.add(count);
         //现价/成本
         vector.add(new String[]{realStockInfo.getCurrentPrice(), cost.setScale(3, RoundingMode.CEILING).toString()});
         //今日收益
         String todayProfitPrefix = todayProfit.compareTo(BigDecimal.ZERO) > 0 ? "+" : "";
         String profitRatePrefix = increaseRate.compareTo(BigDecimal.ZERO) > 0 ? "+" : "";
-        vector.add(new String[]{todayProfitPrefix + NumberFormatUtil.format(todayProfit), profitRatePrefix + NumberFormatUtil.formatRate(increaseRate)});
+        vector.add(new String[]{todayProfitPrefix + NumberFormatUtil.format(todayProfit), profitRatePrefix + NumberFormatUtil.formatRate(increaseRate, true)});
         return vector;
     }