Merge branch 'vip_double_11'

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentManageServiceImpl.java

@@ -220,25 +220,6 @@ public class StudentManageServiceImpl implements StudentManageService {
         Map<String, Object> params = new HashMap<String, Object>();
         MapUtil.populateMap(params, queryInfo);
 
-        Teacher teacher = teacherDao.get(queryInfo.getTeacherId());
-        if (Objects.isNull(teacher)) {
-            return null;
-        }
-        List<Integer> organIds = new ArrayList<>();
-        if (Objects.nonNull(teacher.getTeacherOrganId())) {
-            organIds.add(teacher.getTeacherOrganId());
-        }
-        if (StringUtils.isNotBlank(teacher.getFlowOrganRange())) {
-            List<Integer> flowOrganRangeIds = Arrays.stream(teacher.getFlowOrganRange().split(",")).map(e -> Integer.valueOf(e)).collect(Collectors.toList());
-            organIds.addAll(flowOrganRangeIds);
-        }
-
-        if (CollectionUtils.isEmpty(organIds)) {
-            return null;
-        }
-
-        params.put("organIds", organIds);
-
         List<StudentVipDouble11Dto> dataList = new ArrayList<>();
         int count = studentPaymentOrderDao.countDouble11Students(params);
         if (count > 0) {

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

@@ -764,7 +764,7 @@
     <select id="queryDouble11Students" resultMap="StudentVipDouble11Dto">
         SELECT
             su.id_ userId,
-            su.real_name_ userName,
+            su.username_ userName,
             su.phone_ phone,
             su.avatar_ avatar,
             SUM(CASE WHEN sci.title_ LIKE '%1V1%' THEN spo.class_group_id_ ELSE 0 END) payment_one_to_one_time_,
@@ -772,15 +772,13 @@
         FROM
             student_payment_order spo
             LEFT JOIN sporadic_charge_info sci ON spo.music_group_id_=sci.id_
+            LEFT JOIN student s ON spo.user_id_=s.user_id_
             LEFT JOIN sys_user su ON spo.user_id_ = su.id_
         WHERE
             spo.status_ = 'SUCCESS'
             AND spo.type_ = 'DOUBLE_ELEVEN2020'
             AND sci.title_ LIKE '双十一%'
-            AND sci.organ_id_ IN
-            <foreach collection="organIds" item="organId" open="(" close=")" separator=",">
-                #{organId}
-            </foreach>
+            AND s.teacher_id_= #{teacherId}
             <if test="search!=null and search!=''">
                 AND (su.phone_=#{search} OR su.username_ LIKE CONCAT('%', #{search}, '%'))
             </if>
@@ -795,15 +793,13 @@
         FROM
         student_payment_order spo
         LEFT JOIN sporadic_charge_info sci ON spo.music_group_id_=sci.id_
+        LEFT JOIN student s ON spo.user_id_=s.user_id_
         LEFT JOIN sys_user su ON spo.user_id_ = su.id_
         WHERE
-        spo.status_ = 'SUCCESS'
-        AND spo.type_ = 'DOUBLE_ELEVEN2020'
-        AND sci.title_ LIKE '双十一%'
-        AND sci.organ_id_ IN
-        <foreach collection="organIds" item="organId" open="(" close=")" separator=",">
-            #{organId}
-        </foreach>
+            spo.status_ = 'SUCCESS'
+            AND spo.type_ = 'DOUBLE_ELEVEN2020'
+            AND sci.title_ LIKE '双十一%'
+            AND s.teacher_id_= #{teacherId}
         <if test="search!=null and search!=''">
             AND (su.phone_=#{search} OR su.username_ LIKE CONCAT('%', #{search}, '%'))
         </if>;

mec-web/src/main/java/com/ym/mec/web/controller/ExportController.java

@@ -1060,9 +1060,9 @@ public class ExportController extends BaseController {
         }
 
         try {
-            String[] header = {"序号", "学生姓名", "交易流水号", "订单编号", "收款渠道", "应付金额", "现金支付", "余额支付", "到账时间",
+            String[] header = {"序号", "学生姓名", "交易流水号", "订单编号", "收款渠道", "收款账户", "应付金额", "现金支付", "余额支付", "到账时间",
                     "关联乐团ID/VIP课ID", "课程形态", "课程费用", "新生专享课程费用", "乐器减免费用", "课程减免费用", "押金", "乐器", "教辅费用", "维修费用", "零星收款费用", "零星收款类别", "手续费", "专业", "分部", "单位/学校", "合作机构", "备注"};
-            String[] body = {"id", "user.username", "transNo", "orderNo", "paymentChannel", "expectAmount", "actualAmount", "balancePaymentAmount", "payTime", "musicGroupId",
+            String[] body = {"id", "user.username", "transNo", "orderNo", "paymentChannel", "merNos", "expectAmount", "actualAmount", "balancePaymentAmount", "payTime", "musicGroupId",
                     "groupType.desc", "courseFee", "highOnlineCourseFee", "remitFee", "courseRemitFee", "leaseFee", "musicalFee", "teachingFee", "repairFee", "sporadicAmount", "sporadicType", "transferFee", "subjectName", "organName", "schoolName", "cooperationOrganName", "memo"};
             HSSFWorkbook workbook = POIUtil.exportExcel(header, body, studentPaymentOrderExportDtos);
             response.setContentType("application/octet-stream");