yonge 2 years ago
parent
commit
1fbce27d49

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

@@ -25,6 +25,9 @@ public class StudentPaymentOrderVo {
     private String orderNo;
     
     private DealStatusEnum status;
+    
+    private String memo;
+    
     /**
      * 订单类型
      */
@@ -191,4 +194,12 @@ public class StudentPaymentOrderVo {
 	public void setStatus(DealStatusEnum status) {
 		this.status = status;
 	}
+
+	public String getMemo() {
+		return memo;
+	}
+
+	public void setMemo(String memo) {
+		this.memo = memo;
+	}
 }

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

@@ -1005,6 +1005,7 @@
 
     <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"/>
@@ -1025,7 +1026,7 @@
     <select id="queryStudentOrderPage" resultMap="QueryOrderDetail">
         select
             a.order_no_ as orderNo,
-            a.status_ ,
+            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,
@@ -1042,7 +1043,7 @@
     <select id="queryOrderDetail" resultMap="QueryOrderDetail">
         select
                a.order_no_ as orderNo,
-               a.status_ ,
+               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,