Merge remote-tracking branch 'origin/saas' into saas

mec-biz/src/main/java/com/ym/mec/biz/dal/vo/StudentPaymentOrderVo.java

@@ -1,8 +1,10 @@
 package com.ym.mec.biz.dal.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ym.mec.biz.dal.enums.DealStatusEnum;
 import com.ym.mec.biz.dal.enums.OrderDetailTypeEnum;
 import com.ym.mec.biz.dal.enums.OrderTypeEnum;
+
 import org.apache.commons.lang3.StringUtils;
 
 import java.math.BigDecimal;
@@ -21,6 +23,11 @@ public class StudentPaymentOrderVo {
      * 订单编号
      */
     private String orderNo;
+    
+    private DealStatusEnum status;
+    
+    private String memo;
+    
     /**
      * 订单类型
      */
@@ -179,4 +186,20 @@ public class StudentPaymentOrderVo {
     public void setTransNo(String transNo) {
         this.transNo = transNo;
     }
+
+	public DealStatusEnum getStatus() {
+		return status;
+	}
+
+	public void setStatus(DealStatusEnum status) {
+		this.status = status;
+	}
+
+	public String getMemo() {
+		return memo;
+	}
+
+	public void setMemo(String memo) {
+		this.memo = memo;
+	}
 }

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

@@ -1005,6 +1005,8 @@
 
     <resultMap type="com.ym.mec.biz.dal.vo.StudentPaymentOrderVo" id="QueryOrderDetail">
         <result column="orderNo" property="orderNo"/>
+        <result column="memo_" property="memo"/>
+        <result column="status_" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="orderType" property="orderType"/>
         <result column="orderTypeCode" property="orderTypeCode"/>
         <result column="totalAmount" property="totalAmount"/>
@@ -1024,20 +1026,24 @@
     <select id="queryStudentOrderPage" resultMap="QueryOrderDetail">
         select
             a.order_no_ as orderNo,
+            a.status_ ,a.memo_,
             a.type_                            as orderType,
             a.type_                            as orderTypeCode,
             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="param.status != null">
+          and status_ = #{param.status}
+          </if>
     </select>
 
     <select id="queryOrderDetail" resultMap="QueryOrderDetail">
         select
                a.order_no_ as orderNo,
+               a.status_ ,a.memo_,
                a.type_                            as orderType,
                ifnull(a.actual_amount_, 0) + ifnull(a.balance_payment_amount_, 0) + ifnull(a.remit_fee_, 0) +
                ifnull(a.coupon_remit_fee_, 0)     as totalAmount,