update

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

@@ -18,6 +18,14 @@ public interface TenantPaymentOrderDao extends BaseDAO<Long, TenantPaymentOrder>
 	List<TenantPaymentOrder> queryByUserId(Integer userId);
 
 	/**
+	 * 查询用户所有订单
+	 * @param userId
+	 * @param activitiesId
+	 * @return
+	 */
+	List<TenantPaymentOrder> queryByUserIdAndActivitiesId(@Param("userId") Integer userId, @Param("activitiesId") Integer activitiesId);
+
+	/**
 	 * 根据订单号查询订单
 	 *
 	 * @param orderNo

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

@@ -72,7 +72,7 @@ public class TenantPaymentOrderServiceImpl extends BaseServiceImpl<Long, TenantP
 
 	@Autowired
 	private YqPayFeignService yqPayFeignService;
-	
+
 	@Override
 	public BaseDAO<Long, TenantPaymentOrder> getDAO() {
 		return tenantPaymentOrderDao;
@@ -107,13 +107,13 @@ public class TenantPaymentOrderServiceImpl extends BaseServiceImpl<Long, TenantP
 		}
 
 		// 查询用户订单
-		List<TenantPaymentOrder> orderList = tenantPaymentOrderDao.queryByUserId(userId);
+		List<TenantPaymentOrder> orderList = tenantPaymentOrderDao.queryByUserIdAndActivitiesId(userId, activitiesId);
 		if (orderList != null && orderList.size() > 0) {
 			for (TenantPaymentOrder po : orderList) {
 				// 是否满足条件
 				if (tenantEntryActivities.getSuitableUser() == SuitableUser.NEW) {
 					if (po.getStatus() == DealStatusEnum.ING) {
-						throw new BizException("您参加的首充活动正在处理中，预计于{}分钟后处理完毕，请稍后。",30 - DateUtil.minutesBetween(po.getCreateTime(), date));
+						throw new BizException("您参加的首充活动正在处理中，预计于{}分钟后处理完毕，请稍后。", 30 - DateUtil.minutesBetween(po.getCreateTime(), date));
 					}
 					if (po.getStatus() == DealStatusEnum.SUCCESS) {
 						throw new BizException("首充优惠活动每个用户限参与一次。");

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

@@ -151,6 +151,10 @@
 	<select id="queryByUserId" resultMap="TenantPaymentOrder">
 		SELECT * FROM tenant_payment_order where user_id_ = #{userId} ORDER BY id_
 	</select>
+	
+	<select id="queryByUserIdAndActivitiesId" resultMap="TenantPaymentOrder" parameterType="map">
+		SELECT * FROM tenant_payment_order where user_id_ = #{userId} and activities_id_ = #{activitiesId} ORDER BY id_
+	</select>
 
     <!-- 根据订单号查询订单 -->
     <select id="findOrderByOrderNo" resultMap="TenantPaymentOrder">