From d94f23e76aed12b3353f1b5e8413a0303b0ae92e Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 19 Apr 2021 17:10:30 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopActivitiesSignAction.java | 59 +++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 39 insertions(+), 20 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopActivitiesSignAction.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopActivitiesSignAction.java
index eb8cf7e..c172110 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopActivitiesSignAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopActivitiesSignAction.java
@@ -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.*;
@@ -73,7 +73,14 @@
Long userId = loginUser.getId();
//获取签到活动的信息
SignBasicInfoVo signBasicInfoVo = new SignBasicInfoVo();
+ AjaxResult ajaxResult = new AjaxResult();
+
ShopActivities shopActivities = shopActivitiesDao.selectOneByCompanyIdAndActTypeAndActStatus(companyId,ShopActivities.ACTIVITIES_TYPE_SIGN,ShopActivities.ACTSTATUS_STATUS_ING);
+ if(ObjectUtil.isEmpty(shopActivities)){
+ ajaxResult = AjaxResult.buildFailInstance("活动还没有开始");
+ ajaxResult.setData(signBasicInfoVo);
+ return ajaxResult;
+ }
Long actId = shopActivities.getId();
signBasicInfoVo.setActName(shopActivities.getActName());
signBasicInfoVo.setActCode(shopActivities.getActCode());
@@ -81,19 +88,30 @@
String actContent = shopActivities.getActContent();
SignBasicInfoJsonVo signBasicInfoJsonVo = JSON.parseObject(actContent, SignBasicInfoJsonVo.class);
signBasicInfoVo.setSignBasicInfoJsonVo(signBasicInfoJsonVo);
-
- List<ActivitySignAwardSetVo> activitySignAwardSetVos = activitySignAwardSetDao
- .selectListByActIDAndCompanyId(actId,companyId,ActivitySignAwardSet.AWARDSTATE_WORK);
- signBasicInfoVo.setActivitySignAwardSetVos(activitySignAwardSetVos);
- //今日是否已经参与
+ List<ActivitySignAwardSetVo> activitySignAwardSetVos = activitySignAwardSetDao
+ .selectListByActIDAndCompanyId(actId,companyId,ActivitySignAwardSet.AWARDSTATE_WORK);
+ signBasicInfoVo.setActivitySignAwardSetVos(activitySignAwardSetVos);
+
+ //今日是否已经参与
ActivitySignRecord activitySignRecord = activitySignRecordDao.selectOneByActIdAndUserIdLikesignTime(actId,userId,new Date());
if(ObjectUtil.isNotEmpty(activitySignRecord)) {
- signBasicInfoVo.setJoinState(SignBasicInfoVo.JOINSTATE_SIGN);
+ signBasicInfoVo.setJoinState(SignBasicInfoVo.JOINSTATE_SIGN);
}else {
- signBasicInfoVo.setJoinState(SignBasicInfoVo.JOINSTATE_NOTSIGN);
+ signBasicInfoVo.setJoinState(SignBasicInfoVo.JOINSTATE_NOTSIGN);
}
- AjaxResult ajaxResult = AjaxResult.buildSuccessInstance("");
+ /**
+ * 默认获取当前月份
+ * 已经签到的日期
+ */
+ 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;
}
@@ -106,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();
/**
@@ -145,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);
@@ -180,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);
@@ -221,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：店铺商品）
@@ -289,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);
}
--
Gitblit v1.9.1