helixiao 2 лет назад
Родитель
Сommit
57f6504535

+ 0 - 4
src/main/java/com/ydtech/modules/admin/controller/websocket/WebSocketServer.java

@@ -62,10 +62,6 @@ public class WebSocketServer {
         log.info("用户连接:" + userId + ",当前在线人数为:" + onlineCount);
         log.info("用户连接:" + userId + ",当前在线人数为:" + onlineCount);
         sendMessage("连接成功");
         sendMessage("连接成功");
     }
     }
-//    `prov` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '省会',
-//            `city` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '城市',
-//            `district` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '区县',
-//            `street` varchar(66) DEFAULT NULL COMMENT '街道',
 
 
     @OnMessage
     @OnMessage
     public void onMessage(String message, Session session) {
     public void onMessage(String message, Session session) {

+ 1 - 5
src/main/java/com/ydtech/modules/admin/service/impl/SysAgencyLeaderServiceImpl.java

@@ -427,16 +427,12 @@ public class SysAgencyLeaderServiceImpl extends ServiceImpl<SysAgencyLeaderMappe
                                     .in(InsAreaCompany::getOrderno, collect)
                                     .in(InsAreaCompany::getOrderno, collect)
                                     .eq(InsAreaCompany::getOrderstatus, 3));
                                     .eq(InsAreaCompany::getOrderstatus, 3));
                             if (insAreaCompanies.size() > 0) {
                             if (insAreaCompanies.size() > 0) {
+                                //累加每一个子订单的交强险费用+商业险费用+驾意险费用
                                 BigDecimal jqpremium = insAreaCompanies.stream().map(InsAreaCompany::getJqpremium).reduce(BigDecimal.ZERO, BigDecimal::add);
                                 BigDecimal jqpremium = insAreaCompanies.stream().map(InsAreaCompany::getJqpremium).reduce(BigDecimal.ZERO, BigDecimal::add);
                                 BigDecimal sypremium = insAreaCompanies.stream().map(InsAreaCompany::getSypremium).reduce(BigDecimal.ZERO, BigDecimal::add);
                                 BigDecimal sypremium = insAreaCompanies.stream().map(InsAreaCompany::getSypremium).reduce(BigDecimal.ZERO, BigDecimal::add);
                                 BigDecimal jypremium = insAreaCompanies.stream().map(InsAreaCompany::getJypremium).reduce(BigDecimal.ZERO, BigDecimal::add);
                                 BigDecimal jypremium = insAreaCompanies.stream().map(InsAreaCompany::getJypremium).reduce(BigDecimal.ZERO, BigDecimal::add);
 
 
                                 bigDecimal = jqpremium.add(sypremium).add(jypremium);
                                 bigDecimal = jqpremium.add(sypremium).add(jypremium);
-//                                    for (InsAreaCompany insAreaCompany : insAreaCompanies) {
-//                                        //累加每一个子订单的交强险费用+商业险费用+驾意险费用
-//                                        bigDecimal = bigDecimal.add(insAreaCompany.getJqpremium()).add(insAreaCompany.getSypremium()).add(insAreaCompany.getJypremium());
-//
-//                                    }
                             }
                             }
                         }
                         }
                     }
                     }