Merge branch 'master' of http://git.dayaedu.com/yonge/mec

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/SchoolDao.java

@@ -38,7 +38,8 @@ public interface SchoolDao extends BaseDAO<Integer, School> {
      * @param userId: 教师编号
      * @return java.util.List<com.ym.mec.biz.dal.entity.School>
      */
-    List<School> findVipSchoolByUserId(Integer userId,Integer isDefault);
+    List<School> findVipSchoolByUserId(@Param("userId") Integer userId,
+                                       @Param("isDefault") Integer isDefault);
 
 
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/StudentPaymentOrderDao.java

@@ -68,7 +68,8 @@ public interface StudentPaymentOrderDao extends BaseDAO<Long, StudentPaymentOrde
      * @param status       订单状态
      * @return
      */
-    List<StudentPaymentOrder> queryByDealStatus(@Param("musicGroupId") String musicGroupId, @Param("type") OrderTypeEnum type,
+    List<StudentPaymentOrder> queryByDealStatus(@Param("musicGroupId") String musicGroupId,
+                                                @Param("type") OrderTypeEnum type,
                                                 @Param("status") DealStatusEnum status);
 
     /**
@@ -103,4 +104,6 @@ public interface StudentPaymentOrderDao extends BaseDAO<Long, StudentPaymentOrde
      * @return
      */
     List<StudentPaymentOrder> findOrdersOverTime(@Param("orderNoList") List<String> orderNoList, @Param("status") DealStatusEnum status, @Param("beforeTime") Date beforeTime);
+
+
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/VipGroupDao.java

@@ -243,4 +243,13 @@ public interface VipGroupDao extends BaseDAO<Long, VipGroup> {
 	 */
 	Integer queryCurrentMonthCoursesNum(@Param("organId") Integer organId);
 
+	/**
+	 * @describe 获取报名已截至但是报名人数还未达到的vip课程
+	 * @author Joburgess
+	 * @date 2019/11/13
+	 * @param :
+	 * @return java.util.List<com.ym.mec.biz.dal.entity.VipGroup>
+	 */
+	List<VipGroup> findNoCreateSuccessVipGroup();
+
 }

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

@@ -1265,6 +1265,10 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 
 	@Override
 	public void stopVipGroupWithNoCreate() {
-
+		List<VipGroup> noCreateSuccessVipGroups = vipGroupDao.findNoCreateSuccessVipGroup();
+		if(CollectionUtils.isEmpty(noCreateSuccessVipGroups)){
+			return;
+		}
+//		studentPaymentOrderDao.queryByDealStatus()
 	}
 }

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

@@ -680,4 +680,14 @@
    			and vg.organ_id_ = #{organId}
    		</if>
     </select>
+
+    <select id="findNoCreateSuccessVipGroup" resultMap="VipGroup">
+        SELECT
+          *
+        FROM
+          vip_group
+        WHERE
+          payment_expire_date_ &lt; NOW( )
+          AND status_ =1
+    </select>
 </mapper>

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

@@ -234,14 +234,14 @@ public class VipGroupManageController extends BaseController {
 
     @ApiOperation(value = "更新vip课基本信息")
     @PostMapping(value = "/updateVipBaseInfo")
-    public Object updateVipBaseInfo(VipGroupApplyBaseInfoDto vipGroupApplyBaseInfo){
+    public Object updateVipBaseInfo(@RequestBody VipGroupApplyBaseInfoDto vipGroupApplyBaseInfo){
         vipGroupService.updateVipGroupBaseInfo(vipGroupApplyBaseInfo);
         return succeed();
     }
 
     @ApiOperation(value = "新增vip课程计划")
     @PostMapping(value = "/appendVipGroupCourseSchedules")
-    public Object appendVipGroupCourseSchedules(VipGroupApplyDto vipGroupApplyDto){
+    public Object appendVipGroupCourseSchedules(@RequestBody VipGroupApplyDto vipGroupApplyDto){
         vipGroupService.appendVipGroupCourseSchedules(vipGroupApplyDto);
         return succeed();
     }