|
@@ -19,116 +19,120 @@ public class OperatingReportNew {
|
|
|
|
|
|
@ApiModelProperty(value="销售收入(当月实收)")
|
|
|
//实物销售收入(已收货商品)
|
|
|
- private BigDecimal saleAmount;
|
|
|
+ private BigDecimal saleAmount = BigDecimal.ZERO;
|
|
|
|
|
|
//当月课费(每个学员当月已消耗课程费用总和) + 个体云教练当月费用(总金额/月数) + 当月云教练课程消耗费用(课次*每节课单价)
|
|
|
@ApiModelProperty(value="服务收入(当月实收)")
|
|
|
- private BigDecimal serviceAmount;
|
|
|
+ private BigDecimal serviceAmount = BigDecimal.ZERO;
|
|
|
|
|
|
@ApiModelProperty(value="课程收入")
|
|
|
- private BigDecimal courseAmount;
|
|
|
+ private BigDecimal courseAmount = BigDecimal.ZERO;
|
|
|
|
|
|
@ApiModelProperty(value="云教练收入")
|
|
|
- private BigDecimal cloudAmount;
|
|
|
+ private BigDecimal cloudAmount = BigDecimal.ZERO;
|
|
|
|
|
|
@ApiModelProperty(value="其他收入")
|
|
|
- private BigDecimal otherAmount;
|
|
|
+ private BigDecimal otherAmount = BigDecimal.ZERO;
|
|
|
|
|
|
//当月退费列表总金额(当月退费列表已退费总金额)
|
|
|
@ApiModelProperty(value="业务退费")
|
|
|
- private BigDecimal businessRefund;
|
|
|
+ private BigDecimal businessRefund = BigDecimal.ZERO;
|
|
|
|
|
|
//销售收入 + 服务收入 - 业务退费
|
|
|
@ApiModelProperty(value="收入合计")
|
|
|
- private BigDecimal totalIncome;
|
|
|
+ private BigDecimal totalIncome = BigDecimal.ZERO;
|
|
|
|
|
|
//当月已发货商品销售成本价
|
|
|
@ApiModelProperty(value="销售成本")
|
|
|
- private BigDecimal saleCost;
|
|
|
+ private BigDecimal saleCost = BigDecimal.ZERO;
|
|
|
|
|
|
//OA审批固定费用总和
|
|
|
@ApiModelProperty(value="固定费用")
|
|
|
- private BigDecimal fixedCosts;
|
|
|
+ private BigDecimal fixedCosts = BigDecimal.ZERO;
|
|
|
|
|
|
//OA审批变动费用总和
|
|
|
@ApiModelProperty(value="变动费用")
|
|
|
- private BigDecimal variableCosts;
|
|
|
+ private BigDecimal variableCosts = BigDecimal.ZERO;
|
|
|
|
|
|
//OA审批内部结算费用总和
|
|
|
@ApiModelProperty(value="内部结算")
|
|
|
- private BigDecimal internalSettlement;
|
|
|
+ private BigDecimal internalSettlement = BigDecimal.ZERO;
|
|
|
|
|
|
//固定 + 变动 + 内部结算
|
|
|
@ApiModelProperty(value="成本费用合计")
|
|
|
- private BigDecimal totalCost;
|
|
|
+ private BigDecimal totalCost = BigDecimal.ZERO;
|
|
|
|
|
|
//收入合计 - 成本合计
|
|
|
@ApiModelProperty(value="准可自由支配利润")
|
|
|
- private BigDecimal quasiDiscretionaryProfit;
|
|
|
+ private BigDecimal quasiDiscretionaryProfit = BigDecimal.ZERO;
|
|
|
|
|
|
//个体云教练(订单总额 / 购买天数 * 剩余生效天数) + 已排课云教练课程预收款(乐团在读人数 * 2980 - 课程单价 * 未开始课程数) + 未排课云教练预收款(订单总额 / 购买天数 * 剩余生效天数)+
|
|
|
//未发货商品
|
|
|
@ApiModelProperty(value="预收账款")
|
|
|
- private BigDecimal prepaidFee;
|
|
|
+ private BigDecimal prepaidFee = BigDecimal.ZERO;
|
|
|
+
|
|
|
+ @ApiModelProperty(value="云教练预收")
|
|
|
+ private BigDecimal cloudPrepaidFee = BigDecimal.ZERO;
|
|
|
+
|
|
|
+ @ApiModelProperty(value="课程预收")
|
|
|
+ private BigDecimal coursePrepaidFee = BigDecimal.ZERO;
|
|
|
+
|
|
|
+ @ApiModelProperty(value="商品预收")
|
|
|
+ private BigDecimal salePrepaidFee = BigDecimal.ZERO;
|
|
|
+
|
|
|
+ @ApiModelProperty(value="其他预收")
|
|
|
+ private BigDecimal otherPrepaidFee = BigDecimal.ZERO;
|
|
|
|
|
|
@ApiModelProperty(value="预付账款")
|
|
|
- private BigDecimal prepayments;
|
|
|
+ private BigDecimal prepayments = BigDecimal.ZERO;
|
|
|
|
|
|
@ApiModelProperty(value="应收账款")
|
|
|
- private BigDecimal receivables;
|
|
|
+ private BigDecimal receivables = BigDecimal.ZERO;
|
|
|
|
|
|
@ApiModelProperty(value="应付账款")
|
|
|
- private BigDecimal payable;
|
|
|
+ private BigDecimal payable = BigDecimal.ZERO;
|
|
|
|
|
|
@ApiModelProperty(value="月份")
|
|
|
private String month;
|
|
|
|
|
|
- public Integer getOrganId() {
|
|
|
- return organId;
|
|
|
+ public BigDecimal getCloudPrepaidFee() {
|
|
|
+ return cloudPrepaidFee;
|
|
|
}
|
|
|
|
|
|
- public void setOrganId(Integer organId) {
|
|
|
- this.organId = organId;
|
|
|
+ public void setCloudPrepaidFee(BigDecimal cloudPrepaidFee) {
|
|
|
+ this.cloudPrepaidFee = cloudPrepaidFee;
|
|
|
}
|
|
|
|
|
|
- public Integer getId() {
|
|
|
- return id;
|
|
|
+ public BigDecimal getCoursePrepaidFee() {
|
|
|
+ return coursePrepaidFee;
|
|
|
}
|
|
|
|
|
|
- public void setId(Integer id) {
|
|
|
- this.id = id;
|
|
|
- }
|
|
|
-
|
|
|
- public BigDecimal getCourseAmount() {
|
|
|
- return courseAmount;
|
|
|
- }
|
|
|
-
|
|
|
- public void setCourseAmount(BigDecimal courseAmount) {
|
|
|
- this.courseAmount = courseAmount;
|
|
|
+ public void setCoursePrepaidFee(BigDecimal coursePrepaidFee) {
|
|
|
+ this.coursePrepaidFee = coursePrepaidFee;
|
|
|
}
|
|
|
|
|
|
- public BigDecimal getCloudAmount() {
|
|
|
- return cloudAmount;
|
|
|
+ public BigDecimal getSalePrepaidFee() {
|
|
|
+ return salePrepaidFee;
|
|
|
}
|
|
|
|
|
|
- public void setCloudAmount(BigDecimal cloudAmount) {
|
|
|
- this.cloudAmount = cloudAmount;
|
|
|
+ public void setSalePrepaidFee(BigDecimal salePrepaidFee) {
|
|
|
+ this.salePrepaidFee = salePrepaidFee;
|
|
|
}
|
|
|
|
|
|
- public BigDecimal getOtherAmount() {
|
|
|
- return otherAmount;
|
|
|
+ public BigDecimal getOtherPrepaidFee() {
|
|
|
+ return otherPrepaidFee;
|
|
|
}
|
|
|
|
|
|
- public void setOtherAmount(BigDecimal otherAmount) {
|
|
|
- this.otherAmount = otherAmount;
|
|
|
+ public void setOtherPrepaidFee(BigDecimal otherPrepaidFee) {
|
|
|
+ this.otherPrepaidFee = otherPrepaidFee;
|
|
|
}
|
|
|
|
|
|
- public String getMonth() {
|
|
|
- return month;
|
|
|
+ public Integer getId() {
|
|
|
+ return id;
|
|
|
}
|
|
|
|
|
|
- public void setMonth(String month) {
|
|
|
- this.month = month;
|
|
|
+ public void setId(Integer id) {
|
|
|
+ this.id = id;
|
|
|
}
|
|
|
|
|
|
public String getPrincipal() {
|
|
@@ -147,6 +151,14 @@ public class OperatingReportNew {
|
|
|
this.organName = organName;
|
|
|
}
|
|
|
|
|
|
+ public Integer getOrganId() {
|
|
|
+ return organId;
|
|
|
+ }
|
|
|
+
|
|
|
+ public void setOrganId(Integer organId) {
|
|
|
+ this.organId = organId;
|
|
|
+ }
|
|
|
+
|
|
|
public BigDecimal getSaleAmount() {
|
|
|
return saleAmount;
|
|
|
}
|
|
@@ -163,6 +175,30 @@ public class OperatingReportNew {
|
|
|
this.serviceAmount = serviceAmount;
|
|
|
}
|
|
|
|
|
|
+ public BigDecimal getCourseAmount() {
|
|
|
+ return courseAmount;
|
|
|
+ }
|
|
|
+
|
|
|
+ public void setCourseAmount(BigDecimal courseAmount) {
|
|
|
+ this.courseAmount = courseAmount;
|
|
|
+ }
|
|
|
+
|
|
|
+ public BigDecimal getCloudAmount() {
|
|
|
+ return cloudAmount;
|
|
|
+ }
|
|
|
+
|
|
|
+ public void setCloudAmount(BigDecimal cloudAmount) {
|
|
|
+ this.cloudAmount = cloudAmount;
|
|
|
+ }
|
|
|
+
|
|
|
+ public BigDecimal getOtherAmount() {
|
|
|
+ return otherAmount;
|
|
|
+ }
|
|
|
+
|
|
|
+ public void setOtherAmount(BigDecimal otherAmount) {
|
|
|
+ this.otherAmount = otherAmount;
|
|
|
+ }
|
|
|
+
|
|
|
public BigDecimal getBusinessRefund() {
|
|
|
return businessRefund;
|
|
|
}
|
|
@@ -258,4 +294,12 @@ public class OperatingReportNew {
|
|
|
public void setPayable(BigDecimal payable) {
|
|
|
this.payable = payable;
|
|
|
}
|
|
|
+
|
|
|
+ public String getMonth() {
|
|
|
+ return month;
|
|
|
+ }
|
|
|
+
|
|
|
+ public void setMonth(String month) {
|
|
|
+ this.month = month;
|
|
|
+ }
|
|
|
}
|