Merge remote-tracking branch 'origin/master'

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

@@ -34,6 +34,8 @@ public class ExportTeacherSalaryDto{
 
     //vip活动名称
     private String vipActiveName;
+    
+    private String vipCategoryName;
 
     //线上课/线下课
     private String teachMode;
@@ -127,7 +129,15 @@ public class ExportTeacherSalaryDto{
         this.vipActiveName = vipActiveName;
     }
 
-    public double getOfflineClassesUnitPrice() {
+    public String getVipCategoryName() {
+		return vipCategoryName;
+	}
+
+	public void setVipCategoryName(String vipCategoryName) {
+		this.vipCategoryName = vipCategoryName;
+	}
+
+	public double getOfflineClassesUnitPrice() {
         return offlineClassesUnitPrice;
     }
 

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

@@ -611,6 +611,7 @@
 		<result property="teacherId" column="teacherId"/>
 		<result property="activeName" column="activeName"/>
 		<result property="vipActiveName" column="vip_active_name_"/>
+		<result property="vipCategoryName" column="vip_category_name_"/>
 		<result property="courseScheduleType" column="courseScheduleType"/>
 		<result property="signOutStatus" column="signOutStatus"/>
 		<result property="signInStatus" column="signInStatus"/>
@@ -674,7 +675,7 @@
 		'vip课' courseScheduleType,
 		cs.class_date_ classDate,cs.start_class_time_ courseScheduleStartTime,cs.end_class_time_ courseScheduleEndTime,
 		ROUND((UNIX_TIMESTAMP(cs.end_class_time_)-UNIX_TIMESTAMP(cs.start_class_time_))/60) signCourseScheduleTime,
-		ts.actual_salary_ price,vga.name_ vip_active_name_,
+		ts.actual_salary_ price,vga.name_ vip_active_name_,vgc.name_ vip_category_name_,
 		CASE WHEN s.name_ IS NULL THEN '网络教室' ELSE s.name_ END address,
 		CASE WHEN ts.teacher_role_ = 'TEACHING' THEN '助教' ELSE '主教' END teacherRole,
 		CASE WHEN ta.sign_in_status_ = 0 THEN '异常' WHEN ta.sign_in_status_ = 1 THEN '正常' END signInStatus,
@@ -696,6 +697,7 @@
 		LEFT JOIN vip_group vg ON (vg.id_ = ts.music_group_id_ AND ts.group_type_ = 'VIP')
 		LEFT JOIN vip_group_activity vga ON vg.vip_group_activity_id_ = vga.id_
 		LEFT JOIN organization vgo ON vgo.id_ = vg.organ_id_
+		left join vip_group_category vgc on vgc.id_ = vg.vip_group_category_id_
 		WHERE vg.organ_id_ != 41 AND cs.class_date_ BETWEEN #{firstDayOfMonth} AND #{lastDayOfMonth} AND cs.`del_flag_` != 1
 		AND cs.group_type_ = 'VIP' AND ts.settlement_time_ IS NOT NULL
 		<if test="courseTypeList != null">

mec-student/src/main/java/com/ym/mec/student/controller/StudentOrderController.java

@@ -154,17 +154,17 @@ public class StudentOrderController extends BaseController {
     public Object executePayment(BigDecimal amount, String orderNo, String payChannel, String notifyUrl, String returnUrl, String orderSubject, String orderBody, String sign, String code, String platform) throws Exception {
         Map<String, Object> signParams = new LinkedHashMap<>();
         signParams.put("appId", ConfigInit.appId);
-        signParams.put("amount", amount);
+        signParams.put("amount", amount.setScale(2,BigDecimal.ROUND_HALF_UP));
         signParams.put("orderNo", orderNo);
-        signParams.put("notifyUrl", notifyUrl);
-        signParams.put("returnUrl", returnUrl);
+//        signParams.put("notifyUrl", notifyUrl);
+//        signParams.put("returnUrl", returnUrl);
         signParams.put("orderSubject", orderSubject);
         signParams.put("orderBody", orderBody);
         signParams.put("wxAppId", ConfigInit.wxAppId);
 
         String originalStr = JSONObject.toJSONString(signParams);
         String mewSign = DigestUtils.md5DigestAsHex(originalStr.getBytes());
-        if (mewSign.equals(sign)) {
+        if (!mewSign.equals(sign)) {
             return failed("请勿非法请求");
         }
 

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/adapay/Payment.java

@@ -179,8 +179,8 @@ public class Payment extends ConfigInit {
         paymentParams.put("appId", appId);
         paymentParams.put("amount", amount.setScale(2, BigDecimal.ROUND_HALF_UP));
         paymentParams.put("orderNo", orderNo);
-        paymentParams.put("notifyUrl", notifyUrl);
-        paymentParams.put("returnUrl", returnUrl);
+//        paymentParams.put("notifyUrl", notifyUrl);
+//        paymentParams.put("returnUrl", returnUrl);
         paymentParams.put("orderSubject", orderSubject);
         paymentParams.put("orderBody", orderBody);
         paymentParams.put("wxAppId", wxAppId);

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

@@ -279,12 +279,12 @@ public class ExportController extends BaseController {
         OutputStream outputStream = response.getOutputStream();
         try {
             HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"课时编号", "老师编号", "老师姓名", "老师分部", "工作类别",
-                    "课程分部", "课程组编号", "课程班名称", "乐团模式", "vip活动名称", "阶梯奖励名称", "线上课/线下课", "线上课单价", "线下课单价",
+                    "课程分部", "课程组编号", "课程班名称", "乐团模式", "vip活动名称","Vip课程类型", "阶梯奖励名称", "线上课/线下课", "线上课单价", "线下课单价",
                     "课程类别", "课时时长", "实际上课时长", "上课日期",
                     "上课时间", "教师签到状态", "教师签退状态", "教师签到时间", "教师签退时间",
                     "主辅", "上课地点", "应到学员", "学员签到时间", "学员签退时间", "课时课酬", "阶梯奖励"}, new String[]{
                     "courseScheduleId", "teacherId", "teacherName", "teacherOrganName", "jobType",
-                    "courseScheduleOrganName", "groupId", "groupName", "changeType", "vipActiveName", "activeName", "teachMode", "onlineClassesUnitPrice", "offlineClassesUnitPrice",
+                    "courseScheduleOrganName", "groupId", "groupName", "changeType", "vipActiveName", "vipCategoryName", "activeName", "teachMode", "onlineClassesUnitPrice", "offlineClassesUnitPrice",
                     "courseScheduleType", "signCourseScheduleTime", "currentTime", "classDate", "courseScheduleStartTime", "signInStatus",
                     "signOutStatus", "signInTime", "signOutTime", "teacherRole", "address", "studentNum", "studentSignInTime", "studentSignOutTime", "price", "rewards"}, rows);
             response.setContentType("application/octet-stream");
@@ -601,12 +601,12 @@ public class ExportController extends BaseController {
         List<SporadicChargeInfo> rows = sporadicChargeInfoService.queryDetailPage(queryInfo).getRows();
         for (SporadicChargeInfo row : rows) {
             row.setOpenFlagStr(row.getOpenFlag().equals(0) ? "开启" : "关闭");
-            row.setOrderType(row.getUserId() !=null ? "公用" : "个人");
+            row.setOrderType(row.getUserId() ==null ? "公用" : "个人");
         }
         OutputStream outputStream = response.getOutputStream();
         try {
             HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"分部", "收费类型", "标题", "收费状态", "金额", "时间", "学生姓名","订单类型", "创建人"}, new String[]{
-                    "organName", "chargeType.msg", "title", "openFlagStr", "amount", "updateTime", "userName", "orderType","operatorName"}, rows);
+                    "organName", "chargeType.msg", "title", "openFlagStr", "amount", "createTime", "userName", "orderType","operatorName"}, rows);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");
             response.flushBuffer();