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

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

@@ -23,7 +23,7 @@ public class PracticeGroupBuyParamsDto extends PayParamBasicDto{
     private Integer organId;
 
     @ApiModelProperty(value = "购买的会员数量")
-    private Integer buyMemberNum;
+    private Integer buyMemberNum = 1;
 
     public Integer getBuyMemberNum() {
         return buyMemberNum;

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

@@ -440,7 +440,11 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
                 cloudTeacherOrder.setLevel(1);
                 cloudTeacherOrder.setStatus(1);
                 cloudTeacherOrder.setType(activity.getPeriodEnum());
-                cloudTeacherOrder.setTime(activity.getMemberTime() * studentPaymentOrder.getActivityBuyNum());
+                if(activity.getGiveCouponNum() == 1){
+                    cloudTeacherOrder.setTime(activity.getMemberTime() * studentPaymentOrder.getActivityBuyNum() * 2);
+                }else {
+                    cloudTeacherOrder.setTime(activity.getMemberTime() * studentPaymentOrder.getActivityBuyNum());
+                }
                 cloudTeacherOrder.setStudentId(studentPaymentOrder.getUserId());
                 cloudTeacherOrder.setOrganId(studentPaymentOrder.getOrganId());
                 cloudTeacherOrder.setAmount(studentPaymentOrder.getExpectAmount());

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

@@ -144,7 +144,7 @@ public class ActivityController extends BaseController {
                         }
                     }
                 }
-                return succeed(vipGroupActivities.stream().sorted(Comparator.comparing(VipGroupActivity::getGiveCouponNum)).collect(Collectors.toList()));
+                return succeed(vipGroupActivities.stream().sorted(Comparator.comparing(VipGroupActivity::getMarketPrice)).collect(Collectors.toList()));
             }
         }
         return failed("当前分部不参与此活动，请联系管理员");

mec-web/src/main/java/com/ym/mec/web/controller/student/StudentAttendanceController.java

@@ -1,31 +1,18 @@
 package com.ym.mec.web.controller.student;
 
-import java.util.Arrays;
-import java.util.List;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.ym.mec.auth.api.client.SysUserFeignService;
-import com.ym.mec.auth.api.entity.SysUser;
-import com.ym.mec.biz.dal.dao.EmployeeDao;
 import com.ym.mec.biz.dal.dto.StudentAttendanceDto;
-import com.ym.mec.biz.dal.entity.Employee;
 import com.ym.mec.biz.dal.page.CourseScheduleQueryInfo;
 import com.ym.mec.biz.dal.page.StudentAttendanceQueryInfo;
 import com.ym.mec.biz.service.ClassGroupService;
+import com.ym.mec.biz.service.OrganizationService;
 import com.ym.mec.biz.service.StudentAttendanceService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.exception.BizException;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
 
 @RequestMapping("studentAttendance")
 @Api(tags = "学生考勤服务")
@@ -37,9 +24,7 @@ public class StudentAttendanceController extends BaseController {
     @Autowired
     private ClassGroupService classGroupService;
     @Autowired
-    private SysUserFeignService sysUserFeignService;
-    @Autowired
-    private EmployeeDao employeeDao;
+    private OrganizationService organizationService;
 
     //修复逻辑:是连堂课，有签退记录，某个月,遍历有学员签到记录的每节课
     @GetMapping("/repairStudentAttendance")
@@ -67,21 +52,7 @@ public class StudentAttendanceController extends BaseController {
     @RequestMapping("/findStudentAttendance")
     @PreAuthorize("@pcs.hasPermissions('studentAttendance/findStudentAttendance')")
     public Object findStudentAttendance(StudentAttendanceQueryInfo queryInfo){
-    	SysUser sysUser = sysUserFeignService.queryUserInfo();
-        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("非法请求");
-            }
-        }
+        queryInfo.setOrganId(organizationService.getEmployeeOrgan(queryInfo.getOrganId()));
         //按考勤状态和回访状态排序
         queryInfo.setOrderFlag(true);
         return succeed(studentAttendanceService.findStudentAttendance(queryInfo));