|
@@ -2554,6 +2554,9 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
|
|
|
topOrderStatisticsBo.setEndTime(startTime);
|
|
|
topOrderStatisticsBo.setCreateNo(item.getCreateNo());
|
|
|
topOrderStatisticsBo.setTenantId(item.getTenantId());
|
|
|
+ if(Validator.isNotEmpty(item.getCreateSysUserId())){
|
|
|
+ topOrderStatisticsBo.setCreateSysUserId(item.getCreateSysUserId());
|
|
|
+ }
|
|
|
BigDecimal money = baseMapper.getSingleTenantStatistics(topOrderStatisticsBo);
|
|
|
if (money.compareTo(BigDecimal.ZERO) > 0){
|
|
|
BigDecimal subtract = item.getMoney().subtract(money);
|
|
@@ -2636,6 +2639,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;
|