修改订单统计

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/AppUserPosition.java

@@ -18,7 +18,7 @@ import lombok.Data;
 @Table(name = "app_user_position")
 public class AppUserPosition implements Serializable {
 	private static final long serialVersionUID = 1L;
-	
+
 	    /**
     *  主键id
    */

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

@@ -13,6 +13,7 @@ import com.xxfc.platform.order.pojo.OrderQuery;
 import com.xxfc.platform.order.pojo.Term;
 import com.xxfc.platform.order.pojo.account.OrderAccountDTO;
 import com.xxfc.platform.order.pojo.account.OrderAccountDetail;
+import javassist.expr.NewArray;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -25,9 +26,7 @@ import tk.mybatis.mapper.entity.Example;
 import tk.mybatis.mapper.weekend.WeekendSqls;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 /**
  * 每日购买会员订单统计
@@ -86,7 +85,7 @@ public class DailyMembersOrderStatisticsBiz extends BaseBiz<DailyMembersOrderSta
         if (CollectionUtils.isNotEmpty(accountList)) {
             DailyMembersOrderStatistics orderStatistics = new DailyMembersOrderStatistics();
             ArrayList<OrderAccountDetail> orderAccountDetails = getOrderAccountDetail(accountList);
-
+            log.error("Members:orderAccountDetails:"+orderAccountDetails);
             if (CollectionUtils.isNotEmpty(orderAccountDetails)) {
                 //获取订单总额
                 BigDecimal gmv = getOrderAmountTotal(orderAccountDetails);
@@ -137,15 +136,15 @@ public class DailyMembersOrderStatisticsBiz extends BaseBiz<DailyMembersOrderSta
      */
     private ArrayList<OrderAccountDetail> getOrderAccountDetail(List<OrderAccountDTO> orderAccountDTOS) {
         ArrayList<OrderAccountDetail> arrayList = Lists.newArrayList();
+        List<OrderAccountDetail> oad = Collections.synchronizedList(arrayList);
         orderAccountDTOS.parallelStream()
                 .map(OrderAccountDTO::getAccountDetail)
                 .forEach(detail -> {
                     if (StringUtils.isNotBlank(detail)) {
-                        arrayList.add(JSONUtil.toBean(detail, OrderAccountDetail.class));
+                        oad.add(JSONUtil.toBean(detail, OrderAccountDetail.class));
                     }
                 });
-
-        return arrayList;
+        return new ArrayList<OrderAccountDetail>(oad);
     }
 
     @Override

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

@@ -245,12 +245,13 @@ public class DailyVehicleOrderStatisticsBiz extends BaseBiz<DailyVehicleOrderSta
 
         //获取明细集合
         ArrayList<OrderAccountDeduction> orderAccountDeductions = Lists.newArrayList();
-                 orderAccountDetail
+        List<OrderAccountDeduction> oad = Collections.synchronizedList(orderAccountDeductions);
+        orderAccountDetail
                 .parallelStream()
                 .map(OrderAccountDetail::getDeductions)
-                .forEach(list->orderAccountDeductions.addAll(list));
+                .forEach(list->oad.addAll(list));
         //获取订单实际款
-        BigDecimal actual = orderAccountDeductions
+        BigDecimal actual = oad
                 .parallelStream()
                 .filter(o -> DeductionTypeEnum.CONSUME.getCode().equals(o.getType()))
                 .map(OrderAccountDeduction::getAmount)