Merge branch 'dev' of http://113.105.137.151:22280/youjj/cloud-platform into dev

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/DailyMembersOrderStatisticsBiz.java

@@ -62,13 +62,16 @@ public class DailyMembersOrderStatisticsBiz extends BaseBiz<DailyMembersOrderSta
                     orderStatistics.setBranchCompanyId(OMPANY_ID);
                     orderStatistics.setOneDay(accountList.get(0).getOneDay());
                 }
+                log.info("Members:统计完成");
                 insertSelectiveRe(orderStatistics);
+                log.info("Members:保存成功");
             }
 
             return true;
         } catch (Exception e) {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-            e.printStackTrace();
+            log.error("Members:"+ e.getMessage());
+
             return false;
         }
     }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/DailyOrderStatisticsBiz.java

@@ -31,10 +31,11 @@ public class DailyOrderStatisticsBiz extends BaseBiz<DailyOrderStatisticsMapper,
         boolean travelFlag = travelStatisticsBiz.saveDailyTravelOrderRecord();
         boolean membersFlag= membersStatisticsBiz.saveDailyMembersOrderRecord();
         if (vehicleFlag&&travelFlag&&membersFlag){
+
             log.info("----statisticalOrder:成功-----");
             return true;
         }
-        log.info("----statisticalOrder:失败-----");
+        log.info("statisticalOrder:失败!(vehicleFlag="+vehicleFlag+"/travelFlag="+travelFlag+"membersFlag="+membersFlag+")");
         return false;
     }
 

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/DailyTravelOrderStatisticsBiz.java

@@ -113,15 +113,18 @@ public class DailyTravelOrderStatisticsBiz extends BaseBiz<DailyTravelOrderStati
         try {
             //获取每日订单统计
             List<DailyTravelOrderStatistics> orderStatistics = getDailyTravelOrderStatistics();
+            log.info("Travel:统计完成");
             if (CollectionUtils.isNotEmpty(orderStatistics)) {
                 for (DailyTravelOrderStatistics orderStatistic : orderStatistics) {
                     //保存统计
                     insertSelectiveRe(orderStatistic);
                 }
             }
+            log.info("Travel:保存成功");
             return true;
         } catch (Exception e) {
-            log.error(e.getMessage());
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            log.error("Travel:"+e.getMessage());
             return false;
         }
     }
@@ -154,7 +157,7 @@ public class DailyTravelOrderStatisticsBiz extends BaseBiz<DailyTravelOrderStati
                     List<OrderAccountDTO> list = typeMap.get(orderAccountDTO.getAccountType());
                     if (list == null) {
                         list = new ArrayList<>();
-                        companyIdmap.put(orderAccountDTO.getAccountType(), list);
+                        typeMap.put(orderAccountDTO.getAccountType(), list);
                     }
                     list.add(orderAccountDTO);
                 }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/DailyVehicleOrderStatisticsBiz.java

@@ -22,6 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 import java.math.BigDecimal;
 import java.util.*;
@@ -245,16 +246,18 @@ public class DailyVehicleOrderStatisticsBiz extends BaseBiz<DailyVehicleOrderSta
         try {
             //获取每日订单统计
             List<DailyVehicleOrderStatistics> orderStatistics = getDailyVehicleOrderRecord();
+            log.info("Vehicle:统计完成");
             if (CollectionUtils.isNotEmpty(orderStatistics)) {
                 for (DailyVehicleOrderStatistics orderStatistic : orderStatistics) {
                     //保存统计
                     insertSelectiveRe(orderStatistic);
                 }
             }
-
+            log.info("Vehicle:保存成功");
             return true;
         } catch (Exception e) {
-            log.error(e.getMessage());
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            log.error("Vehicle:"+e.getMessage());
             return false;
         }
     }
@@ -292,7 +295,7 @@ public class DailyVehicleOrderStatisticsBiz extends BaseBiz<DailyVehicleOrderSta
                     List<OrderAccountDTO> list = typeMap.get(orderAccountDTO.getAccountType());
                     if (list == null) {
                         list = new ArrayList<>();
-                        companyIdmap.put(orderAccountDTO.getAccountType(), list);
+                        typeMap.put(orderAccountDTO.getAccountType(), list);
 
                     }
                     list.add(orderAccountDTO);