营业额 加上 经营日报
This commit is contained in:
@@ -153,7 +153,7 @@ public class FinanceStsServiceImpl implements FinanceStsService {
|
|||||||
// 2. 填充 营业统计 BusinessSts
|
// 2. 填充 营业统计 BusinessSts
|
||||||
DayReportPrintDTO.BusinessSts businessSts = new DayReportPrintDTO.BusinessSts();
|
DayReportPrintDTO.BusinessSts businessSts = new DayReportPrintDTO.BusinessSts();
|
||||||
businessSts.setOriginAmount(statisticData.getOriginAmount()); // 订单原价总额
|
businessSts.setOriginAmount(statisticData.getOriginAmount()); // 订单原价总额
|
||||||
businessSts.setTurnover(statisticData.getPayAmount()); // 营业额=实付金额
|
businessSts.setTurnover(NumberUtil.add(statisticData.getPayAmount(), statisticData.getRechargeAmount())); // 营业额=实付金额
|
||||||
businessSts.setDiscountAmount(statisticData.getDiscountAmount()); // 优惠总金额
|
businessSts.setDiscountAmount(statisticData.getDiscountAmount()); // 优惠总金额
|
||||||
businessSts.setOrderCount(statisticData.getOrderCount()); // 订单总数
|
businessSts.setOrderCount(statisticData.getOrderCount()); // 订单总数
|
||||||
businessSts.setRefundAmount(statisticData.getRefundAmount()); // 退款金额
|
businessSts.setRefundAmount(statisticData.getRefundAmount()); // 退款金额
|
||||||
@@ -235,7 +235,7 @@ public class FinanceStsServiceImpl implements FinanceStsService {
|
|||||||
// ===================== 2.营业统计 BusinessSts =====================
|
// ===================== 2.营业统计 BusinessSts =====================
|
||||||
DaySettlePrintDTO.BusinessSts business = new DaySettlePrintDTO.BusinessSts();
|
DaySettlePrintDTO.BusinessSts business = new DaySettlePrintDTO.BusinessSts();
|
||||||
business.setOriginAmount(data.getOriginAmount()); // 订单原价总额
|
business.setOriginAmount(data.getOriginAmount()); // 订单原价总额
|
||||||
business.setTurnover(data.getPayAmount()); // 营业额=实付金额
|
business.setTurnover(NumberUtil.add(data.getPayAmount(), data.getRechargeAmount())); // 营业额=实付金额
|
||||||
business.setDiscountAmount(data.getDiscountAmount()); // 优惠总金额
|
business.setDiscountAmount(data.getDiscountAmount()); // 优惠总金额
|
||||||
business.setOrderCount(data.getOrderCount()); // 订单总数
|
business.setOrderCount(data.getOrderCount()); // 订单总数
|
||||||
business.setRefundOrderCount(data.getRefundCount());
|
business.setRefundOrderCount(data.getRefundCount());
|
||||||
|
|||||||
Reference in New Issue
Block a user