增加分润财务订单

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/StudentPaymentRouteOrderDao.java

@@ -3,6 +3,7 @@ package com.ym.mec.biz.dal.dao;
 
 import com.ym.mec.biz.dal.dto.StudentPaymentRouteOrderDto;
 import com.ym.mec.biz.dal.entity.StudentPaymentRouteOrder;
+import com.ym.mec.biz.dal.enums.PaymentChannelEnum;
 import com.ym.mec.common.dal.BaseDAO;
 import org.apache.ibatis.annotations.Param;
 
@@ -27,4 +28,12 @@ public interface StudentPaymentRouteOrderDao extends BaseDAO<Long, StudentPaymen
     int batchAdd(@Param("routeOrders") List<StudentPaymentRouteOrder> routeOrders);
 
     List<StudentPaymentRouteOrder> getRouteOrders(@Param("orderNo") String orderNo);
+
+    /**
+     * 获取分部分润金额
+     * @param routeOrganId
+     * @param paymentChannelEnumList
+     * @return
+     */
+    BigDecimal getRouteOrderAmount(@Param("routeOrganId") Integer routeOrganId, @Param("paymentChannelEnumList") List<PaymentChannelEnum> paymentChannelEnumList);
 }

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

@@ -422,7 +422,11 @@ public class PayServiceImpl implements PayService {
         BigDecimal maxReceipt = new BigDecimal(channel.get("maxReceipt"));
 
         //已收金额
-        BigDecimal hasReceipt = new BigDecimal("7800");
+        List<PaymentChannelEnum> paymentChannelList = new ArrayList<>();
+        paymentChannelList.add(PaymentChannelEnum.YQPAY);
+        paymentChannelList.add(PaymentChannelEnum.ADAPAY);
+
+        BigDecimal hasReceipt = studentPaymentRouteOrderDao.getRouteOrderAmount(organId, paymentChannelList);
         if (hasReceipt.compareTo(maxReceipt) >= 0) {
             return null;
         }
@@ -473,7 +477,7 @@ public class PayServiceImpl implements PayService {
             studentPaymentRouteOrder.setMerNo(merNo);
             RouteOrders.add(studentPaymentRouteOrder);
         }
-        if(studentPaymentRouteOrderDao.batchAdd(RouteOrders) <=0){
+        if (studentPaymentRouteOrderDao.batchAdd(RouteOrders) <= 0) {
             throw new BizException("调用支付接口失败");
         }
 

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

@@ -173,7 +173,20 @@
         </where>
     </sql>
     <select id="getRouteOrders" resultMap="StudentPaymentRouteOrder">
-        SELECT * FROM student_payment_route_order WHERE order_no_=#{orderNo}
+        SELECT *
+        FROM student_payment_route_order
+        WHERE order_no_ = #{orderNo}
+    </select>
+
+    <!-- 统计已收款项 -->
+    <select id="getRouteOrderAmount" resultType="java.math.BigDecimal">
+        SELECT SUM(route_amount_)
+        FROM student_payment_order spo
+                 LEFT JOIN student_payment_route_order spro ON spo.order_no_ = spro.order_no_
+        WHERE spro.routing_organ_id_ = #{routeOrganId} AND spo.payment_channel_ IN
+        <foreach collection="paymentChannelEnumList" item="paymentChannel" open="(" close=")" separator="," >
+            #{paymentChannel,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+        </foreach>
     </select>
 
 </mapper>