Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/CourseScheduleDao.java

@@ -827,7 +827,7 @@ public interface CourseScheduleDao extends BaseDAO<Long, CourseSchedule> {
                                   @Param("schoolId") Integer schoolId);
 
 
-    int countVipGroupCourses(@Param("vipGroupId") Integer vipGroupId);
+    int countVipGroupCourses(@Param("vipGroupId") Integer vipGroupId,@Param("groupType") String groupType);
 
     /**
      * @param groupType:

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/StudentPaymentOrderDao.java

@@ -204,47 +204,52 @@ public interface StudentPaymentOrderDao extends BaseDAO<Long, StudentPaymentOrde
     int countSporadicPage(Map<String, Object> params);
 
     List<OrderStatisDto> getLuckStatis();
-    
+
     /**
      * 统计收入信息
+     *
      * @param organId
      * @return
      */
     Map<String, Object> queryIncomeStatisticsWithCurrentMonth(@Param("organId") String organId);
 
     /**
+     * @param userId:     用户编号
+     * @param vipGroupId: 小课编号
+     * @return int
      * @describe 统计学员购买小课成功的订单数量
      * @author Joburgess
      * @date 2020/2/3
-     * @param userId: 用户编号
-     * @param vipGroupId: 小课编号
-     * @return int
      */
     int countUserBuyVipGroupSuccessOrder(@Param("userId") Integer userId,
                                          @Param("vipGroupId") Integer vipGroupId);
 
     /**
+     * @param userId:     用户编号
+     * @param vipGroupId: 小课编号
+     * @return java.util.List<com.ym.mec.biz.dal.entity.StudentPaymentOrder>
      * @describe 获取学员购买小课的订单
      * @author Joburgess
      * @date 2020/2/5
-     * @param userId: 用户编号
-     * @param vipGroupId: 小课编号
-     * @return java.util.List<com.ym.mec.biz.dal.entity.StudentPaymentOrder>
      */
     List<StudentPaymentOrder> findUserBuyVipGroupOrder(@Param("userId") Integer userId,
                                                        @Param("vipGroupId") Integer vipGroupId);
 
     /**
-     * @describe 获取用户的团体订单
-     * @author Joburgess
-     * @date 2020/2/21
      * @param userId:
      * @param groupId:
      * @param groupType:
      * @return java.util.List<com.ym.mec.biz.dal.entity.StudentPaymentOrder>
+     * @describe 获取用户的团体订单
+     * @author Joburgess
+     * @date 2020/2/21
      */
     List<StudentPaymentOrder> findUserGroupOrders(@Param("userId") Integer userId,
                                                   @Param("groupId") String groupId,
                                                   @Param("groupType") GroupType groupType,
                                                   @Param("status") DealStatusEnum orderStatus);
+
+    StudentPaymentOrder getOrderMoneyAmount(Map<String, Object> params);
+
+    List<StudentPaymentOrder> queryPageOrder(Map<String, Object> params);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/PageInfoOrder.java

