Merge branch 'zouxuan_saas_order_export' of http://git.dayaedu.com/yonge/mec into master_saas

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

@@ -353,7 +353,12 @@
                 AND DATE_FORMAT(spo.create_time_,'%Y-%m-%d') <= #{orderEndDate}
             </if>
             <if test="paymentType != null">
-                AND spo.type_ = #{paymentType}
+                <if test="paymentType == 'OUTORDER'">
+                    AND spo.group_type_ = #{paymentType}
+                </if>
+                <if test="paymentType != 'OUTORDER'">
+                    AND spo.type_ = #{paymentType}
+                </if>
             </if>
             <if test="remark != null">
                 AND spo.memo_ LIKE CONCAT('%',#{remark},'%')