yonge 4 år sedan
förälder
incheckning
a38c22c9cf

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

@@ -99,11 +99,12 @@ public interface StudentPaymentOrderDao extends BaseDAO<Long, StudentPaymentOrde
     
     /**
      * 根据批次号查询
+     * @param userId 用户编号
      * @param batchNo 批次号
      * @param status 状态
      * @return
      */
-    List<StudentPaymentOrder> queryByBatchNo(@Param("batchNo") String batchNo, @Param("status") DealStatusEnum status);
+    List<StudentPaymentOrder> queryByBatchNo(@Param("userId")Integer userId, @Param("batchNo") String batchNo, @Param("status") DealStatusEnum status);
 
     /**
      * 查询指定交易状态的乐团报名的订单信息

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

@@ -64,11 +64,12 @@ public interface StudentPaymentOrderService extends BaseService<Long, StudentPay
     
     /**
      * 根据批次号查询
+     * @param userId 用户编号
      * @param batchNo 批次号
      * @param status 状态
      * @return
      */
-    List<StudentPaymentOrder> queryByBatchNo(String batchNo, DealStatusEnum status);
+    List<StudentPaymentOrder> queryByBatchNo(Integer userId, String batchNo, DealStatusEnum status);
 
     /**
      * 查找支付成功和支付中订单

+ 2 - 2
mec-biz/src/main/java/com/ym/mec/biz/service/impl/MusicGroupServiceImpl.java

@@ -1958,7 +1958,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 					studentPaymentOrderList.add(studentPaymentOrder);
 				}
 			} else {
-				studentPaymentOrderList = studentPaymentOrderService.queryByBatchNo(studentRegistration.getMusicGroupPaymentCalenderId() + "",
+				studentPaymentOrderList = studentPaymentOrderService.queryByBatchNo(userId, studentRegistration.getMusicGroupPaymentCalenderId() + "",
 						DealStatusEnum.SUCCESS);
 			}
 
@@ -2226,7 +2226,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 				studentPaymentOrderList.add(studentPaymentOrder);
 			}
 		} else {
-			studentPaymentOrderList = studentPaymentOrderService.queryByBatchNo(studentRegistration.getMusicGroupPaymentCalenderId() + "",
+			studentPaymentOrderList = studentPaymentOrderService.queryByBatchNo(sysUser.getId(), studentRegistration.getMusicGroupPaymentCalenderId() + "",
 					DealStatusEnum.SUCCESS);
 		}
 		

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

@@ -194,8 +194,8 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
     }
 
     @Override
-	public List<StudentPaymentOrder> queryByBatchNo(String batchNo, DealStatusEnum status) {
-		return studentPaymentOrderDao.queryByBatchNo(batchNo, status);
+	public List<StudentPaymentOrder> queryByBatchNo(Integer userId, String batchNo, DealStatusEnum status) {
+		return studentPaymentOrderDao.queryByBatchNo(userId, batchNo, status);
 	}
 
 	@Override

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

@@ -452,6 +452,7 @@
         FROM student_payment_order
         WHERE batch_no_ = #{batchNo}
           AND status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+          and user_id_ = #{userId}
     </select>
 
     <!-- 根据订单号查询订单 -->