update:修改确认分账接口

mec-application/src/main/java/com/ym/mec/student/controller/StudentOrderController.java

@@ -916,11 +916,11 @@ public class StudentOrderController extends BaseController {
     }
 
     @GetMapping("/reConfirmOrder")
-    public HttpResponseResult<List<StudentPaymentOrder>> reConfirmOrder(Date startTime, Date endTime) {
+    public HttpResponseResult<List<StudentPaymentOrder>> reConfirmOrder(Date startTime, Date endTime, Integer tenantId) {
         if (!profiles.equals("prod") && !profiles.equals("pre")) {
             return failed("测试环境不支持");
         }
-        return succeed(studentPaymentOrderService.reConfirmOrder(startTime, endTime));
+        return succeed(studentPaymentOrderService.reConfirmOrder(startTime, endTime, tenantId));
     }
 
     @GetMapping("/getMusicGroupApplyCalender")

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

@@ -392,7 +392,7 @@ public interface StudentPaymentOrderDao extends BaseDAO<Long, StudentPaymentOrde
      * @param endTime
      * @return
      */
-    List<StudentPaymentOrder> getAdaPayOrdersByTime(@Param("startTime") Date startTime, @Param("endTime") Date endTime);
+    List<StudentPaymentOrder> getAdaPayOrdersByTime(@Param("startTime") Date startTime, @Param("endTime") Date endTime, @Param("tenantId") Integer tenantId);
 
     /**
      * 获取用户乐器置换的订单

mec-biz/src/main/java/com/ym/mec/biz/service/StudentPaymentOrderService.java

@@ -156,9 +156,10 @@ public interface StudentPaymentOrderService extends BaseService<Long, StudentPay
      *
      * @param startTime
      * @param endTime
+     * @param tenantId
      * @return
      */
-    List<StudentPaymentOrder> reConfirmOrder(Date startTime, Date endTime);
+    List<StudentPaymentOrder> reConfirmOrder(Date startTime, Date endTime, Integer tenantId);
     
     /**
      * 分账

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

@@ -962,13 +962,13 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
     }
 
     @Override
-    public List<StudentPaymentOrder> reConfirmOrder(Date startTime, Date endTime) {
+    public List<StudentPaymentOrder> reConfirmOrder(Date startTime, Date endTime, Integer tenantId) {
         if (startTime == null) {
             endTime = new Date();
             startTime = DateUtil.addMinutes(endTime, -20);
         }
 
-        List<StudentPaymentOrder> orders = studentPaymentOrderDao.getAdaPayOrdersByTime(startTime, endTime);
+        List<StudentPaymentOrder> orders = studentPaymentOrderDao.getAdaPayOrdersByTime(startTime, endTime, tenantId);
         String tips = "";
         for (StudentPaymentOrder order : orders) {
             try {

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

@@ -1119,7 +1119,7 @@
     </select>
 
     <select id="getAdaPayOrdersByTime" resultMap="StudentPaymentOrder"><![CDATA[
-        SELECT * FROM student_payment_order WHERE pay_time_ >= #{startTime} AND pay_time_ <= #{endTime} AND payment_channel_='ADAPAY' AND status_ ='SUCCESS']]>
+        SELECT * FROM student_payment_order WHERE tenant_id_ = #{tenantId} and pay_time_ >= #{startTime} AND pay_time_ <= #{endTime} AND payment_channel_='ADAPAY' AND status_ ='SUCCESS']]>
     </select>
 
     <select id="getUserReplacementIngOrder" resultMap="StudentPaymentOrder">