|
@@ -2629,7 +2629,8 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
|
|
|
topOrderStatisticsBo.setStartTime(startTime - time);
|
|
|
topOrderStatisticsBo.setEndTime(startTime);
|
|
|
topOrderStatisticsBo.setTenantId(bo.getTenantId());
|
|
|
- topOrderStatisticsBo.setCreateNo(bo.getCreateNo());
|
|
|
+ topOrderStatisticsBo.setCreateSysUserId(bo.getCreateSysUserId());
|
|
|
+ topOrderStatisticsBo.setBusinessName(item.getBusinessName());
|
|
|
List<TopOrderStatisticsNumVo> numStatistics = baseMapper.getBusinessOrderNum(topOrderStatisticsBo);
|
|
|
if (CollectionUtils.isNotEmpty(numStatistics)&&numStatistics.size()>0){
|
|
|
Long num = numStatistics.stream().findFirst().get().getOrderNum();
|
|
@@ -3440,9 +3441,9 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
|
|
|
detailVos.forEach(item -> {
|
|
|
//订单客户机构ID
|
|
|
|
|
|
- if (item.getMoney().compareTo(BigDecimal.ZERO) == 0){
|
|
|
+ /* if (item.getMoney().compareTo(BigDecimal.ZERO) == 0){
|
|
|
return;
|
|
|
- }
|
|
|
+ }*/
|
|
|
//订单金额
|
|
|
//环比
|
|
|
Long startTime = bo.getStartTime();
|