~jiangyouyao/beauty-erp.git

			@@ -1,5 +1,6 @@
			package com.matrix.system.shopXcx.api.action;

			import cn.hutool.core.collection.CollUtil;
			import cn.hutool.core.date.DateTime;
			import cn.hutool.core.date.DateUtil;
			import cn.hutool.core.util.ObjectUtil;
			@@ -19,7 +20,6 @@
			import com.matrix.system.activity.entity.ActivitySignRecord;
			import com.matrix.system.activity.entity.ActivitySignWriteoff;
			import com.matrix.system.hive.bean.SysVipInfo;
			import com.matrix.system.shopXcx.api.dto.ClickSignDTO;
			import com.matrix.system.shopXcx.api.dto.SeeAwardTextDto;
			import com.matrix.system.shopXcx.api.dto.SignAwardDto;
			import com.matrix.system.shopXcx.api.vo.*;
			@@ -100,6 +100,17 @@
			}else {
			signBasicInfoVo.setJoinState(SignBasicInfoVo.JOINSTATE_NOTSIGN);
			}
			/**
			* 默认获取当前月份
			* 已经签到的日期
			*/
			List<ActivitySignRecordVo> activitySignRecordVos = activitySignRecordDao.selectRecordByMonth(actId,userId,DateUtil.date());
			if(CollUtil.isNotEmpty(activitySignRecordVos)){
			signBasicInfoVo.setActivitySignRecords(activitySignRecordVos);
			}
			//累计签到日期
			int cumulativeDay = getCumulativeDay(actId, userId, DateUtil.date(), 0);
			signBasicInfoVo.setActAumulativeDay(cumulativeDay);
			ajaxResult = AjaxResult.buildSuccessInstance("");
			ajaxResult.setData(signBasicInfoVo);
			return ajaxResult;
			@@ -113,11 +124,12 @@
			@ApiResponses({
			@ApiResponse(code = 200, message = "ok", response = SignSuccessVo.class)
			})
			@PostMapping(value = "/clickSign")

			@GetMapping(value = "/clickSign/{actId}")
			@ResponseBody
			@Transactional
			public AjaxResult clickSign(@RequestBody ClickSignDTO clickSignDTO) {
			public AjaxResult clickSign(@PathVariable("actId") long actId) {
			SysVipInfo user = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
			long actId = clickSignDTO.getActId();
			Long userId = user.getId();
			Long companyId = user.getCompanyId();
			/**
			@@ -152,9 +164,9 @@
			ActivitySignRecord activitySignRecordOld = activitySignRecordDao.selectOneByActIdAndUserIdLikesignTime(actId,userId,offsetDay);
			ActivitySignRecord activitySignRecordAdd = new ActivitySignRecord();
			activitySignRecordAdd.setCompanyId(companyId);
			activitySignRecordAdd.setCreateBy(user.getName());
			activitySignRecordAdd.setCreateBy(user.getVipName());
			activitySignRecordAdd.setCreateTime(new Date());
			activitySignRecordAdd.setUpdateBy(user.getName());
			activitySignRecordAdd.setUpdateBy(user.getVipName());
			activitySignRecordAdd.setUpdateTime(new Date());
			activitySignRecordAdd.setActivityId(actId);
			activitySignRecordAdd.setSignTime(date);
			@@ -187,9 +199,9 @@
			activitySignReceiveRecord.setState(ActivitySignReceiveRecord.STATE_DONE);
			activitySignReceiveRecord.setActivityId(actId);
			activitySignReceiveRecord.setCompanyId(companyId);
			activitySignReceiveRecord.setCreateBy(user.getName());
			activitySignReceiveRecord.setCreateBy(user.getVipName());
			activitySignReceiveRecord.setCreateTime(new Date());
			activitySignReceiveRecord.setUpdateBy(user.getName());
			activitySignReceiveRecord.setUpdateBy(user.getVipName());
			activitySignReceiveRecord.setUpdateTime(new Date());
			activitySignReceiveRecordDao.insert(activitySignReceiveRecord);

			@@ -228,9 +240,9 @@
			activitySignReceiveRecord.setActivityId(actId);
			activitySignReceiveRecord.setCompanyId(companyId);
			activitySignReceiveRecord.setState(ActivitySignReceiveRecord.STATE_DONE);
			activitySignReceiveRecord.setCreateBy(user.getName());
			activitySignReceiveRecord.setCreateBy(user.getVipName());
			activitySignReceiveRecord.setCreateTime(new Date());
			activitySignReceiveRecord.setUpdateBy(user.getName());
			activitySignReceiveRecord.setUpdateBy(user.getVipName());
			activitySignReceiveRecord.setUpdateTime(new Date());
			/**
			* 奖项类型（1：自定义产品2：积分3：优惠券4：店铺商品）
			@@ -296,9 +308,9 @@
			activitySignWriteoff.setUserId(userId);
			activitySignWriteoff.setCompanyId(companyId);
			activitySignWriteoff.setReceiveId(activitySignReceiveRecord.getId());
			activitySignWriteoff.setCreateBy(user.getName());
			activitySignWriteoff.setCreateBy(user.getVipName());
			activitySignWriteoff.setCreateTime(new Date());
			activitySignWriteoff.setUpdateBy(user.getName());
			activitySignWriteoff.setUpdateBy(user.getVipName());
			activitySignWriteoff.setUpdateTime(new Date());
			activitySignWriteoffDao.insert(activitySignWriteoff);
			}