feat:优惠券

mec-biz/src/main/java/com/ym/mec/biz/dal/page/StudentPaymentOrderQueryInfo.java

@@ -8,6 +8,9 @@ import java.util.List;
 
 public class StudentPaymentOrderQueryInfo extends QueryInfo {
 
+    @ApiModelProperty("订单编号")
+    private Long paymentOrderId;
+
     @ApiModelProperty(value = "开始时间",required = false)
     private String orderStartDate;
 
@@ -69,6 +72,14 @@ public class StudentPaymentOrderQueryInfo extends QueryInfo {
 
     private String oldOrganId;
 
+    public Long getPaymentOrderId() {
+        return paymentOrderId;
+    }
+
+    public void setPaymentOrderId(Long paymentOrderId) {
+        this.paymentOrderId = paymentOrderId;
+    }
+
     public boolean getIsExport() {
         return isExport;
     }

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

@@ -370,7 +370,7 @@
                 <![CDATA[AND spo.balance_payment_amount_ <= #{lessBalancePaymentAmount}]]>
             </if>
             <if test="orderNo != null">
-                AND spo.order_no_ = #{orderNo}
+                AND (spo.id_ = #{orderNo} OR spo.order_no_ = #{orderNo})
             </if>
             <if test="merNos != null">
                 AND FIND_IN_SET(#{merNos},spo.mer_nos_)

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

@@ -133,7 +133,7 @@
 	<select id="queryPage" resultMap="SysCoupon" parameterType="map">
 		SELECT * FROM sys_coupon
 		<include refid="queryCondition"></include>
-		ORDER BY id_
+		ORDER BY id_ DESC
 		<include refid="global.limit"/>
 	</select>