|
@@ -2552,8 +2552,8 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
|
|
TopOrderStatisticsBo topOrderStatisticsBo = new TopOrderStatisticsBo();
|
|
TopOrderStatisticsBo topOrderStatisticsBo = new TopOrderStatisticsBo();
|
|
topOrderStatisticsBo.setStartTime(startTime - time);
|
|
topOrderStatisticsBo.setStartTime(startTime - time);
|
|
topOrderStatisticsBo.setEndTime(startTime);
|
|
topOrderStatisticsBo.setEndTime(startTime);
|
|
- topOrderStatisticsBo.setCreateNo(item.getCreateNo());
|
|
|
|
- topOrderStatisticsBo.setTenantId(item.getTenantId());
|
|
|
|
|
|
+ topOrderStatisticsBo.setCreateSysUserId(bo.getCreateSysUserId());
|
|
|
|
+ topOrderStatisticsBo.setTenantId(bo.getTenantId());
|
|
topOrderStatisticsBo.setBusinessName(item.getBusinessName());
|
|
topOrderStatisticsBo.setBusinessName(item.getBusinessName());
|
|
List<TopOrderStatisticsMoneyVo> moneyList1 = baseMapper.getBusinessOrderMoney(topOrderStatisticsBo);
|
|
List<TopOrderStatisticsMoneyVo> moneyList1 = baseMapper.getBusinessOrderMoney(topOrderStatisticsBo);
|
|
if(moneyList1.size()>0){
|
|
if(moneyList1.size()>0){
|
|
@@ -2570,9 +2570,6 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
|
|
Long endBefore = DateUtils.getDayBefore(bo.getEndTime(), 365);
|
|
Long endBefore = DateUtils.getDayBefore(bo.getEndTime(), 365);
|
|
topOrderStatisticsBo.setStartTime(startBefore);
|
|
topOrderStatisticsBo.setStartTime(startBefore);
|
|
topOrderStatisticsBo.setEndTime(endBefore);
|
|
topOrderStatisticsBo.setEndTime(endBefore);
|
|
- topOrderStatisticsBo.setCreateNo(item.getCreateNo());
|
|
|
|
- topOrderStatisticsBo.setTenantId(item.getTenantId());
|
|
|
|
- topOrderStatisticsBo.setBusinessName(item.getBusinessName());
|
|
|
|
List<TopOrderStatisticsMoneyVo> moneyList2 = baseMapper.getBusinessOrderMoney(topOrderStatisticsBo);
|
|
List<TopOrderStatisticsMoneyVo> moneyList2 = baseMapper.getBusinessOrderMoney(topOrderStatisticsBo);
|
|
if(moneyList2.size()>0){
|
|
if(moneyList2.size()>0){
|
|
BigDecimal money2 = moneyList2.get(0).getMoney();
|
|
BigDecimal money2 = moneyList2.get(0).getMoney();
|