Merge branch 'dev_1_3_5_20220831' into online

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/controller/NewsController.java

@@ -259,7 +259,7 @@ public class NewsController extends BaseController {
 		// 1热门资讯
 		queryInfo.setType(1);
 		queryInfo.setPage(1);
-		queryInfo.setRows(3);
+		queryInfo.setRows(param.getNewsLimit());
 		Map<String, Object> params = new HashMap<>();
 		MapUtil.populateMap(params, queryInfo);
 		List<SysNewsInformationDto> rows = sysNewsInformationService.selectPage(queryInfo).getRows();

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/dto/AppParam.java

@@ -21,6 +21,16 @@ public class AppParam {
     @ApiModelProperty("老师端：TEACHER 学生端：STUDENT")
     private String clientType;
 
+    @ApiModelProperty("个人资讯条数 默认10条")
+    private int newsLimit = 10;
+
+    public int getNewsLimit() {
+        return newsLimit;
+    }
+
+    public void setNewsLimit(int newsLimit) {
+        this.newsLimit = newsLimit;
+    }
 
     public String getClientType() {
         return clientType;

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/MemberPriceSettingsServiceImpl.java

@@ -59,8 +59,6 @@ public class MemberPriceSettingsServiceImpl extends ServiceImpl<MemberPriceSetti
 
     @Autowired
     private SysUserFeignService sysUserFeignService;
-    @Autowired
-    private SysConfigService sysConfigService;
 
     @Autowired
     private ActivityPlanService activityPlanService;
@@ -181,15 +179,21 @@ public class MemberPriceSettingsServiceImpl extends ServiceImpl<MemberPriceSetti
 
     @Override
     public ShareProfitVo shareVipProfit(SysUser sysUser, Long vipId) {
+
         ShareProfitVo result = new ShareProfitVo();
-        MemberPriceSettingsVo detail = detail(vipId);
-        result.setVip(detail);
-        result.setAvatar(sysUser.getAvatar());
-        result.setName(sysUser.getUsername());
-        result.setTeacherId(sysUser.getId());
-
-        String teacherVipShareProfitUrl = sysConfigService.findConfigValue(SysConfigConstant.TEACHER_VIP_SHARE_PROFIT_URL);
-        result.setUrl(MessageFormatter.arrayFormat(teacherVipShareProfitUrl, detail.getId(), sysUser.getId()));
+
+        MemberPriceSettingsSearch memberPriceSettingsSearch = new MemberPriceSettingsSearch();
+        YesOrNoEnum discount = YesOrNoEnum.NO;
+        ActivityPlanVo activityPlanVo = activityPlanService.activityShare(ActivityShareEnum.VIP, sysUser.getId());
+        if (activityPlanVo != null) {
+            result.setActivityId(activityPlanVo.getId());
+            discount = YesOrNoEnum.YES;
+            memberPriceSettingsSearch.setActivityId(activityPlanVo.getId());
+        }
+        memberPriceSettingsSearch.setUserId(sysUser.getId());
+        MemberPriceVo vipShare = getVipShare(memberPriceSettingsSearch);
+        result.setDiscount(discount);
+        result.setVip(vipShare.getList());
         return result;
     }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/MusicSheetServiceImpl.java

@@ -294,6 +294,12 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
                 }
             }
         } else if (ChargeTypeEnum.VIP.getCode().equals(detail.getChargeType().getCode())) {
+            // 先判断是否购买过
+            MusicSheetPurchaseRecord musicSheetPurchaseRecord = musicSheetPurchaseRecordService.checkPurchase(
+                    studentId, detail.getId(), userType);
+            if (musicSheetPurchaseRecord != null) {
+                detail.setPlay(YesOrNoEnum.YES);
+            } else
             // 会员 判断是否为会员， 会员可播放
             if (userType.equals(ClientEnum.STUDENT)) {
                 StudentVo studentVo = studentService.detail(studentId);

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/ShareProfitVo.java

@@ -5,6 +5,8 @@ import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
+import java.util.List;
+
 /**
  * Description 老师乐谱分享信息
  *
@@ -45,7 +47,7 @@ public class ShareProfitVo {
     private VideoLessonStudentVo videoGroup;
 
     @ApiModelProperty("会员信息")
-    private MemberPriceSettingsVo vip;
+    private List<MemberPriceSettingsVo> vip;
 
     public Long getActivityId() {
         return activityId;
@@ -71,11 +73,11 @@ public class ShareProfitVo {
         this.teacherId = teacherId;
     }
 
-    public MemberPriceSettingsVo getVip() {
+    public List<MemberPriceSettingsVo> getVip() {
         return vip;
     }
 
-    public void setVip(MemberPriceSettingsVo vip) {
+    public void setVip(List<MemberPriceSettingsVo> vip) {
         this.vip = vip;
     }
 

cooleshow-user/user-biz/src/main/resources/config/mybatis/ActivityPlanRewardMapper.xml

@@ -46,7 +46,7 @@
         , ar.reward_client_ as "activityReward.rewardClient"
         , ar.reward_name_ as "activityReward.rewardName"
         , ar.reward_type_ as "activityReward.rewardType"
-        , ar.reward_describe_ "activityReward.as rewardDescribe"
+        , ar.reward_describe_ "activityReward.rewardDescribe"
         , ar.img_url_ as "activityReward.imgUrl"
         , ar.stock_ as "activityReward.stock"
         , ar.num_ as "activityReward.num"

cooleshow-user/user-biz/src/main/resources/config/mybatis/CourseScheduleMapper.xml

@@ -619,7 +619,7 @@
         LEFT JOIN `subject` s ON g.lesson_subject_=s.id_
         LEFT JOIN (SELECT video_lesson_group_id_ ,COUNT(1) AS count_ FROM video_lesson_purchase_record WHERE order_status_='PAID' GROUP BY video_lesson_group_id_) r ON g.id_= r.video_lesson_group_id_
         WHERE u.del_flag_ = 0 and g.audit_status_='PASS' and g.shelves_flag_ = 1 and #{appAuditVersion} = g.audit_version_
-        ORDER BY g.create_time_ DESC LIMIT 4
+        ORDER BY buyCount DESC LIMIT 10
     </select>
     <select id="selectRecentCourses" resultType="com.yonge.cooleshow.biz.dal.vo.StudentHomePage$RecentCourses">
         SELECT

cooleshow-user/user-biz/src/main/resources/config/mybatis/VideoLessonGroupMapper.xml

@@ -317,7 +317,7 @@
 				AND s.id_ = #{param.lessonSubject}
 			</if>
 		</where>
-		ORDER BY g.create_time_ DESC
+		ORDER BY countStudent DESC
 	</select>
 	
 	<select id="queryMyLessonGroup" resultType="com.yonge.cooleshow.biz.dal.vo.LessonGroupVo">

cooleshow-user/user-student/src/main/java/com/yonge/cooleshow/student/controller/open/OpenClient.java

@@ -1,6 +1,10 @@
 package com.yonge.cooleshow.student.controller.open;
 
+import com.yonge.cooleshow.biz.dal.dto.search.MemberPriceSettingsSearch;
+import com.yonge.cooleshow.biz.dal.entity.SysConfig;
+import com.yonge.cooleshow.biz.dal.service.*;
 import com.yonge.cooleshow.biz.dal.vo.CheckVo;
+import com.yonge.cooleshow.biz.dal.vo.MemberPriceVo;
 import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -8,6 +12,8 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 
+import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import javax.validation.Valid;
@@ -25,11 +31,6 @@ import com.ksyun.ks3.dto.PostObjectFormFields;
 import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dto.MusicImgDto;
-import com.yonge.cooleshow.biz.dal.service.ActivityPlanService;
-import com.yonge.cooleshow.biz.dal.service.MusicSheetService;
-import com.yonge.cooleshow.biz.dal.service.StudentService;
-import com.yonge.cooleshow.biz.dal.service.TeacherService;
-import com.yonge.cooleshow.biz.dal.service.UploadFileService;
 import com.yonge.cooleshow.biz.dal.vo.MusicActivityVo;
 import com.yonge.cooleshow.biz.dal.vo.TeacherVo;
 import com.yonge.cooleshow.common.controller.BaseController;
@@ -47,7 +48,8 @@ public class OpenClient extends BaseController {
     private TeacherService teacherService;
     @Autowired
     private SysUserFeignService sysUserFeignService;
-
+    @Autowired
+    private SysConfigService sysConfigService;
     @Autowired
     private UploadFileService uploadFileService;
     @Autowired
@@ -56,6 +58,8 @@ public class OpenClient extends BaseController {
     @Autowired
     private StudentService studentService;
 
+    @Autowired
+    private MemberPriceSettingsService memberPriceSettingsService;
 
     @Autowired
     private ActivityPlanService activityPlanService;
@@ -142,4 +146,23 @@ public class OpenClient extends BaseController {
         checkVo.setCheck(state);
         return succeed(checkVo);
     }
+
+
+
+    @PostMapping("/memberPriceSettings/list")
+    @ApiOperation(value = "查询列表")
+    public HttpResponseResult<MemberPriceVo> list(@RequestBody MemberPriceSettingsSearch query) {
+        MemberPriceVo memberPriceVo = memberPriceSettingsService.getVipShare(query);
+        return succeed(memberPriceVo);
+    }
+
+
+    @PostMapping("/memberPriceSettings/vipPermissions")
+    @ApiOperation(value = "查询vip权限")
+    public HttpResponseResult<List<SysConfig>> vipPermissions() {
+        Map<String,Object> params = new HashMap<>();
+        params.put("group", "VIP_PERMISSION");
+        List<SysConfig> configs = sysConfigService.findAll(params);
+        return succeed(configs);
+    }
 }

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/open/OpenShareController.java

@@ -3,6 +3,7 @@ package com.yonge.cooleshow.teacher.controller.open;
 import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dto.search.ShareProfitParam;
+import com.yonge.cooleshow.biz.dal.entity.SysConfig;
 import com.yonge.cooleshow.biz.dal.service.*;
 import com.yonge.cooleshow.biz.dal.vo.CheckVo;
 import com.yonge.cooleshow.biz.dal.vo.MusicActivityVo;
@@ -19,6 +20,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 @RestController
 @RequestMapping("/open")
@@ -40,6 +44,8 @@ public class OpenShareController extends BaseController {
 
     @Autowired
     private ActivityPlanService activityPlanService;
+    @Autowired
+    private SysConfigService sysConfigService;
 
     /**
      * 服务对象
@@ -114,4 +120,14 @@ public class OpenShareController extends BaseController {
         checkVo.setCheck(state);
         return succeed(checkVo);
     }
+
+
+    @PostMapping("/memberPriceSettings/vipPermissions")
+    @ApiOperation(value = "查询vip权限")
+    public HttpResponseResult<List<SysConfig>> vipPermissions() {
+        Map<String,Object> params = new HashMap<>();
+        params.put("group", "VIP_PERMISSION");
+        List<SysConfig> configs = sysConfigService.findAll(params);
+        return succeed(configs);
+    }
 }