update

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

@@ -928,12 +928,12 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
         if (payStatus == PayStatus.SUCCESSED) {
             throw new BizException("订单已支付成功，请勿重复支付");
         }
-        if (payStatus == PayStatus.PAYING) {
-            throw new BizException("有一笔支付中的订单，请勿重复支付");
+        if (repeatPay == false && payStatus == PayStatus.PAYING) {
+            return BaseController.failed(HttpStatus.CONTINUE, "您有支付中的订单,是否继续支付");
         }
-        if (!repeatPay) {
+        /*if (!repeatPay) {
             return BaseController.failed(HttpStatus.CONTINUE, "您有待支付的订单,是否继续支付");
-        }
+        }*/
         //处理关闭订单
         order.setStatus(DealStatusEnum.CLOSE);
         order.setMemo("关闭订单");

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

@@ -1029,10 +1029,12 @@
             ifnull(a.actual_amount_, 0) + ifnull(a.balance_payment_amount_, 0) as totalAmount,
             a.create_time_ as createTime
         from student_payment_order as a
-        where  status_ = 'SUCCESS'
-          and create_time_ >= #{param.startDate}
+        where  create_time_ >= #{param.startDate}
           and create_time_   <![CDATA[ < ]]> #{param.endDate}
           and user_id_ = #{param.userId}
+          <if test="status != null">
+          and status_ = #{status}
+          </if>
     </select>
 
     <select id="queryOrderDetail" resultMap="QueryOrderDetail">