Merge branch 'online' of http://git.dayaedu.com/yonge/cooleshow into online

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/VideoLessonController.java

@@ -7,6 +7,7 @@ import com.yonge.cooleshow.biz.dal.dto.search.VideoGroupSearch;
 import com.yonge.cooleshow.biz.dal.dto.search.VideoLessonSearch;
 import com.yonge.cooleshow.biz.dal.entity.VideoLessonGroup;
 import com.yonge.cooleshow.biz.dal.entity.VideoLessonGroupDetail;
+import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
 import com.yonge.cooleshow.biz.dal.service.VideoLessonGroupDetailService;
 import com.yonge.cooleshow.biz.dal.service.VideoLessonGroupService;
 import com.yonge.toolset.base.util.StringUtil;
@@ -177,6 +178,7 @@ public class VideoLessonController extends BaseController {
 
         shelvesVo.setShelvesId(user.getId());
         shelvesVo.setShelvesTime(new Date());
+        shelvesVo.setClientType(ClientEnum.SYSTEM);
         lessonGroupService.updateShelves(shelvesVo);
         return succeed();
     }

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

@@ -219,7 +219,7 @@ public class VideoLessonGroupServiceImpl extends ServiceImpl<VideoLessonGroupDao
     public void updateShelves(VideoLessonShelvesVo shelvesVo) {
         //改主表
         videoLessonGroupDao.updateShelves(shelvesVo);
-        if(shelvesVo.getShelvesFlag() == 0){
+        if(shelvesVo.getShelvesFlag() == 0 && ClientEnum.SYSTEM.equals(shelvesVo.getClientType())){
             //发推送
             sendOutSaleMessage(shelvesVo);
         }

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

@@ -1,5 +1,6 @@
 package com.yonge.cooleshow.biz.dal.vo;
 
+import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
 import com.yonge.cooleshow.biz.dal.valid.ListValue;
 import com.yonge.cooleshow.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
@@ -33,6 +34,16 @@ public class VideoLessonShelvesVo extends BaseEntity {
     @ApiModelProperty(value = "上下架操作人", hidden = true)
     private Long shelvesId;
 
+    private ClientEnum clientType;
+
+    public ClientEnum getClientType() {
+        return clientType;
+    }
+
+    public void setClientType(ClientEnum clientType) {
+        this.clientType = clientType;
+    }
+
     public Long getId() {
         return id;
     }

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

@@ -1,5 +1,6 @@
 package com.yonge.cooleshow.teacher.controller;
 
+import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
@@ -193,6 +194,8 @@ public class VideoLessonGroupController extends BaseController {
 
         shelvesVo.setShelvesId(user.getId());
         shelvesVo.setShelvesTime(new Date());
+
+        shelvesVo.setClientType(ClientEnum.TEACHER);
         videoLessonGroupService.updateShelves(shelvesVo);
         return succeed();
     }

cooleshow-user/user-website/src/main/java/com/yonge/cooleshow/website/controller/VideoLessonGroupController.java

@@ -1,5 +1,6 @@
 package com.yonge.cooleshow.website.controller;
 
+import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
@@ -55,6 +56,8 @@ public class VideoLessonGroupController extends BaseController {
 
         shelvesVo.setShelvesId(user.getId());
         shelvesVo.setShelvesTime(new Date());
+
+        shelvesVo.setClientType(ClientEnum.WEBSITE);
         videoLessonGroupService.updateShelves(shelvesVo);
         return succeed();
     }