Merge branch 'online1' of http://git.dayaedu.com/yonge/mec into im_update

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

@@ -1,5 +1,7 @@
 package com.ym.mec.biz.dal.dto;
 
+import java.math.BigDecimal;
+
 public class StudentVipPracticeExportDto{
     private Integer userId;
 
@@ -35,6 +37,26 @@ public class StudentVipPracticeExportDto{
 
     private String organName;
 
+    private BigDecimal courseBalance = BigDecimal.ZERO;
+
+    private String subjectName;
+
+    public BigDecimal getCourseBalance() {
+        return courseBalance;
+    }
+
+    public void setCourseBalance(BigDecimal courseBalance) {
+        this.courseBalance = courseBalance;
+    }
+
+    public String getSubjectName() {
+        return subjectName;
+    }
+
+    public void setSubjectName(String subjectName) {
+        this.subjectName = subjectName;
+    }
+
     public String getOrganName() {
         return organName;
     }

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

@@ -25,6 +25,16 @@ public class AccountLogQueryInfo extends QueryInfo {
 
     private String createEndTime;
 
+    private Boolean returnFeeFlag;
+
+    public Boolean getReturnFeeFlag() {
+        return returnFeeFlag;
+    }
+
+    public void setReturnFeeFlag(Boolean returnFeeFlag) {
+        this.returnFeeFlag = returnFeeFlag;
+    }
+
     public String getReturnFeeType() {
         return returnFeeType;
     }

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

@@ -324,11 +324,11 @@ public class ExportServiceImpl implements ExportService {
 
         HSSFWorkbook workbook = null;
         try {
-            String[] header = {"序号", "学生姓名", "交易流水号", "订单编号", "收款渠道", "收款账户", "订单金额", "应付金额", "现金支付", "余额支付", "优惠金额",
+            String[] header = {"序号", "学生编号", "学生姓名", "交易流水号", "订单编号", "收款渠道", "收款账户", "订单金额", "应付金额", "现金支付", "余额支付", "优惠金额",
                     "乐团课", "VIP课", "网管课", "乐理课", "考级", "维修费用", "乐保费用", "云教练", "押金", "乐器", "教辅费用", "上门费",
                     "账户充值", "其它", "手续费", "到账时间",
                     "关联乐团ID/VIP课ID", "课程形态", "零星收款类别", "专业", "分部", "教学点", "合作单位", "乐团主管", "备注"};
-            String[] body = {"id", "user.username", "transNo", "orderNo", "paymentChannel", "merNos", "orderAmount", "expectAmount", "actualAmount", "balancePaymentAmount",  "couponRemitFee",
+            String[] body = {"id", "userId", "user.username", "transNo", "orderNo", "paymentChannel", "merNos", "orderAmount", "expectAmount", "actualAmount", "balancePaymentAmount",  "couponRemitFee",
                     "musicGroupCourseFee", "vipCourseFee", "practiceCourseFee", "theoryCourseFee", "degreeFee", "repairFee", "maintenanceFee", "cloudTeacherFee",
                     "leaseFee", "musicalFee", "teachingFee", "visitFee", "rechargeFee", "otherFee", "transferFee", "payTime", "musicGroupId",
                     "groupType.desc", "sporadicType", "subjectName", "organName", "schoolName", "cooperationOrganName", "eduTeacher", "memo"};
@@ -801,9 +801,11 @@ public class ExportServiceImpl implements ExportService {
                 order.setCloudTeacherFee(cloudTeacherFee);
             }
         });
-        String[] organIdArr = params.get("oldOrganId").toString().split(",");
-        List<String> organIds = Arrays.asList(organIdArr);
-        studentPaymentOrderExportDtos.removeIf(order -> !organIds.contains(order.getOrganId().toString()));
+        if(params.get("oldOrganId") != null){
+            String[] organIdArr = params.get("oldOrganId").toString().split(",");
+            List<String> organIds = Arrays.asList(organIdArr);
+            studentPaymentOrderExportDtos.removeIf(order -> !organIds.contains(order.getOrganId().toString()));
+        }
 
         String basePath = new ApplicationHome(this.getClass()).getSource().getParentFile().getPath();
         File file = new File(basePath + "/" + managerDownload.getName());
@@ -923,9 +925,9 @@ public class ExportServiceImpl implements ExportService {
 
         HSSFWorkbook workbook = null;
         try {
-            String[] header = {"分部", "学员编号", "学生姓名", "VIP已结束课时数", "VIP未开始课时数", "已结束VIP上课老师编号", "已结束VIP上课老师",
+            String[] header = {"分部", "学员编号", "学生姓名", "课程余额", "声部", "VIP已结束课时数", "VIP未开始课时数", "已结束VIP上课老师编号", "已结束VIP上课老师",
                     "网管课已结束课时数", "网管课未开始课时数", "已结束网管课上课老师编号", "已结束网管课上课老师", "指导老师编号", "指导老师"};
-            String[] body = {"organName","userId", "username", "vipOverNum", "vipNotStartNum", "vipOverTeacherId", "vipOverTeacherName"
+            String[] body = {"organName","userId", "username","courseBalance", "subjectName", "vipOverNum", "vipNotStartNum", "vipOverTeacherId", "vipOverTeacherName"
                     , "practiceOverNum", "practiceNotStartNum", "practiceOverTeacherId", "practiceOverTeacherName","teacherId","teacherName"};
             workbook = POIUtil.exportExcel(header, body, studentVipPracticeExportDtos);
             workbook.write(fileOutputStream);

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

@@ -4449,7 +4449,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 			Date date = new Date();
 			for (VipGroup vipGroup : vipGroupList) {
 				if(Objects.nonNull(vipGroup.getCoursesExpireDate())&&(vipGroup.getCoursesExpireDate().compareTo(date)>0||DateUtil.isSameDay(vipGroup.getCoursesExpireDate(), date))){
-					continue;
+//					continue;
 				}
 				vipGroup.setStatus(VipGroupStatusEnum.FINISHED);
 				vipGroup.setUpdateTime(date);

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

@@ -853,9 +853,11 @@
 		<result property="teacherId" column="teacher_id_"/>
 		<result property="teacherName" column="real_name_"/>
 		<result property="organName" column="organ_name_"/>
+		<result property="courseBalance" column="course_balance_"/>
+		<result property="subjectName" column="subject_name_"/>
 	</resultMap>
 	<select id="exportStudentVipPractice" resultMap="StudentVipPracticeExportDto">
-		SELECT s.user_id_,su.username_,o.name_ organ_name_,
+		SELECT s.user_id_,su.username_,o.name_ organ_name_,uca.course_balance_,sb.name_ subject_name_,
 		COUNT(CASE WHEN cssp.group_type_ = 'VIP' AND cs.status_ != 'NOT_START' THEN 1 ELSE NULL END) vip_over_num_,
 		COUNT(CASE WHEN cssp.group_type_ = 'VIP' AND cs.status_ = 'NOT_START' THEN 1 ELSE NULL END) vip_not_start_num_,
 		COUNT(CASE WHEN cssp.group_type_ = 'PRACTICE' AND cs.status_ != 'NOT_START' THEN 1 ELSE NULL END) practice_over_num_,
@@ -867,6 +869,8 @@
 		LEFT JOIN sys_user su ON s.user_id_ = su.id_
 		LEFT JOIN sys_user ste ON s.teacher_id_ = ste.id_
 		LEFT JOIN organization o ON o.id_ = su.organ_id_
+		LEFT JOIN `subject` sb ON sb.id_ = s.subject_id_list_
+		LEFT JOIN sys_user_cash_account uca ON uca.user_id_ = s.user_id_
 		WHERE cssp.group_type_ IN ('VIP','PRACTICE')
 		<if test="organId != null">
 			AND FIND_IN_SET(su.organ_id_,#{organId})

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

@@ -48,12 +48,7 @@
     <!-- 根据主键查询一条记录 -->
     <update id="update" parameterType="com.ym.mec.biz.dal.entity.SysUserCashAccountLog">
         UPDATE sys_user_cash_account_log
-        <set>
-            <if test="comment != null">comment_ = #{comment},</if>
-            <if test="transNo != null">trans_no_ = #{transNo},</if>
-            <if test="payTime != null">pay_time_ = #{payTime},</if>
-            update_time_ = NOW()
-        </set>
+        SET comment_ = #{comment},trans_no_ = #{transNo},pay_time_ = #{payTime},update_time_ = NOW()
         WHERE id_ = #{id}
     </update>
 
@@ -81,16 +76,22 @@
     <sql id="queryPageSql">
         <where>
             <if test="createStartTime != null">
-                AND DATE_FORMAT(cal.create_time_,'%Y%m%d') >= #{createStartTime}
+                AND DATE_FORMAT(cal.create_time_,'%Y-%m-%d') >= #{createStartTime}
             </if>
             <if test="createEndTime != null">
-                AND DATE_FORMAT(cal.create_time_,'%Y%m%d') &lt;= #{createEndTime}
+                AND DATE_FORMAT(cal.create_time_,'%Y-%m-%d') &lt;= #{createEndTime}
             </if>
             <if test="payStartTime != null">
-                AND DATE_FORMAT(cal.pay_time_,'%Y%m%d') >= #{payStartTime}
+                AND DATE_FORMAT(cal.pay_time_,'%Y-%m-%d') >= #{payStartTime}
             </if>
             <if test="payEndTime != null">
-                AND DATE_FORMAT(cal.pay_time_,'%Y%m%d') &lt;= #{payEndTime}
+                AND DATE_FORMAT(cal.pay_time_,'%Y-%m-%d') &lt;= #{payEndTime}
+            </if>
+            <if test="returnFeeFlag != null and returnFeeFlag == 1">
+                AND cal.pay_time_ IS NOT NULL
+            </if>
+            <if test="returnFeeFlag != null and returnFeeFlag == 0">
+                AND cal.pay_time_ IS NULL
             </if>
             <if test="groupType != null and groupType != ''">
                 AND cal.group_type_ = #{groupType}

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

@@ -2434,7 +2434,14 @@ public class ExportController extends BaseController {
     @PreAuthorize("@pcs.hasPermissions('export/routeOrderList')")
     public HttpResponseResult routeOrderList(StudentPaymentOrderQueryInfo queryInfo) throws Exception {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            throw new BizException("用户信息获取失败");
+        }
         Employee employee = employeeDao.get(sysUser.getId());
+//        if (StringUtils.isEmpty(queryInfo.getRoutingOrganId())) {
+//            queryInfo.setRoutingOrganId(employee.getOrganIdList());
+//            queryInfo.setOldOrganId(employee.getOrganIdList());
+//        }
         if (StringUtils.isEmpty(queryInfo.getRoutingOrganId()) && queryInfo.getOrderType().equals("3")) {
             queryInfo.setRoutingOrganId(employee.getOrganIdList());
             queryInfo.setOldOrganId(employee.getOrganIdList());

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

@@ -43,17 +43,17 @@ public class StudentApplyRefundsController extends BaseController {
 		if (sysUser == null) {
 			return failed("用户信息获取失败");
 		}
-			Employee employee = employeeDao.get(sysUser.getId());
-			if (StringUtils.isEmpty(queryInfo.getOrganId())) {
-				queryInfo.setOrganId(employee.getOrganIdList());
-			}else if(StringUtils.isEmpty(employee.getOrganIdList())){
-				return failed("用户所在分部异常");
-			}else {
-				List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
-				if(!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))){
-					return failed("非法请求");
-				}
+		Employee employee = employeeDao.get(sysUser.getId());
+		if (StringUtils.isEmpty(queryInfo.getOrganId())) {
+			queryInfo.setOrganId(employee.getOrganIdList());
+		}else if(StringUtils.isEmpty(employee.getOrganIdList())){
+			return failed("用户所在分部异常");
+		}else {
+			List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
+			if(!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))){
+				return failed("非法请求");
 			}
+		}
         return succeed(studentApplyRefundsService.queryPage(queryInfo));
     }
 }