增加活动接口

src/main/java/com/ym/mec/collectfee/entity/OrderQueryInfo.java

@@ -11,6 +11,7 @@ public class OrderQueryInfo extends QueryInfo {
     private String startTime;
     private String endTime;
     private Integer branchId;
+    private Integer promotionType;
 
     public Integer getClassId() {
         return classId;
@@ -67,4 +68,12 @@ public class OrderQueryInfo extends QueryInfo {
     public void setAccount(String account) {
         this.account = account;
     }
+
+    public Integer getPromotionType() {
+        return promotionType;
+    }
+
+    public void setPromotionType(Integer promotionType) {
+        this.promotionType = promotionType;
+    }
 }

src/main/resources/config/mybatis/OrderMapper.xml

@@ -265,6 +265,9 @@
         <if test="endTime != null and endTime != ''">
             <![CDATA[ and pay_time <= ]]>#{endTime}
         </if>
+        <if test="promotionType != null and promotionType!=0">
+            and promotion_type = #{promotionType}
+        </if>
     </sql>
 
     <!-- 查询当前表的总记录数 -->