Merge remote-tracking branch 'origin/order_received_statistics' into order_received_statistics

ace-common/src/main/java/com/github/wxiaoqi/security/common/util/ToBigDecimalFunction.java

 package com.github.wxiaoqi.security.common.util;
 
 import java.math.BigDecimal;
-
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/11/20 20:25
+ */
 @FunctionalInterface
 public interface ToBigDecimalFunction<T> {
     BigDecimal applyAsBigDecimal(T value);

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/contant/enumerate/StatisticsStatusEnum.java

@@ -6,9 +6,13 @@ import com.xxfc.platform.order.entity.OrderReceivedStatisticsBase;
 import org.apache.commons.collections4.CollectionUtils;
 import org.assertj.core.util.Lists;
 
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.time.temporal.WeekFields;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Locale;
 
 /**
  * @author libin
@@ -76,10 +80,10 @@ public enum  StatisticsStatusEnum {
     }
 
     public static<T extends OrderReceivedStatisticsBase> T wrapStatisticsObject(Date date,String stateGroup,T targetObj){
-        DateTime yesterday = DateTime.of(date);
-        String year = String.valueOf(yesterday.getField(DateField.YEAR));
-        String month = String.format("%s%d", year, yesterday.getField(DateField.MONTH));
-        String weekOfYear = String.format("%s%d", year, yesterday.getField(DateField.WEEK_OF_YEAR));
+        LocalDate localDate =  LocalDate.from(new Date().toInstant().atZone(ZoneId.systemDefault()));
+        String year = String.valueOf(localDate.getYear());
+        String month = String.format("%s%d", year, localDate.getMonthValue());
+        String weekOfYear = String.format("%s%d", year,localDate.get(WeekFields.of(Locale.CHINESE).weekOfYear()));
         String[] status = stateGroup.split("-");
         targetObj.setCrtTime(new Date());
         targetObj.setCompanyId(Integer.valueOf(status[0]));

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

@@ -243,7 +243,7 @@ public class OrderMemberReceivedStatisticsBiz extends BaseBiz<OrderMemberReceive
         //创建会员克隆统计对象
         OrderMemberReceivedStatistics orderMemberReceivedStatistics = createDefaultOrderMemberReceivedStatistics();
         //统计对象的生成
-        otherStatisticsStateGroup.parallelStream().peek(stateGroup -> {
+        otherStatisticsStateGroup.stream().peek(stateGroup -> {
             OrderMemberReceivedStatistics orderMemberReceivedStatisticsClone = StatisticsStatusEnum.wrapStatisticsObject(startDate, stateGroup,
                     ObjectUtil.cloneByStream(orderMemberReceivedStatistics));
             orderMemberReceivedStatisticsList.add(orderMemberReceivedStatisticsClone);