update 分润设置

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentPaymentRouteOrderServiceImpl.java

@@ -57,7 +57,6 @@ public class StudentPaymentRouteOrderServiceImpl extends BaseServiceImpl<Long, S
             dataList = studentPaymentRouteOrderDao.queryPageOrder(params);
 
             StudentPaymentRouteOrderDto orderMoneyAmount = studentPaymentRouteOrderDao.getOrderMoneyAmount(params);
-            BigDecimal totalExpectAmount = orderMoneyAmount.getExpectAmount() != null ? orderMoneyAmount.getExpectAmount() : BigDecimal.ZERO;
             BigDecimal totalActualAmount = orderMoneyAmount.getActualAmount() != null ? orderMoneyAmount.getActualAmount() : BigDecimal.ZERO;
             BigDecimal totalBalancePaymentAmount = orderMoneyAmount.getBalancePaymentAmount() != null ? orderMoneyAmount.getBalancePaymentAmount() : BigDecimal.ZERO;
 
@@ -67,7 +66,6 @@ public class StudentPaymentRouteOrderServiceImpl extends BaseServiceImpl<Long, S
             BigDecimal totalAdvanceAmount = totalChargeAmount.subtract(totalBalancePaymentAmount);
 
             pageInfo.setTotalAdvanceAmount(totalAdvanceAmount);
-            pageInfo.setTotalExpectAmount(totalExpectAmount);
             pageInfo.setTotalActualAmount(totalActualAmount);
             pageInfo.setTotalRevenueAmount(totalActualAmount.subtract(totalAdvanceAmount));
         }

mec-biz/src/main/resources/config/mybatis/StudentPaymentRouteOrderMapper.xml

@@ -87,13 +87,15 @@
         <include refid="global.limit"/>
     </select>
     <select id="getOrderMoneyAmount" parameterType="map" resultMap="StudentPaymentRouteOrderDto">
-        SELECT SUM(spo.expect_amount_) expect_amount_,SUM(actual_amount_) actual_amount_,SUM(balance_payment_amount_)
-        balance_payment_amount_ FROM student_payment_order spo
+        SELECT SUM(spro.route_amount_) actual_amount_,SUM(spro.route_balance_amount_)
+        balance_payment_amount_ FROM student_payment_route_order spro
+        LEFT JOIN student_payment_order spo on spo.order_no_ = spro.order_no_
         <include refid="queryPaymentOrder"/>
     </select>
 
     <select id="getChargeAmount" parameterType="map" resultType="java.math.BigDecimal">
-        SELECT SUM(actual_amount_) FROM student_payment_order spo
+        SELECT SUM(spro.route_amount_) FROM student_payment_route_order spro
+        LEFT JOIN student_payment_order spo ON spo.order_no_=spro.order_no_
         LEFT JOIN sporadic_charge_info sci ON spo.music_group_id_ = sci.id_
         <include refid="queryPaymentOrder"/>
     </select>