@@ -0,0 +1,38 @@
+package com.ym.mec.biz.dal.dto;
+
+import com.ym.mec.common.page.PageInfo;
+
+import java.math.BigDecimal;
+
+public class PageInfoOrder<T> extends PageInfo<T> {
+
+    private BigDecimal totalExpectAmount =BigDecimal.ZERO;
+    private BigDecimal totalActualAmount =BigDecimal.ZERO;
+
+    public PageInfoOrder() {
+    }
+
+    public PageInfoOrder(Integer pageNo) {
+        super(pageNo);
+    }
+
+    public PageInfoOrder(Integer pageNo, int pageSize) {
+        super(pageNo, pageSize);
+    }
+
+    public BigDecimal getTotalExpectAmount() {
+        return totalExpectAmount;
+    }
+
+    public void setTotalExpectAmount(BigDecimal totalExpectAmount) {
+        this.totalExpectAmount = totalExpectAmount;
+    }
+
+    public BigDecimal getTotalActualAmount() {
+        return totalActualAmount;
+    }
+
+    public void setTotalActualAmount(BigDecimal totalActualAmount) {
+        this.totalActualAmount = totalActualAmount;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/VipGroupCourseAdjustInfoDto.java

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.dto;
 
+import com.ym.mec.biz.dal.enums.GroupType;
 import com.ym.mec.biz.dal.enums.TeachModeEnum;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -16,6 +17,9 @@ public class VipGroupCourseAdjustInfoDto {
     @ApiModelProperty(value = "vip课编号")
     private Integer vipGroupId;
 
+    @ApiModelProperty(value = "课程组类型")
+    private GroupType groupType;
+
     @ApiModelProperty(value = "需要调整的vip课排课计划的编号")
     private String courseScheduleIds;
 
@@ -40,6 +44,14 @@ public class VipGroupCourseAdjustInfoDto {
     @ApiModelProperty(value = "教学点")
     private Integer schoolId;
 
+    public GroupType getGroupType() {
+        return groupType;
+    }
+
+    public void setGroupType(GroupType groupType) {
+        this.groupType = groupType;
+    }
+
     public Integer getSchoolId() {
         return schoolId;
     }

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/MusicGroup.java

@@ -1,20 +1,18 @@
 package com.ym.mec.biz.dal.entity;
 
-import io.swagger.annotations.ApiModelProperty;
-
-import java.util.Date;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
 import com.ym.mec.biz.dal.entity.CooperationOrgan.OwnershipType;
 import com.ym.mec.biz.dal.enums.MusicGroupStatusEnum;
 import com.ym.mec.biz.dal.enums.SalarySettlementTypeEnum;
 import com.ym.mec.biz.dal.enums.YesOrNoEnum;
+import io.swagger.annotations.ApiModelProperty;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+import java.util.Date;
 
 /**
  * 对应数据库表(music_group):
  */
-public class MusicGroup {
+public class MusicGroup{
 
 	/**  */
 	private String id;

mec-biz/src/main/java/com/ym/mec/biz/service/StudentPaymentOrderService.java

@@ -1,9 +1,8 @@
 package com.ym.mec.biz.service;
 
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
+import com.ym.mec.biz.dal.dto.PageInfoOrder;
 import com.ym.mec.biz.dal.dto.SporadicChargeInfoDto;
 import com.ym.mec.biz.dal.dto.StudentPaymentOrderExportDto;
 import com.ym.mec.biz.dal.entity.Goods;
@@ -13,8 +12,12 @@ import com.ym.mec.biz.dal.enums.GroupType;
 import com.ym.mec.biz.dal.enums.OrderDetailTypeEnum;
 import com.ym.mec.biz.dal.enums.OrderTypeEnum;
 import com.ym.mec.biz.dal.page.SporadicOrderQueryInfo;
+import com.ym.mec.biz.dal.page.StudentPaymentOrderQueryInfo;
 import com.ym.mec.common.page.PageInfo;
+import com.ym.mec.common.page.QueryInfo;
 import com.ym.mec.common.service.BaseService;
+import com.ym.mec.util.collection.MapUtil;
+import org.apache.poi.ss.formula.functions.T;
 
 public interface StudentPaymentOrderService extends BaseService<Long, StudentPaymentOrder> {
 
@@ -97,4 +100,11 @@ public interface StudentPaymentOrderService extends BaseService<Long, StudentPay
 	 * @return
 	 */
 	PageInfo<SporadicChargeInfoDto> sporadicQueryPage(SporadicOrderQueryInfo queryInfo);
+
+
+	StudentPaymentOrder getOrderMoneyAmount(StudentPaymentOrderQueryInfo queryInfo);
+
+
+	PageInfoOrder<StudentPaymentOrder> OrderQueryPage(StudentPaymentOrderQueryInfo queryInfo);
+
 }

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

@@ -1389,7 +1389,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
             throw new BizException("获取用户信息失败");
         }
         if (Objects.isNull(vipGroupCourseAdjustInfo.getVipGroupId())) {
-            throw new BizException("请指定小课");
+            throw new BizException("请指定课程");
         }
         if (Objects.isNull(vipGroupCourseAdjustInfo.getCourseCreateStartTime())) {
             throw new BizException("请指定排课起始时间;");
@@ -1398,7 +1398,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
             throw new BizException("请指定排课周期");
         }
         if (StringUtils.isBlank(vipGroupCourseAdjustInfo.getCourseScheduleIds())) {
-            throw new BizException("请指定需要调整的小课课程");
+            throw new BizException("请指定需要调整的课程");
         }
         Date courseCreateStartTime = vipGroupCourseAdjustInfo.getCourseCreateStartTime();
         Date now = new Date();
@@ -1413,17 +1413,31 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
             throw new BizException("请设置教学点");
         }
 
-        VipGroup vipGroup = vipGroupDao.get(vipGroupCourseAdjustInfo.getVipGroupId().longValue());
-        if (Objects.isNull(vipGroup)) {
-            throw new BizException("指定课程不存在");
+        int singleClassMinutes = 0;
+        int courseNum = 0;
+        GroupType groupType = vipGroupCourseAdjustInfo.getGroupType();
+        switch (vipGroupCourseAdjustInfo.getGroupType()){
+            case PRACTICE:
+                PracticeGroup practiceGroup = practiceGroupDao.get(vipGroupCourseAdjustInfo.getVipGroupId().longValue());
+                if (Objects.isNull(practiceGroup)) {
+                    throw new BizException("指定课程不存在");
+                }
+                singleClassMinutes = practiceGroup.getSingleClassMinutes();
+                courseNum = courseScheduleDao.countVipGroupCourses(practiceGroup.getId().intValue(),groupType.getCode());
+                break;
+            default:
+                VipGroup vipGroup = vipGroupDao.get(vipGroupCourseAdjustInfo.getVipGroupId().longValue());
+                if (Objects.isNull(vipGroup)) {
+                    throw new BizException("指定课程不存在");
+                }
+                singleClassMinutes = vipGroup.getSingleClassMinutes();
+                courseNum = courseScheduleDao.countVipGroupCourses(vipGroup.getId().intValue(),groupType.getCode());
         }
-
-        int courseNum = courseScheduleDao.countVipGroupCourses(vipGroup.getId().intValue());
         if (courseNum == 0) {
             throw new BizException("未排课的课程不能进行调整");
         }
 
-        ClassGroup classGroup = classGroupDao.findByGroupAndType(vipGroupCourseAdjustInfo.getVipGroupId().toString(), GroupType.VIP.getCode());
+        ClassGroup classGroup = classGroupDao.findByGroupAndType(vipGroupCourseAdjustInfo.getVipGroupId().toString(),groupType.getCode());
         if (Objects.isNull(classGroup)) {
             throw new BizException("对应班级不存在");
         }
@@ -1493,7 +1507,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
                     String dateYmdStr = DateUtil.dateToString(calendar.getTime(), DateUtil.ISO_EXPANDED_DATE_FORMAT);
                     dateYmdStr = dateYmdStr + " " + courseTime.getStartClassTime();
                     Date courseStartTime = DateUtil.stringToDate(dateYmdStr, "yyyy-MM-dd HH:mm");
-                    Date courseEndTime = DateUtil.addMinutes(courseStartTime, vipGroup.getSingleClassMinutes());
+                    Date courseEndTime = DateUtil.addMinutes(courseStartTime, singleClassMinutes);
                     if(DateUtil.daysBetween(DateUtil.stringToDate(DateUtil.format(courseStartTime,DateUtil.DEFAULT_PATTERN),DateUtil.DEFAULT_PATTERN),
                             DateUtil.stringToDate(DateUtil.format(courseEndTime,DateUtil.DEFAULT_PATTERN),DateUtil.DEFAULT_PATTERN)) > 0){
                         throw new BizException("单节课时不允许跨天");

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

@@ -3,6 +3,7 @@ package com.ym.mec.biz.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.huifu.adapay.model.payment.Payment;
 import com.ym.mec.biz.dal.dao.StudentPaymentOrderDao;
+import com.ym.mec.biz.dal.dto.PageInfoOrder;
 import com.ym.mec.biz.dal.dto.SporadicChargeInfoDto;
 import com.ym.mec.biz.dal.dto.StudentPaymentOrderExportDto;
 import com.ym.mec.biz.dal.entity.Goods;
@@ -12,9 +13,11 @@ import com.ym.mec.biz.dal.enums.GroupType;
 import com.ym.mec.biz.dal.enums.OrderDetailTypeEnum;
 import com.ym.mec.biz.dal.enums.OrderTypeEnum;
 import com.ym.mec.biz.dal.page.SporadicOrderQueryInfo;
+import com.ym.mec.biz.dal.page.StudentPaymentOrderQueryInfo;
 import com.ym.mec.biz.service.*;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.page.PageInfo;
+import com.ym.mec.common.page.QueryInfo;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.thirdparty.adapay.Pay;
 import com.ym.mec.thirdparty.yqpay.Msg;
@@ -23,10 +26,12 @@ import com.ym.mec.thirdparty.yqpay.YqPayFeignService;
 import com.ym.mec.thirdparty.yqpay.YqPayUtil;
 import com.ym.mec.util.collection.MapUtil;
 
+import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -60,11 +65,11 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
     }
 
     @Override
-	public List<StudentPaymentOrder> queryByCondition(GroupType groupType, String musicGroupId, Integer userId, DealStatusEnum status, OrderTypeEnum type) {
-		return studentPaymentOrderDao.queryByCondition(groupType, musicGroupId, userId, status, type);
-	}
+    public List<StudentPaymentOrder> queryByCondition(GroupType groupType, String musicGroupId, Integer userId, DealStatusEnum status, OrderTypeEnum type) {
+        return studentPaymentOrderDao.queryByCondition(groupType, musicGroupId, userId, status, type);
+    }
 
-	@Override
+    @Override
     public StudentPaymentOrder findMusicGroupApplyOrderByStatus(Integer userId, String musicGroupId, DealStatusEnum status) {
         return studentPaymentOrderDao.findMusicGroupApplyOrderByStatus(userId, musicGroupId, status);
     }
@@ -194,16 +199,16 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
             vipGroupService.orderCallback(order);
         } else if (order.getType().equals(OrderTypeEnum.RENEW)) {
             musicGroupService.renewForCallback(order);
-        }else if (order.getType().equals(OrderTypeEnum.SPORADIC)||order.getType().equals(OrderTypeEnum.LUCK)){
+        } else if (order.getType().equals(OrderTypeEnum.SPORADIC) || order.getType().equals(OrderTypeEnum.LUCK)) {
             sporadicChargeInfoService.renewForCallback(order);
-        }else if (order.getType().equals(OrderTypeEnum.PRACTICE_GROUP_BUY)){
+        } else if (order.getType().equals(OrderTypeEnum.PRACTICE_GROUP_BUY)) {
             practiceGroupService.orderCallback(order);
         }
     }
 
     @Override
     public Integer findOrderByGroupType(Integer userId, Integer sporadicId, String sporadic, DealStatusEnum status) {
-        return studentPaymentOrderDao.findOrderByGroupType(userId,sporadicId,sporadic,status);
+        return studentPaymentOrderDao.findOrderByGroupType(userId, sporadicId, sporadic, status);
     }
 
 
@@ -227,9 +232,9 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
                     vipGroupService.orderCallback(order);
                 } else if (order.getType().equals(OrderTypeEnum.RENEW)) {
                     musicGroupService.renewForCallback(order);
-                }else if (order.getType().equals(OrderTypeEnum.SPORADIC)||order.getType().equals(OrderTypeEnum.LUCK)){
+                } else if (order.getType().equals(OrderTypeEnum.SPORADIC) || order.getType().equals(OrderTypeEnum.LUCK)) {
                     sporadicChargeInfoService.renewForCallback(order);
-                }else if (order.getType().equals(OrderTypeEnum.PRACTICE_GROUP_BUY)){
+                } else if (order.getType().equals(OrderTypeEnum.PRACTICE_GROUP_BUY)) {
                     practiceGroupService.orderCallback(order);
                 }
             } catch (Exception e) {
@@ -264,4 +269,35 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
         pageInfo.setRows(dataList);
         return pageInfo;
     }
+
+    @Override
+    public StudentPaymentOrder getOrderMoneyAmount(StudentPaymentOrderQueryInfo queryInfo) {
+        Map<String, Object> params = new HashMap<String, Object>();
+        MapUtil.populateMap(params, queryInfo);
+        return studentPaymentOrderDao.getOrderMoneyAmount(params);
+    }
+
+    @Override
+    public PageInfoOrder<StudentPaymentOrder> OrderQueryPage(StudentPaymentOrderQueryInfo queryInfo) {
+        PageInfoOrder<StudentPaymentOrder> pageInfo = new PageInfoOrder<>(queryInfo.getPage(), queryInfo.getRows());
+        Map<String, Object> params = new HashMap<String, Object>();
+        MapUtil.populateMap(params, queryInfo);
+
+        List<StudentPaymentOrder> dataList = new ArrayList<>();
+        int count = this.findCount(params);
+        StudentPaymentOrder orderMoneyAmount = studentPaymentOrderDao.getOrderMoneyAmount(params);
+        if(orderMoneyAmount != null){
+            BigDecimal totalExpectAmount = orderMoneyAmount.getExpectAmount() !=null? orderMoneyAmount.getExpectAmount():BigDecimal.ZERO;
+            BigDecimal totalActualAmount = orderMoneyAmount.getActualAmount() !=null? orderMoneyAmount.getActualAmount():BigDecimal.ZERO;
+            pageInfo.setTotalExpectAmount(totalExpectAmount);
+            pageInfo.setTotalActualAmount(totalActualAmount);
+        }
+        if (count > 0) {
+            pageInfo.setTotal(count);
+            params.put("offset", pageInfo.getOffset());
+            dataList = studentPaymentOrderDao.queryPageOrder(params);
+        }
+        pageInfo.setRows(dataList);
+        return pageInfo;
+    }
 }

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

