Browse Source

处理全为空的问题

anderx 11 months ago
parent
commit
9f24534d49

+ 6 - 4
src/main/java/com/goafanti/expenseAccount/service/impl/ExpenseAccountServiceImpl.java

@@ -1436,7 +1436,9 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
         List<String> orderList = new ArrayList<>();
         List<SonExpenseAccount> orderSonList = new ArrayList<>();
         sonList.stream().forEach(e -> {
-            if (!orderList.contains(e.getOrderNo())){
+            if (e.getOrderNo()==null){
+                orderSonList.add(e);
+            }else if (!orderList.contains(e.getOrderNo())){
                 orderList.add(e.getOrderNo());
                 orderSonList.add(e);
             }
@@ -1499,7 +1501,6 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
                     }
 
                 }
-
                 //获取未归集的订单
                 List<BigDecimal> orderNoNotCountAmount = expenseAccountMapper.getOrderNoNotCountAmount(e.getOrderNo());
                 BigDecimal countAmount = orderNoNotCountAmount.stream().reduce(BigDecimal.ZERO, BigDecimal::add);
@@ -1509,8 +1510,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
             }else if (e.getPrid() !=null){
                 //获取未归集的订单
                 List<PublicReleaseDetails> list = publicReleaseMapper.selectDetailsByPrid(e.getPrid());
-
-                StringBuffer sb = new StringBuffer();
+                StringBuilder sb = new StringBuilder();
                 for (PublicReleaseDetails e2 : list) {
                     User user = userMapper.queryById(e2.getUid());
                     List<BigDecimal> orderNoNotCountAmount = expenseAccountMapper.getUidNotCountAmount(e2.getUid());
@@ -2014,4 +2014,6 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
     }
 
 
+
+
 }

+ 2 - 2
src/main/resources/props/config_local.properties

@@ -1,8 +1,8 @@
 dev.name=local
 jdbc.driverClassName=com.mysql.jdbc.Driver
 
-static.host=//static.jishutao.com/1.3.38
-#static.host=//172.16.1.187/1.3.38
+static.host=//static.jishutao.com/1.3.39
+#static.host=//172.16.1.187/1.3.39
 
 #jdbc.url=jdbc\:mysql://localhost:3306/aft20241122?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
 #jdbc.url=jdbc\:mysql://localhost:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false

+ 1 - 1
src/main/resources/props/config_test.properties

@@ -1,5 +1,5 @@
 dev.name=test
-static.host=//static.jishutao.com/1.3.38
+static.host=//static.jishutao.com/1.3.39
 #Driver
 jdbc.driverClassName=com.mysql.jdbc.Driver
 jdbc.url=jdbc:mysql://127.0.0.1:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false