5-17 111

yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/crawlSalesAmount/CrawlSalesAmountService.java

@@ -17,6 +17,8 @@ import com.yxt.supervise.dbcenter.zhj.crawl.spider.RespSalesAmount;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
+import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -98,18 +100,18 @@ public class CrawlSalesAmountService extends ServiceImpl<CrawlSalesAmountMapper,
                 record.setProportion(null);
                 record.setTotalCount(0.0);
             }else {
-                Map<String, Object> map = new HashMap<>();
+                Map<String, Object> map = null;
+                Double i = 0.0;
                 for (ConfBrandProportion proportion : proportions) {
-                    String[] split = proportion.getProportion().split("%");
+                    map = new HashMap<>();
-                    map.put(proportion.getTypeName(),record.getSalesAmount()* Double.parseDouble(split[0]) * 0.01);
+                    Double pro = record.getSalesAmount()* Double.parseDouble(proportion.getProportion()) * 0.01;
+                    DecimalFormat df = new DecimalFormat("#.00");
+                    String format = df.format(pro);
+                    map.put(proportion.getTypeName(),proportion.getTypeName()+ ":" + format);
+                    list.add(map);
+                    i+=Double.parseDouble(format);
                 }
-                list.add(map);
                 record.setProportion(list);
-                Double i = 0.0;
-                for (Object value : map.values()) {
-                    Double a = (Double)value;
-                    i+=a;
-                }
                 record.setTotalCount(i);
             }
         }