fix

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/impl/TopOldOrderServiceImpl.java

@@ -3607,11 +3607,15 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                 TopOrderStatisticsTwoVo twoVo = new TopOrderStatisticsTwoVo();
                 twoVo.setTime(day);
                 twoVo.setTimeStr(DateUtils.timestampToDateFormat(day,"yyyy-MM-dd"));
+                if(voList.size()>0){
+                    twoVo.setCreateUsername(voList.get(0).getCreateUsername());
+                }
                 if (voList.stream().anyMatch(x -> DateUtils.getScheduleTimeStrZeroTime(x.getTimeStr(), "yyyy-MM-dd").equals(day))){
                     TopOrderStatisticsTwoVo statisticsTwoVo = voList.stream()
                             .filter(x -> DateUtils.getScheduleTimeStrZeroTime(x.getTimeStr(), "yyyy-MM-dd").equals(day)).findFirst().get();
                     twoVo.setMoney(statisticsTwoVo.getMoney());
                     twoVo.setOrderNum(statisticsTwoVo.getOrderNum());
+                    twoVo.setCreateUsername(statisticsTwoVo.getCreateUsername());
                 }
                 vos.add(twoVo);
             }
@@ -3628,6 +3632,9 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                 TopOrderStatisticsTwoVo twoVo = new TopOrderStatisticsTwoVo();
                 twoVo.setTime(time);
                 twoVo.setTimeStr(DateUtils.timestampToDateFormat(time,"yyyy-MM-dd"));
+                if(voList2.size()>0){
+                    twoVo.setCreateUsername(voList2.get(0).getCreateUsername());
+                }
                 if (voList2.stream().anyMatch(x ->
                         DateUtils.getScheduleTimeZeroTime(x.getOrderTime()) >= time
                                 && DateUtils.getScheduleTimeZeroTime(x.getOrderTime()) <= weekTime.get(time))){
@@ -3637,6 +3644,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                                             && DateUtils.getScheduleTimeZeroTime(x.getOrderTime()) <= weekTime.get(time)).findFirst().get();
                     twoVo.setMoney(statisticsTwoVo.getMoney());
                     twoVo.setOrderNum(statisticsTwoVo.getOrderNum());
+                    twoVo.setCreateUsername(statisticsTwoVo.getCreateUsername());
                 }
                 vos.add(twoVo);
             }
@@ -3653,6 +3661,9 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                 TopOrderStatisticsTwoVo twoVo = new TopOrderStatisticsTwoVo();
                 twoVo.setTime(time);
                 twoVo.setTimeStr(DateUtils.timestampToDateFormat(time,"yyyy-MM"));
+                if(voList3.size()>0){
+                    twoVo.setCreateUsername(voList3.get(0).getCreateUsername());
+                }
                 if (voList3.stream().anyMatch(x ->
                         DateUtils.getScheduleTimeZeroTime(x.getOrderTime()) >= time
                                 && DateUtils.getScheduleTimeZeroTime(x.getOrderTime()) <= monthTime.get(time))){
@@ -3662,6 +3673,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                                             && DateUtils.getScheduleTimeZeroTime(x.getOrderTime()) <= monthTime.get(time)).findFirst().get();
                     twoVo.setMoney(statisticsTwoVo.getMoney());
                     twoVo.setOrderNum(statisticsTwoVo.getOrderNum());
+                    twoVo.setCreateUsername(statisticsTwoVo.getCreateUsername());
                 }
                 vos.add(twoVo);
             }
@@ -3712,6 +3724,9 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                 TopOrderStatisticsTwoVo twoVo = new TopOrderStatisticsTwoVo();
                 twoVo.setTime(day);
                 twoVo.setTimeStr(DateUtils.timestampToDateFormat(day,"yyyy-MM-dd"));
+                if(voList.size()>0){
+                    twoVo.setCreateUsername(voList.get(0).getCreateUsername());
+                }
                 if (voList.stream().anyMatch(x -> DateUtils.getScheduleTimeStrZeroTime(x.getTimeStr(), "yyyy-MM-dd").equals(day))){
                     TopOrderStatisticsTwoVo statisticsTwoVo = voList.stream()
                             .filter(x -> DateUtils.getScheduleTimeStrZeroTime(x.getTimeStr(), "yyyy-MM-dd").equals(day)).findFirst().get();
@@ -3733,6 +3748,9 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                 TopOrderStatisticsTwoVo twoVo = new TopOrderStatisticsTwoVo();
                 twoVo.setTime(time);
                 twoVo.setTimeStr(DateUtils.timestampToDateFormat(time,"yyyy-MM-dd"));
+                if(voList2.size()>0){
+                    twoVo.setCreateUsername(voList2.get(0).getCreateUsername());
+                }
                 if (voList2.stream().anyMatch(x ->
                         DateUtils.getScheduleTimeZeroTime(x.getOrderTime()) >= time
                                 && DateUtils.getScheduleTimeZeroTime(x.getOrderTime()) <= weekTime.get(time))){
@@ -3742,7 +3760,9 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                                             && DateUtils.getScheduleTimeZeroTime(x.getOrderTime()) <= weekTime.get(time)).findFirst().get();
                     twoVo.setMoney(statisticsTwoVo.getMoney());
                     twoVo.setOrderNum(statisticsTwoVo.getOrderNum());
+
                 }
+
                 vos.add(twoVo);
             }
             viewVo.setWeekView(vos);
@@ -3758,6 +3778,9 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                 TopOrderStatisticsTwoVo twoVo = new TopOrderStatisticsTwoVo();
                 twoVo.setTime(time);
                 twoVo.setTimeStr(DateUtils.timestampToDateFormat(time,"yyyy-MM"));
+                if(voList3.size()>0){
+                    twoVo.setCreateUsername(voList3.get(0).getCreateUsername());
+                }
                 if (voList3.stream().anyMatch(x ->
                         DateUtils.getScheduleTimeZeroTime(x.getOrderTime()) >= time
                                 && DateUtils.getScheduleTimeZeroTime(x.getOrderTime()) <= monthTime.get(time))){
@@ -3767,6 +3790,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                                             && DateUtils.getScheduleTimeZeroTime(x.getOrderTime()) <= monthTime.get(time)).findFirst().get();
                     twoVo.setMoney(statisticsTwoVo.getMoney());
                     twoVo.setOrderNum(statisticsTwoVo.getOrderNum());
+                    twoVo.setCreateUsername(statisticsTwoVo.getCreateUsername());
                 }
                 vos.add(twoVo);
             }