|
@@ -3397,7 +3397,12 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
|
|
|
topOrderStatisticsBo.setEndTime(startTime);
|
|
|
topOrderStatisticsBo.setTenantId(item.getTenantId().toString());
|
|
|
topOrderStatisticsBo.setBusinessName(bo.getBusinessName());
|
|
|
- topOrderStatisticsBo.setCreateSysUserId(bo.getCreateSysUserId());
|
|
|
+ if(Validator.isNotEmpty(item.getCreateSysUserId())){
|
|
|
+ topOrderStatisticsBo.setCreateSysUserId(item.getCreateSysUserId());
|
|
|
+ }
|
|
|
+ if(Validator.isNotEmpty(bo.getCreateSysUserId())){
|
|
|
+ topOrderStatisticsBo.setCreateSysUserId(bo.getCreateSysUserId());
|
|
|
+ }
|
|
|
BigDecimal money = baseMapper.getSingleTenantStatistics(topOrderStatisticsBo);
|
|
|
if (money.compareTo(BigDecimal.ZERO) > 0){
|
|
|
BigDecimal subtract = item.getMoney().subtract(money);
|