@@ -1028,7 +1028,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 			createVipGroupCourseScheInfo(vipGroupId,classGroup);
 		}
 		if(num!=0||updateVipStatus){
-			int i = courseScheduleDao.countVipGroupCourses(vipGroupId.intValue());
+			int i = courseScheduleDao.countVipGroupCourses(vipGroupId.intValue(),"VIP");
 			classGroup.setTotalClassTimes(i);
 			classGroupDao.update(classGroup);
 		}
@@ -1039,7 +1039,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 	public void createVipGroupCourseScheInfo(Long vipGroupId,ClassGroup classGroup){
 		VipGroup vipGroupApplyBaseInfoDto = vipGroupDao.get(vipGroupId);
 		List<CourseSchedule> courseSchedules = JSON.parseArray(vipGroupApplyBaseInfoDto.getCourseSchedulesJson(),CourseSchedule.class);
-		int courseNum = courseScheduleDao.countVipGroupCourses(vipGroupId.intValue());
+		int courseNum = courseScheduleDao.countVipGroupCourses(vipGroupId.intValue(),"VIP");
 		if(courseNum==0){
 			courseScheduleService.batchAddCourseSchedule(courseSchedules);
 
@@ -2366,7 +2366,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 
 		if(vipGroup.getStatus().equals(VipGroupStatusEnum.APPLYING)||vipGroup.getStatus().equals(VipGroupStatusEnum.NOT_START)){
 			List<CourseSchedule> courseSchedules = JSON.parseArray(vipGroup.getCourseSchedulesJson(),CourseSchedule.class);
-			int courseNum = courseScheduleDao.countVipGroupCourses(vipGroupId.intValue());
+			int courseNum = courseScheduleDao.countVipGroupCourses(vipGroupId.intValue(),"VIP");
 			if(courseNum==0){
 				courseScheduleService.batchAddCourseSchedule(courseSchedules);
 

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

@@ -1889,7 +1889,7 @@
         SELECT count(cs.id_)
         FROM course_schedule cs
         WHERE cs.music_group_id_ = #{vipGroupId}
-          AND cs.group_type_ = 'VIP'
+          AND cs.group_type_ = #{groupType}
     </select>
     <select id="findCourseNoStartNum" resultType="java.lang.Integer">
         SELECT COUNT(cs.id_)

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

@@ -154,11 +154,13 @@
 		LEFT JOIN course_schedule cs ON vg.id_ = cs.music_group_id_
 		LEFT JOIN class_group cg ON cg.id_ = cs.class_group_id_
 		LEFT JOIN course_schedule_teacher_salary csts ON csts.course_schedule_id_ = cs.id_
-		WHERE cs.group_type_ = 'VIP' AND csts.settlement_time_ IS NOT NULL AND cs.teach_mode_ = 'OFFLINE'
+		LEFT JOIN vip_group_activity vga ON vga.id_ = vg.vip_group_activity_id_
+		WHERE cs.group_type_ = 'VIP' AND csts.settlement_time_ IS NOT NULL
 		AND cs.class_date_ >= #{firstDayOfMonth} AND cs.class_date_ <= #{lastDayOfMonth}
 		AND FIND_IN_SET(cs.actual_teacher_id_,csrr.teacher_id_)
 		AND FIND_IN_SET(cg.subject_id_list_,csrr.subject_id_)
 		AND csts.user_id_ = cs.actual_teacher_id_
+		AND ((vga.offline_class_join_gradient_rewards_ = 1 AND cs.teach_mode_ = 'OFFLINE') OR (vga.online_class_join_gradient_rewards_ = 1 AND cs.teach_mode_ = 'ONLINE'))
 		GROUP BY cs.actual_teacher_id_,csrr.id_
 	</select>
 	<select id="findByIds" resultMap="CourseScheduleRewardsRules">

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

@@ -608,7 +608,10 @@
 	
 	<select id="queryOnlineCourseByGroupType" resultMap="CourseScheduleTeacherSalary">
 		SELECT csts.*  FROM `course_schedule_teacher_salary` csts LEFT JOIN `course_schedule` cs on csts.`course_schedule_id_` = cs.`id_` 
-		WHERE cs.`group_type_` = #{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler} and cs.`teach_mode_` = 'ONLINE'
+		left join vip_group vg on vg.id_ = csts.music_group_id_ and csts.group_type_ = 'VIP'
+		left join vip_group_category vgc on vgc.id_ = vg.vip_group_category_id_
+		left join teacher t on t.id_ = csts.user_id_ 
+		WHERE cs.`group_type_` = 'VIP' and cs.`teach_mode_` = 'ONLINE' and vgc.name_ = '1v1' and t.job_nature_ = 'FULL_TIME'
 	</select>
 
     <select id="isTeacher" resultType="java.lang.Boolean">

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

@@ -520,4 +520,18 @@
             and status_=#{status, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
         </if>
     </select>
+
+    <select id="getOrderMoneyAmount" parameterType="map" resultMap="StudentPaymentOrder">
+        SELECT SUM(spo.expect_amount_) expect_amount_,SUM(actual_amount_) actual_amount_ FROM student_payment_order spo
+        <include refid="queryPaymentOrder"/>
+    </select>
+
+    <!-- 分页查询 -->
+    <select id="queryPageOrder" resultMap="PaymentOrderAndStudentInfo" parameterType="map">
+        SELECT spo.*,u.username_,u.phone_ FROM student_payment_order spo
+        left join sys_user u on spo.user_id_ = u.id_
+        <include refid="queryPaymentOrder"/>
+        ORDER BY spo.id_ DESC
+        <include refid="global.limit"/>
+    </select>
 </mapper>

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

@@ -250,7 +250,7 @@ public class CourseScheduleController extends BaseController {
     	return succeed(model);
     }
 
-    @ApiOperation(value = "vip课批量调整")
+    @ApiOperation(value = "vip课批量调整(网管课)")
     @PostMapping("/vipCourseAdjust")
     @PreAuthorize("@pcs.hasPermissions('courseSchedule/vipCourseAdjust')")
     public Object vipCourseAdjust(@RequestBody VipGroupCourseAdjustInfoDto vipGroupCourseAdjustInfo){

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

@@ -66,7 +66,7 @@ public class StudentPaymentOrderController extends BaseController {
             }
         }
 
-        PageInfo<StudentPaymentOrder> studentPaymentOrderPageInfo = studentPaymentOrderService.queryPage(queryInfo);
+        PageInfo<StudentPaymentOrder> studentPaymentOrderPageInfo = studentPaymentOrderService.OrderQueryPage(queryInfo);
 
         int openHideMode = Integer.parseInt(sysConfigDao.findConfigValue("open_hide_mode"));
         if (openHideMode == 1) {
@@ -129,7 +129,7 @@ public class StudentPaymentOrderController extends BaseController {
         }
         queryInfo.setOrderType("1");
 
-        PageInfo<StudentPaymentOrder> studentPaymentOrderPageInfo = studentPaymentOrderService.queryPage(queryInfo);
+        PageInfo<StudentPaymentOrder> studentPaymentOrderPageInfo = studentPaymentOrderService.OrderQueryPage(queryInfo);
 
         for (StudentPaymentOrder row : studentPaymentOrderPageInfo.getRows()) {
             BigDecimal balancePaymentAmount = row.getBalancePaymentAmount() == null ? BigDecimal.ZERO : row.getBalancePaymentAmount();
@@ -165,7 +165,7 @@ public class StudentPaymentOrderController extends BaseController {
         }
         queryInfo.setOrderType("2");
 
-        PageInfo<StudentPaymentOrder> studentPaymentOrderPageInfo = studentPaymentOrderService.queryPage(queryInfo);
+        PageInfo<StudentPaymentOrder> studentPaymentOrderPageInfo = studentPaymentOrderService.OrderQueryPage(queryInfo);
 
         for (StudentPaymentOrder row : studentPaymentOrderPageInfo.getRows()) {
             BigDecimal balancePaymentAmount = row.getBalancePaymentAmount() == null ? BigDecimal.ZERO : row.getBalancePaymentAmount();