|
@@ -1670,6 +1670,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
|
|
|
dayData.setSalesMoney(successVo.getOrderTotalMoney());
|
|
|
dayData.setRefundMoney(successVo.getRefundMoney());
|
|
|
dayData.setSalesCount(successVo.getOrdersSize());
|
|
|
+ dayData.setProfit(successVo.getProfit());
|
|
|
}
|
|
|
|
|
|
|
|
@@ -1690,6 +1691,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
|
|
|
monthData.setRefundMoney(successVoM.getRefundMoney());
|
|
|
monthData.setSalesMoney(successVoM.getOrderTotalMoney());
|
|
|
monthData.setSalesCount(successVoM.getOrdersSize());
|
|
|
+ monthData.setProfit(successVoM.getProfit());
|
|
|
}
|
|
|
vo.setDayBusinessData(copy(DeviceInfoDto.BusinessData.class, dayData));
|
|
|
vo.setMonthBusinessData(copy(DeviceInfoDto.BusinessData.class, monthData));
|
|
@@ -1998,6 +2000,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
|
|
|
MercPlaceDto.Vo placeVo = placeMap.get(placeId);
|
|
|
if (placeVo != null) {
|
|
|
record.setDistrictName(placeVo.getRegionName());
|
|
|
+ record.setPlaceImgs(placeVo.getImgs());
|
|
|
// record.setPlaceName(placeVo.getPlaceName());
|
|
|
}
|
|
|
}
|