Merge branch 'merge_music_group'

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

@@ -61,6 +61,10 @@ public class StudentPaymentOrderQueryInfo extends QueryInfo {
 
     private List<Integer> userIds;
 
+    //不包含淘气
+    @ApiModelProperty(value = "传时不包含淘气",required = false)
+    private Integer noneTqType;//TQ 1-不包含淘气
+
     private boolean isExport = false;
 
     public boolean getIsExport() {
@@ -214,4 +218,12 @@ public class StudentPaymentOrderQueryInfo extends QueryInfo {
     public void setLessBalancePaymentAmount(BigDecimal lessBalancePaymentAmount) {
         this.lessBalancePaymentAmount = lessBalancePaymentAmount;
     }
+
+    public Integer getNoneTqType() {
+        return noneTqType;
+    }
+
+    public void setNoneTqType(Integer noneTqType) {
+        this.noneTqType = noneTqType;
+    }
 }

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

@@ -253,6 +253,9 @@
                 AND spo.group_type_='SPORADIC'
                 AND sci.charge_type_ = #{chargeType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
             </if>
+            <if test="noneTqType != null">
+                and spo.mer_no_ != '淘器微信'
+            </if>
         </where>
     </sql>
     <select id="getRouteOrders" resultMap="StudentPaymentRouteOrder">