订购单统计增加总签约金额

api/src/main/java/com/jiejing/fitness/finance/api/axf/vo/AggStudioAxfOrderVO.java

@@ -29,6 +29,12 @@ public class AggStudioAxfOrderVO {
   @ApiModelProperty(value = "已扣款实收金额")
   @ApiModelProperty(value = "已扣款实收金额")
   private BigDecimal receivedActualAmount;
   private BigDecimal receivedActualAmount;
 
 
+  @ApiModelProperty(value = "签约总金额（原价）")
+  private BigDecimal originalPrice;
+
+  @ApiModelProperty(value = "签约总金额（售价）")
+  private BigDecimal salePrice;
+
   @ApiModelProperty(value = "费率")
   @ApiModelProperty(value = "费率")
   private BigDecimal rate;
   private BigDecimal rate;
 
 

repository/src/main/java/com/jiejing/fitness/finance/repository/mapper/StudioAxfOrderMapper.xml

@@ -20,7 +20,7 @@
     id, studio_id, channel_no, merchant_id, commodity_id, student_id, student_name, sign_state, total_period, original_price, sale_price, received_amount, received_fee, received_actual_amount, received_period, rate, voucher_id, voucher_business_no, third_order_no, cancel_op_id, cancel_op_name, cancel_fail_message, attr, cancel_time, sign_time, create_time, update_time
     id, studio_id, channel_no, merchant_id, commodity_id, student_id, student_name, sign_state, total_period, original_price, sale_price, received_amount, received_fee, received_actual_amount, received_period, rate, voucher_id, voucher_business_no, third_order_no, cancel_op_id, cancel_op_name, cancel_fail_message, attr, cancel_time, sign_time, create_time, update_time
   </sql>
   </sql>
   <select id="agg" resultType="com.jiejing.fitness.finance.api.axf.vo.AggStudioAxfOrderVO">
   <select id="agg" resultType="com.jiejing.fitness.finance.api.axf.vo.AggStudioAxfOrderVO">
-    select sum(received_amount) as receivedAmount, sum(received_actual_amount) as receivedActualAmount
+    select sum(original_price) as originalPrice, sum(sale_price) as salePrice, sum(received_amount) as receivedAmount, sum(received_actual_amount) as receivedActualAmount
     from studio_axf_order
     from studio_axf_order
     <where>
     <where>
       <if test="studioIds != null and studioIds.size > 0">
       <if test="studioIds != null and studioIds.size > 0">