小小训练营活动

直播间商品

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

@@ -23,5 +23,5 @@ public interface LiveGoodsMapperDao extends BaseDAO<Integer, LiveGoodsMapper> {
 
     int countLiveGoods(Map<String, Object> params);
 
-    List<LiveGoods> queryGoodsPage(Map<String, Object> params);
+    List<LiveGoodsMapperDto> queryGoodsPage(Map<String, Object> params);
 }

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

@@ -1,25 +1,52 @@
 package com.ym.mec.biz.dal.dto;
 
 import com.ym.mec.biz.dal.enums.PeriodEnum;
+import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
 
 public class MemberPayParamDto extends PayParamBasicDto implements Serializable {
 
-    //前端录入实际缴费金额
+    @ApiModelProperty(value = "前端录入实际缴费金额",required = false)
     private BigDecimal amount;
 
+    @ApiModelProperty(value = "用于后台创建的团练宝订单购买",required = false)
     private Long paymentId;
 
-    //购买数量
+    @ApiModelProperty(value = "购买数量",required = false)
     private Integer val;
 
     //如果isRepeatPay = true 则需要传入订单号
     private String orderNo;
 
+    @ApiModelProperty(value = "年月日",required = false)
     private PeriodEnum periodEnum;
 
+    //直播房间号
+    @ApiModelProperty(value = "直播房间号（用于直播间商品购买）",required = false)
+    private String liveId;
+
+    //商品编号
+    @ApiModelProperty(value = "直播间商品编号（用于直播间商品购买，目前只支持1和2，1代表免费的云课堂，2代表云教练（送网管课））",required = false)
+    private Integer liveGoodsId;
+
+    public String getLiveId() {
+        return liveId;
+    }
+
+    public void setLiveId(String liveId) {
+        this.liveId = liveId;
+    }
+
+    public Integer getLiveGoodsId() {
+        return liveGoodsId;
+    }
+
+    public void setLiveGoodsId(Integer liveGoodsId) {
+        this.liveGoodsId = liveGoodsId;
+    }
+
     public PeriodEnum getPeriodEnum() {
         return periodEnum;
     }

mec-biz/src/main/java/com/ym/mec/biz/service/LiveGoodsMapperService.java

@@ -28,7 +28,7 @@ public interface LiveGoodsMapperService extends BaseService<Integer, LiveGoodsMa
     List<LiveGoodsMapper> findByLiveGoodsIdAndStatus(Integer goodsId, Boolean status);
 
     //分页查询
-    PageInfo<LiveGoods> queryGoodsPage(LiveGoodsMapperQueryInfo queryInfo);
+    PageInfo<LiveGoodsMapperDto> queryGoodsPage(LiveGoodsMapperQueryInfo queryInfo);
 
     List<LiveGoodsMapperDto> getLiveGoodsList(String liveId, Integer liveGoodsId, Boolean status);
 }

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

@@ -63,12 +63,12 @@ public class LiveGoodsMapperServiceImpl extends BaseServiceImpl<Integer, LiveGoo
 	}
 
     @Override
-    public PageInfo<LiveGoods> queryGoodsPage(LiveGoodsMapperQueryInfo queryInfo) {
-		PageInfo<LiveGoods> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
+    public PageInfo<LiveGoodsMapperDto> queryGoodsPage(LiveGoodsMapperQueryInfo queryInfo) {
+		PageInfo<LiveGoodsMapperDto> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
 		Map<String, Object> params = new HashMap<String, Object>();
 		MapUtil.populateMap(params, queryInfo);
 
-		List<LiveGoods> dataList = null;
+		List<LiveGoodsMapperDto> dataList = null;
 		int count = liveGoodsMapperDao.countLiveGoods(params);
 		if (count > 0) {
 			pageInfo.setTotal(count);

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

@@ -27,7 +27,7 @@ public class LiveGoodsMapperController extends BaseController {
 
     @ApiOperation("分页查询直播间商品")
     @PostMapping("/page")
-    public HttpResponseResult<PageInfo<LiveGoods>> page(LiveGoodsMapperQueryInfo queryInfo) {
+    public HttpResponseResult<PageInfo<LiveGoodsMapperDto>> page(LiveGoodsMapperQueryInfo queryInfo) {
         return succeed(liveGoodsMapperService.queryGoodsPage(queryInfo));
     }
 

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

@@ -114,9 +114,10 @@ public class MemberRankController extends BaseController {
     @ApiOperation(value = "2022小小训练营活动购买会员")
     @PostMapping("/activeBuy")
     public HttpResponseResult ActiveBuy(@RequestBody MemberPayParamDto memberPayParamDto) throws Exception {
-		String startTimeStr = sysConfigDao.findConfigValue("cloud_teacher_active_start_time");
-		String endTimeStr = sysConfigDao.findConfigValue("cloud_teacher_active_end_time");
-        SysConfigService.checkActivityDate(startTimeStr,endTimeStr);
+//		String startTimeStr = sysConfigDao.findConfigValue("cloud_teacher_active_start_time");
+//		String endTimeStr = sysConfigDao.findConfigValue("cloud_teacher_active_end_time");
+//        SysConfigService.checkActivityDate(startTimeStr,endTimeStr);
+
 		return memberRankSettingService.activeBuy(memberPayParamDto);
     }
 

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

@@ -31,7 +31,7 @@ public class LiveGoodsMapperController extends BaseController {
     @ApiOperation("分页查询直播间商品")
     @PostMapping("/page")
     @PreAuthorize("@pcs.hasPermissions('liveGoodsMapper/page')")
-    public HttpResponseResult<PageInfo<LiveGoods>> page(LiveGoodsMapperQueryInfo queryInfo) {
+    public HttpResponseResult<PageInfo<LiveGoodsMapperDto>> page(LiveGoodsMapperQueryInfo queryInfo) {
         return succeed(liveGoodsMapperService.queryGoodsPage(queryInfo));
     }