双十一活动

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

@@ -670,13 +670,18 @@ public class VipGroupActivityServiceImpl extends BaseServiceImpl<Integer, VipGro
 				doubleElevenUserLog.setUserId(studentPaymentOrder.getUserId());
 				doubleElevenUserLog.setCreateTime(now);
 				doubleElevenUserLog.setOrganId(studentPaymentOrder.getOrganId());
-				if(DateUtil.contents(giveStartTime,giveEndTime,now)){
+				//杭州不送保养套装
+				if(!studentPaymentOrder.getOrganId().equals(4) && DateUtil.contents(giveStartTime,giveEndTime,now)){
 					//符合赠送条件，赠送乐保套装
 					doubleElevenUserLog.setGiveFlag(true);
 				}
 				tempBuyDoubleElevenUserLogDao.insert(doubleElevenUserLog);
 				//赠送抽奖机会
-				luckDrawCountService.freeGive(studentPaymentOrder.getUserId().longValue(),Integer.parseInt(jsonDto.getValue()),5);
+				Integer groupId = 3;
+				if(studentPaymentOrder.getOrganId().equals(4)){
+					groupId = 4;
+				}
+				luckDrawCountService.freeGive(studentPaymentOrder.getUserId().longValue(),Integer.parseInt(jsonDto.getValue()),groupId);
 			}
 		}
 	}

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

@@ -62,9 +62,6 @@ public class ActivityController extends BaseController {
     @PostMapping(value = "/buyDoubleEleven")
     @AuditLogAnnotation(operateName = "2022双十一活动购买")
     public HttpResponseResult buyDoubleEleven(@RequestBody BuyDoubleEleven2022Dto buyDoubleEleven2022Dto) throws Exception {
-//        String startTimeStr = sysConfigDao.findConfigValue(SysConfigService.START_TIME_OF_1111);
-//        String endTimeStr = sysConfigDao.findConfigValue(SysConfigService.END_TIME_OF_1111);
-//        SysConfigService.checkActivityDate(startTimeStr,endTimeStr);
         if(StringUtils.isEmpty(buyDoubleEleven2022Dto.getActivityIdList())){
             throw new BizException("请选择活动");
         }
@@ -92,11 +89,13 @@ public class ActivityController extends BaseController {
     @RequestMapping("/doubleEleven2022")
     public HttpResponseResult doubleEleven2022(){
         SysUser sysUser = sysUserService.getUser();
-        Map<String,Object> resultMap = new HashMap<>(5);
+        Map<String,Object> resultMap = new HashMap<>(6);
         List<ActivityDetailDto> activityDetailDtos = marketActivityService.queryActivity(3, sysUser.getOrganId());
         resultMap.put("activityDetailList",activityDetailDtos);
         resultMap.put("startTime",null);
         resultMap.put("endTime",null);
+        //是否是杭州分部
+        resultMap.put("HZFlag",sysUser.getOrganId().equals(4));
         if(activityDetailDtos != null && activityDetailDtos.size() > 0){
             ActivityDetailDto activityDetailDto = activityDetailDtos.get(0);
             resultMap.put("startTime",activityDetailDto.getStartTime());

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

@@ -1,5 +1,6 @@
 package com.ym.mec.student.controller;
 
+import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.entity.LuckDrawLog;
 import com.ym.mec.biz.dal.page.LuckDrawQueryInfo;
 import com.ym.mec.biz.service.LuckDrawCountService;
@@ -37,8 +38,12 @@ public class LuckDrawController extends BaseController {
 	@ApiOperation(value = "查询抽奖记录")
 	@GetMapping(value = "/list")
 	public Object list(LuckDrawQueryInfo queryInfo) {
+		SysUser user = sysUserService.getUser();
 		if(!queryInfo.getAllFlag()){
-			queryInfo.setUserId(sysUserService.getUserId());
+			queryInfo.setUserId(user.getId());
+		}
+		if(queryInfo.getGroupId().equals(3) && user.getOrganId().equals(4)){
+			queryInfo.setGroupId(4);
 		}
 		PageInfo<LuckDrawLog> pageInfo = luckDrawLogService.queryPage(queryInfo);
 		for (LuckDrawLog log : pageInfo.getRows()) {
@@ -50,20 +55,32 @@ public class LuckDrawController extends BaseController {
 	@ApiOperation(value = "查询我的抽奖记录")
 	@GetMapping(value = "/myList")
 	public Object myList(LuckDrawQueryInfo queryInfo) {
-		queryInfo.setUserId(sysUserService.getUserId());
+		SysUser user = sysUserService.getUser();
+		if(queryInfo.getGroupId().equals(3) && user.getOrganId().equals(4)){
+			queryInfo.setGroupId(4);
+		}
+		queryInfo.setUserId(user.getId());
 		return succeed(luckDrawLogService.queryPage(queryInfo));
 	}
 
 	@ApiOperation(value = "抽奖")
 	@PostMapping(value = "/draw")
 	public Object draw(Integer groupId) {
-		return succeed(luckDrawPrizeService.draw((long) sysUserService.getUserId(), groupId));
+		SysUser user = sysUserService.getUser();
+		if(groupId.equals(3) && user.getOrganId().equals(4)){
+			groupId = 4;
+		}
+		return succeed(luckDrawPrizeService.draw((long) user.getId(), groupId));
 	}
 
 	@ApiOperation(value = "查询个人抽奖机会")
 	@GetMapping(value = "/queryCount")
 	public Object queryCount(Integer groupId) {
-		return succeed(luckDrawCountService.findByIdAndGroupId(sysUserService.getUserId(),groupId));
+		SysUser user = sysUserService.getUser();
+		if(groupId.equals(3) && user.getOrganId().equals(4)){
+			groupId = 4;
+		}
+		return succeed(luckDrawCountService.findByIdAndGroupId(user.getId(),groupId));
 	}
 
 }