双十一活动

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

@@ -56,4 +56,13 @@ public interface ActivityUserMapperDao extends BaseDAO<Integer, ActivityUserMapp
             @Param("studentIds") String studentIds,
             @Param("type") String type,
             @Param("groupId") Long groupId);
+
+    /**
+    * @description: 批量新增
+     * @param activityUserMappers
+    * @return void
+    * @author zx
+    * @date 2021/10/20 13:38
+    */
+    void batchInsert(@Param("activityUserMappers") List<ActivityUserMapper> activityUserMappers);
 }

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

@@ -7,9 +7,6 @@ import java.util.List;
 
 public class BuyDoubleEleven2021Dto {
 
-    @ApiModelProperty(value = "课程组ID")
-    private Long practiceGroupId;
-
     @ApiModelProperty(value = "付款渠道")
     private String paymentChannel;
 
@@ -58,14 +55,6 @@ public class BuyDoubleEleven2021Dto {
         this.amount = amount;
     }
 
-    public Long getPracticeGroupId() {
-        return practiceGroupId;
-    }
-
-    public void setPracticeGroupId(Long practiceGroupId) {
-        this.practiceGroupId = practiceGroupId;
-    }
-
     public List<Integer> getCouponIdList() {
         return couponIdList;
     }

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/VipGroupActivity.java

@@ -89,6 +89,9 @@ public class VipGroupActivity {
 	@ApiModelProperty(value = "赠送会员时长")
 	private Integer giveMemberTime = 0;
 
+	@ApiModelProperty(value = "赠送抽奖次数")
+	private Integer givePrizeNum = 0;
+
 	@ApiModelProperty(value = "是否充值到余额")
 	private boolean isPayToBalance = true;
 
@@ -166,6 +169,14 @@ public class VipGroupActivity {
 	@ApiModelProperty(value = "活动价格")
 	private BigDecimal marketPrice = BigDecimal.ZERO;
 
+	public Integer getGivePrizeNum() {
+		return givePrizeNum;
+	}
+
+	public void setGivePrizeNum(Integer givePrizeNum) {
+		this.givePrizeNum = givePrizeNum;
+	}
+
 	public BigDecimal getMarketPrice() {
 		return marketPrice;
 	}

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

@@ -48,4 +48,13 @@ public interface ActivityUserMapperService extends BaseService<Integer, Activity
     * @date 2021/10/15 16:18
     */
     int countActivityBuyNum(Integer activityId, Integer userId);
+
+    /**
+    * @description: 批量新增
+     * @param activityUserMappers
+    * @return void
+    * @author zx
+    * @date 2021/10/20 13:37
+    */
+    void batchInsert(List<ActivityUserMapper> activityUserMappers);
 }

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

@@ -13,7 +13,7 @@ public interface LuckDrawCountService extends BaseService<Long, LuckDrawCount> {
 	 * @param times
 	 * @return
 	 */
-	public boolean freeGive(Long userId, int times);
+	public boolean freeGive(Long userId, int times,Integer groupId);
 
 	/**
 	 * 更新抽奖次数

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

@@ -40,4 +40,9 @@ public class ActivityUserMapperServiceImpl extends BaseServiceImpl<Integer, Acti
 	public int countActivityBuyNum(Integer activityId, Integer userId) {
 		return activityUserMapperDao.countActivityBuyNum(activityId,userId);
 	}
+
+    @Override
+    public void batchInsert(List<ActivityUserMapper> activityUserMappers) {
+		activityUserMapperDao.batchInsert(activityUserMappers);
+    }
 }

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

@@ -32,7 +32,7 @@ public class LuckDrawCountServiceImpl extends BaseServiceImpl<Long, LuckDrawCoun
 
 	@Override
 	@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
-	public boolean freeGive(Long userId, int times) {
+	public boolean freeGive(Long userId, int times,Integer groupId) {
 		boolean isInsert = false;
 		LuckDrawCount luckDrawCount = luckDrawCountDao.getLock(userId);
 		if (luckDrawCount == null) {
@@ -40,6 +40,7 @@ public class LuckDrawCountServiceImpl extends BaseServiceImpl<Long, LuckDrawCoun
 			luckDrawCount.setUserId(userId);
 			isInsert = true;
 		}
+		luckDrawCount.setGroupId(groupId);
 		luckDrawCount.setAvailableCount(luckDrawCount.getAvailableCount() + times);
 		luckDrawCount.setModifyOn(new Date());
 

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

@@ -640,18 +640,19 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 
         OrderTypeEnum type = OrderTypeEnum.SPORADIC;
         if (chargeInfo.getChargeType().equals(SporadicChargeTypeEnum.DOUBLE_ELEVEN2020)) {
-            type = OrderTypeEnum.DOUBLE_ELEVEN2020;
-
-            String startTimeStr = sysConfigDao.findConfigValue(SysConfigService.START_TIME_OF_1111);
-            String endTimeStr = sysConfigDao.findConfigValue(SysConfigService.END_TIME_OF_1111);
-            Date startTime = sdf_ymdhms.parse(startTimeStr);
-            Date endTime = sdf_ymdhms.parse(endTimeStr);
-            if (date.before(startTime)) {
-                throw new Exception("活动暂未开始，请您耐心等待！");
-            }
-            if (date.after(endTime)) {
-                throw new Exception("活动已结束，谢谢您的支持！");
-            }
+            throw new Exception("活动已结束，谢谢您的支持！");
+//            type = OrderTypeEnum.DOUBLE_ELEVEN2020;
+//
+//            String startTimeStr = sysConfigDao.findConfigValue(SysConfigService.START_TIME_OF_1111);
+//            String endTimeStr = sysConfigDao.findConfigValue(SysConfigService.END_TIME_OF_1111);
+//            Date startTime = sdf_ymdhms.parse(startTimeStr);
+//            Date endTime = sdf_ymdhms.parse(endTimeStr);
+//            if (date.before(startTime)) {
+//                throw new Exception("活动暂未开始，请您耐心等待！");
+//            }
+//            if (date.after(endTime)) {
+//                throw new Exception("活动已结束，谢谢您的支持！");
+//            }
         }
 
         Integer userId = sporadicPayDto.getUserId();

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

@@ -20,6 +20,7 @@ import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.page.PageInfo;
+import com.ym.mec.common.redis.service.RedisCache;
 import com.ym.mec.common.service.IdGeneratorService;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.thirdparty.message.MessageSenderPluginContext;
@@ -145,7 +146,9 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
     @Autowired
     private CourseScheduleTeacherSalaryService courseScheduleTeacherSalaryService;
     @Autowired
-    private RedisTemplate<String,Object> redisTemplate;
+    private RedisCache<String, Object> redisCache;
+    @Autowired
+    private LuckDrawCountService luckDrawCountService;
 
     private static Map<Integer, Map<Integer, List<Integer>>> schoolSubjectTeachersMap;
 
@@ -4165,48 +4168,24 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         if (studentPaymentOrder.getStatus().equals(DealStatusEnum.SUCCESS)) {
             Date now = new Date();
             Student student = studentDao.get(order.getUserId());
-            Integer activityId = order.getActivityId();
-
-            ActivityUserMapper activityUserMapper = new ActivityUserMapper();
-            activityUserMapper.setActivityId(activityId);
-            activityUserMapper.setUserId(order.getUserId());
-            activityUserMapper.setPaymentOrderId(order.getId());
-            activityUserMapper.setTeacherId(student.getTeacherId());
-            activityUserMapper.setVipFlag(1);
-            activityUserMapperService.insert(activityUserMapper);
-            //是否指定满足赠送会员的条件
-            //是否赠送过会员
-            String memberKey = "2021_double_eleven" + order.getUserId();
-            Boolean aBoolean = redisTemplate.hasKey(memberKey);
-            if(!aBoolean){
-                String startTimeStr = sysConfigDao.findConfigValue("2021_double_eleven_start_time");
-                Date startTime = DateUtil.stringToDate(startTimeStr);
-                String endTimeStr = sysConfigDao.findConfigValue("2021_double_eleven_end_time");
-                Date endTime = DateUtil.stringToDate(endTimeStr);
-                if (order.getCreateTime().compareTo(startTime) >= 0 && order.getCreateTime().compareTo(endTime) <= 0 ) {
-                    //赠送会员
-                    CloudTeacherOrder cloudTeacherOrder = new CloudTeacherOrder();
-                    Date addDate = now;
-                    if (student.getMemberRankSettingId() == null || now.after(student.getMembershipEndTime())) {
-                        cloudTeacherOrder.setStartTime(now);
-                    } else {
-                        addDate = student.getMembershipEndTime();
-                        cloudTeacherOrder.setStartTime(DateUtil.addDays(addDate, 1));
-                    }
-                    cloudTeacherOrder.setEndTime(DateUtil.addMonths(addDate, 1));
-                    cloudTeacherOrder.setRemark("双十一活动赠送会员");
-                    cloudTeacherOrder.setStatus(2);
-                    cloudTeacherOrder.setOrderId(order.getId());
-                    cloudTeacherOrder.setType(2);
-                    cloudTeacherOrder.setAmount(BigDecimal.ZERO);
-                    cloudTeacherOrder.setLevel(1);
-                    cloudTeacherOrder.setStudentId(userId);
-                    cloudTeacherOrder.setOrganId(order.getOrganId());
-                    cloudTeacherOrder.setTime(1);
-                    cloudTeacherOrderDao.insert(cloudTeacherOrder);
-                    studentService.updateMemberRank(cloudTeacherOrder,PeriodEnum.MONTH);
-                }
-            }
+            List<VipGroupActivity> vipGroupActivities = vipGroupActivityDao.queryByIds(order.getActivityId());
+            List<ActivityUserMapper> activityUserMappers = new ArrayList<>();
+            Integer times = 0;
+            for (VipGroupActivity e : vipGroupActivities) {
+                ActivityUserMapper activityUserMapper = new ActivityUserMapper();
+                activityUserMapper.setActivityId(e.getId());
+                activityUserMapper.setUserId(order.getUserId());
+                activityUserMapper.setPaymentOrderId(order.getId());
+                activityUserMapper.setTeacherId(student.getTeacherId());
+                activityUserMapper.setVipFlag(1);
+                activityUserMappers.add(activityUserMapper);
+                times = times + e.getGivePrizeNum();
+            }
+            //赠送抽奖机会
+            if(times > 0){
+                luckDrawCountService.freeGive(order.getUserId().longValue(),times,13);
+            }
+            activityUserMapperService.batchInsert(activityUserMappers);
 
             SysUserCashAccount sysUserCashAccount = sysUserCashAccountService.get(userId);
             //插入缴费明细
@@ -4247,6 +4226,40 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
 //                LOGGER.error(MessageFormatter.arrayFormat("网管课[{}]购买协议错误:{}", order.getMusicGroupId(), e.getMessage()), e);
 //            }
             studentDao.updateStudentServiceTag(userId, null, YesOrNoEnum.YES.getCode());
+            //是否指定满足赠送会员的条件
+            //是否赠送过会员
+            String memberKey = "2021_double_eleven" + order.getUserId();
+            Boolean aBoolean = redisCache.exists(memberKey);
+            if(!aBoolean){
+                String startTimeStr = sysConfigDao.findConfigValue("2021_double_eleven_give_member_start_time");
+                Date startTime = DateUtil.stringToDate(startTimeStr);
+                String endTimeStr = sysConfigDao.findConfigValue("2021_double_eleven_give_member_end_time");
+                Date endTime = DateUtil.stringToDate(endTimeStr);
+                if (order.getCreateTime().compareTo(startTime) >= 0 && order.getCreateTime().compareTo(endTime) <= 0 ) {
+                    //赠送会员
+                    CloudTeacherOrder cloudTeacherOrder = new CloudTeacherOrder();
+                    Date addDate = now;
+                    if (student.getMemberRankSettingId() == null || now.after(student.getMembershipEndTime())) {
+                        cloudTeacherOrder.setStartTime(now);
+                    } else {
+                        addDate = student.getMembershipEndTime();
+                        cloudTeacherOrder.setStartTime(DateUtil.addDays(addDate, 1));
+                    }
+                    cloudTeacherOrder.setEndTime(DateUtil.addMonths(addDate, 1));
+                    cloudTeacherOrder.setRemark("双十一活动赠送会员");
+                    cloudTeacherOrder.setStatus(2);
+                    cloudTeacherOrder.setOrderId(order.getId());
+                    cloudTeacherOrder.setType(2);
+                    cloudTeacherOrder.setAmount(BigDecimal.ZERO);
+                    cloudTeacherOrder.setLevel(1);
+                    cloudTeacherOrder.setStudentId(userId);
+                    cloudTeacherOrder.setOrganId(order.getOrganId());
+                    cloudTeacherOrder.setTime(1);
+                    cloudTeacherOrderDao.insert(cloudTeacherOrder);
+                    studentService.updateMemberRank(cloudTeacherOrder,PeriodEnum.MONTH);
+                    redisCache.put(memberKey,userId);
+                }
+            }
         }
         if (studentPaymentOrder.getStatus().equals(DealStatusEnum.FAILED)) {
             if (studentPaymentOrder.getBalancePaymentAmount() != null && studentPaymentOrder.getBalancePaymentAmount().compareTo(BigDecimal.ZERO) > 0) {

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

@@ -48,8 +48,19 @@
 		                                         #{givePracticeFlag},#{memberFlag},#{giveMemberFlag},NOW(),NOW(),#{paymentOrderId},#{vipGroupId},
 		                                         #{giveVipGroupId},#{practiceGroupId},#{givePracticeGroupId},#{returnFee},#{memberOrderId},#{giveMemberOrderId},#{teacherId})
 	</insert>
-	
-	<!-- 根据主键查询一条记录 -->
+    <insert id="batchInsert">
+		INSERT INTO activity_user_mapper (activity_id_,user_id_,vip_flag_,give_vip_flag_,
+		practice_flag_,give_practice_flag_,member_flag_,give_member_flag_,create_time_,update_time_,payment_order_id_,
+		vip_group_id_,give_vip_group_id_,practice_group_id_,give_practice_group_id_,return_fee_,member_order_id_,give_member_order_id_,teacher_id_)
+		VALUES
+		<foreach collection="activityUserMappers" item="item" separator=",">
+			(#{item.activityId},#{item.userId},#{item.vipFlag},#{item.giveVipFlag},#{item.practiceFlag},
+			#{item.givePracticeFlag},#{item.memberFlag},#{item.giveMemberFlag},NOW(),NOW(),#{item.paymentOrderId},#{item.vipGroupId},
+			#{item.giveVipGroupId},#{item.practiceGroupId},#{item.givePracticeGroupId},#{item.returnFee},#{item.memberOrderId},#{item.giveMemberOrderId},#{item.teacherId})
+		</foreach>
+	</insert>
+
+    <!-- 根据主键查询一条记录 -->
 	<update id="update" parameterType="com.ym.mec.biz.dal.entity.ActivityUserMapper">
 		UPDATE activity_user_mapper
 		<set>

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

@@ -39,6 +39,7 @@
 		<result property="giveCourseNum" column="give_course_num_"/>
 		<result property="giveMemberRankId" column="give_member_rank_id_"/>
 		<result property="giveMemberTime" column="give_member_time_"/>
+		<result property="givePrizeNum" column="give_prize_num_"/>
 		<result property="memberRankId" column="member_rank_id_"/>
 		<result property="memberTime" column="member_time_"/>
 		<result property="courseType" column="course_type_"/>
@@ -72,13 +73,13 @@
 										student_max_used_times_, apply_to_student_type_,allow_online_to_offline_,
 										single_course_time_,discount_,full_minus_course_times_,give_course_type_,give_category_id_,give_course_num_
 										,member_rank_id_,member_time_,give_member_rank_id_,give_member_time_,course_type_,
-		                                activity_type_,give_sign_course_time_,is_pay_to_balance_,teach_mode_,give_teach_mode_,period_,give_period_,status_,market_price_)
+		                                activity_type_,give_sign_course_time_,is_pay_to_balance_,teach_mode_,give_teach_mode_,period_,give_period_,status_,market_price_,give_prize_num_)
 		VALUES(#{name},#{description},#{vipGroupCategoryIdList},#{startTime},#{endTime},#{organId},#{coursesStartTime},#{coursesEndTime},
 		       #{salaryReadonlyFlag},#{giveClassPaySalaryFlag},now(),now(),#{salarySettlementJson},#{delFlag},#{paymentReadonlyFlag},#{onlineClassJoinGradientRewards},
 		       #{offlineClassJoinGradientRewards},#{minCourseNum},#{maxCourseNum},#{studentMaxUsedTimes},#{applyToStudentType},#{allowOnlineToOffline},
 			   #{singleCourseTime},#{discount},#{fullMinusCourseTimes},#{giveCourseType},#{giveCategoryId},#{giveCourseNum}
 				  ,#{memberRankId},#{memberTime},#{giveMemberRankId},#{giveMemberTime},#{courseType},#{activityType},#{giveSingleCourseTime},
-		       #{isPayToBalance},#{teachMode},#{giveTeachMode},#{periodEnum},#{givePeriodEnum},#{status},#{marketPrice})
+		       #{isPayToBalance},#{teachMode},#{giveTeachMode},#{periodEnum},#{givePeriodEnum},#{status},#{marketPrice},#{givePrizeNum})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -97,7 +98,7 @@
 		payment_readonly_flag_ = #{paymentReadonlyFlag},online_class_join_gradient_rewards_=#{onlineClassJoinGradientRewards},
 		offline_class_join_gradient_rewards_=#{offlineClassJoinGradientRewards},min_course_num_=#{minCourseNum},
 		max_course_num_=#{maxCourseNum},student_max_used_times_=#{studentMaxUsedTimes},apply_to_student_type_=#{applyToStudentType},
-		allow_online_to_offline_=#{allowOnlineToOffline},end_time_ = #{endTime},market_price_ = #{marketPrice},update_time_ = NOW() WHERE id_ = #{id}
+		allow_online_to_offline_=#{allowOnlineToOffline},end_time_ = #{endTime},market_price_ = #{marketPrice},give_prize_num_ = #{givePrizeNum},update_time_ = NOW() WHERE id_ = #{id}
 	</update>
 
 	<!-- 根据主键删除一条记录 -->

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

@@ -2,6 +2,7 @@ package com.ym.mec.student.controller;
 
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.dao.SysConfigDao;
 import com.ym.mec.biz.dal.dto.BuyDoubleEleven2021Dto;
 import com.ym.mec.biz.dal.dto.HorseRaceLampDto;
 import com.ym.mec.biz.dal.dto.PracticeGroupBuyParamsDto;
@@ -12,6 +13,7 @@ import com.ym.mec.biz.service.*;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.exception.BizException;
+import com.ym.mec.util.date.DateUtil;
 import com.yonge.log.model.AuditLogAnnotation;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -39,6 +41,8 @@ public class ActivityController extends BaseController {
     private LuckDrawCountService luckDrawCountService;
     @Autowired
     private PracticeGroupService practiceGroupService;
+    @Autowired
+    private SysConfigDao sysConfigDao;
 
     @ApiOperation(value = "分部双11活动信息")
     @GetMapping("/doubleEleven2020")
@@ -82,10 +86,21 @@ public class ActivityController extends BaseController {
         return succeed(resultMap);
     }
 
-    @ApiOperation("营销活动购买")
+    @ApiOperation("2021双十一活动购买")
     @PostMapping(value = "/buyDoubleEleven2021")
-    @AuditLogAnnotation(operateName = "营销活动购买")
-    public HttpResponseResult buyDoubleEleven2021(@RequestBody BuyDoubleEleven2021Dto buyDoubleEleven2021Dto){
+    @AuditLogAnnotation(operateName = "2021双十一活动购买")
+    public HttpResponseResult buyDoubleEleven2021(@RequestBody BuyDoubleEleven2021Dto buyDoubleEleven2021Dto) throws Exception {
+        Date nowTime = new Date();
+        String startTimeStr = sysConfigDao.findConfigValue(SysConfigService.START_TIME_OF_1111);
+        Date startTime = DateUtil.stringToDate(startTimeStr);
+        if (startTime.compareTo(nowTime) > 0) {
+            throw new BizException("活动还未开始，谢谢关注");
+        }
+        String endTimeStr = sysConfigDao.findConfigValue(SysConfigService.END_TIME_OF_1111);
+        Date endTime = DateUtil.stringToDate(endTimeStr);
+        if (endTime.compareTo(nowTime) <= 0) {
+            throw new BizException("活动已结束，谢谢关注");
+        }
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             return failed(HttpStatus.FORBIDDEN, "请登录");

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

@@ -1,15 +1,5 @@
 package com.ym.mec.student.controller;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-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.entity.LuckDrawLog;
@@ -20,6 +10,13 @@ import com.ym.mec.biz.service.LuckDrawPrizeService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.util.string.ValueUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 @Api(tags = "抽奖")
 @RestController
@@ -39,7 +36,7 @@ public class LuckDrawController extends BaseController {
 	private SysUserFeignService sysUserFeignService;
 
 	@ApiOperation(value = "查询抽奖记录")
-	@GetMapping(value = "/list", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+	@GetMapping(value = "/list")
 	public Object list(LuckDrawQueryInfo queryInfo) {
 		PageInfo<LuckDrawLog> pageInfo = luckDrawLogService.queryPage(queryInfo);
 		for (LuckDrawLog log : pageInfo.getRows()) {
@@ -49,7 +46,7 @@ public class LuckDrawController extends BaseController {
 	}
 
 	@ApiOperation(value = "查询我的抽奖记录")
-	@GetMapping(value = "/myList", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+	@GetMapping(value = "/myList")
 	public Object myList(LuckDrawQueryInfo queryInfo) {
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		if (sysUser == null) {
@@ -60,7 +57,7 @@ public class LuckDrawController extends BaseController {
 	}
 
 	@ApiOperation(value = "抽奖")
-	@PostMapping(value = "/draw", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+	@PostMapping(value = "/draw")
 	public Object draw(int group) {
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		if (sysUser == null) {
@@ -70,7 +67,7 @@ public class LuckDrawController extends BaseController {
 	}
 
 	@ApiOperation(value = "查询个人抽奖机会")
-	@GetMapping(value = "/queryCount", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+	@GetMapping(value = "/queryCount")
 	public Object queryCount() {
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		if (sysUser == null) {