|
@@ -2536,7 +2536,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
|
|
|
//订单总额
|
|
|
BigDecimal moneyTotal = baseMapper.getMoneyStatisticsWithBo(bo);
|
|
|
moneyVos.forEach(item -> {
|
|
|
-
|
|
|
+
|
|
|
//环比
|
|
|
Long startTime = bo.getStartTime();
|
|
|
Long endTime = bo.getEndTime();
|
|
@@ -2628,6 +2628,9 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
|
|
|
topOrderStatisticsBo.setStartTime(startTime - time);
|
|
|
topOrderStatisticsBo.setEndTime(startTime);
|
|
|
topOrderStatisticsBo.setTenantId(item.getTenantId());
|
|
|
+ if(Validator.isNotEmpty(item.getCreateSysUserId())){
|
|
|
+ topOrderStatisticsBo.setCreateSysUserId(item.getCreateSysUserId());
|
|
|
+ }
|
|
|
Long num = baseMapper.getSingleTenantStatisticsOrderNum(topOrderStatisticsBo);
|
|
|
if (num > 0){
|
|
|
Long subtract = item.getOrderNum() - num;
|