From 81d53759ac39b04db592412d19c68ea09b0683cd Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 19 Apr 2021 14:42:58 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopActivitiesSignAction.java | 129 ++++++++++++++++++++++++++++++++++---------
1 files changed, 102 insertions(+), 27 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 8ebd7e9..e027a03 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
@@ -5,6 +5,8 @@
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.matrix.component.redis.RedisUserLoginUtils;
import com.matrix.core.pojo.AjaxResult;
import com.matrix.core.tools.StringUtils;
@@ -17,22 +19,21 @@
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.vo.ActivitySignAwardSetVo;
-import com.matrix.system.shopXcx.api.vo.SignBasicInfoJsonVo;
-import com.matrix.system.shopXcx.api.vo.SignBasicInfoVo;
-import com.matrix.system.shopXcx.api.vo.SignSuccessVo;
+import com.matrix.system.shopXcx.api.dto.SeeAwardTextDto;
+import com.matrix.system.shopXcx.api.dto.SignAwardDto;
+import com.matrix.system.shopXcx.api.vo.*;
import com.matrix.system.shopXcx.bean.ShopActivities;
import com.matrix.system.shopXcx.dao.ShopActivitiesDao;
+import com.matrix.system.shopXcx.vo.SalesOrderVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
-import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
@@ -71,7 +72,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());
@@ -79,19 +87,19 @@
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("");
+ ajaxResult = AjaxResult.buildSuccessInstance("");
ajaxResult.setData(signBasicInfoVo);
return ajaxResult;
}
@@ -104,11 +112,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();
/**
@@ -143,9 +152,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);
@@ -178,9 +187,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);
@@ -188,7 +197,7 @@
signSuccessVo.setNormalAwardImg(activitySignAwardSetNormal.getIntroduceImg());
}
//获取当前累计天数
- int cumulativeDay = getCumulativeDay(actId, userId, date, 1);
+ int cumulativeDay = getCumulativeDay(actId, userId, date, 0);
//自定义奖励
QueryWrapper<ActivitySignAwardSet> queryWrapperCumulativeDay = new QueryWrapper<>();
queryWrapperCumulativeDay.eq("award_rule",ActivitySignAwardSet.AWARDRULE_CUMULATIVEDAY);
@@ -219,9 +228,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：店铺商品）
@@ -279,13 +288,17 @@
activitySignWriteoff.setActId(actId);
activitySignWriteoff.setAwardId(activitySignAwardSetCumulativeDay.getId());
activitySignWriteoff.setWinTime(date);
- activitySignWriteoff.setState(ActivitySignWriteoff.STATE_ONE);
+ if(ActivitySignAwardSet.AWARDWAY_TWO == activitySignAwardSetCumulativeDay.getAwardWay()) {
+ activitySignWriteoff.setState(ActivitySignWriteoff.STATE_TWO);
+ }else {
+ activitySignWriteoff.setState(ActivitySignWriteoff.STATE_ONE);
+ }
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);
}
@@ -312,6 +325,68 @@
return getCumulativeDay(actId,userId,offsetDay,i);
}
+ /**
+ * 获取累计的签到奖品
+ *
+ * @return
+ */
+ @ApiOperation(value = "获取累计的签到奖品", notes = "")
+ @PostMapping(value = "/getSignAwardList")
+ @ApiResponses({
+ @ApiResponse(code = 200, message = "ok", response = SignAwardListVo.class)
+ })
+ public AjaxResult getSignAwardList(@RequestBody @Validated SignAwardDto signAwardDto) {
+ SysVipInfo loginUser = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
+ Page<SalesOrderVo> page=new Page<>(signAwardDto.getPageNum(),signAwardDto.getPageSize());
+ if(StringUtils.isBlank(signAwardDto.getSort())){
+ signAwardDto.setSort("create_time");
+ signAwardDto.setOrder("desc");
+ }
+ signAwardDto.setUserId(loginUser.getId());
+ signAwardDto.setCompanyId(loginUser.getCompanyId());
+ IPage<SignAwardListVo> signAwardListVos = activitySignReceiveRecordDao.selectSignAwardList(page,signAwardDto);
+ AjaxResult result=AjaxResult.buildSuccessInstance(signAwardListVos.getRecords());
+ return result;
+ }
+
+ /**
+ * 查看劵码
+ *
+ * @return
+ */
+ @ApiOperation(value = "查看劵码", notes = "")
+ @PostMapping(value = "/seeAwardText")
+ @ApiResponses({
+ @ApiResponse(code = 200, message = "ok", response = SeeAwardTextVo.class)
+ })
+ public AjaxResult seeAwardText(@RequestBody @Validated SeeAwardTextDto seeAwardTextDto) {
+ SysVipInfo loginUser = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
+ seeAwardTextDto.setUserId(loginUser.getId());
+ seeAwardTextDto.setCompanyId(loginUser.getCompanyId());
+ SeeAwardTextVo seeAwardTextVO = activitySignReceiveRecordDao.selectSeeAwardTextVOById(seeAwardTextDto);
+ AjaxResult result=AjaxResult.buildSuccessInstance(seeAwardTextVO);
+ return result;
+ }
+
+ /**
+ * 物流配送确认
+ *
+ * @return
+ */
+ @ApiOperation(value = "查看劵码", notes = "")
+ @PostMapping(value = "/logisticsInsure")
+ @ApiResponses({
+ @ApiResponse(code = 200, message = "ok", response = SeeAwardTextVo.class)
+ })
+ public AjaxResult logisticsInsure(@RequestBody @Validated SeeAwardTextDto seeAwardTextDto) {
+ SysVipInfo loginUser = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
+ seeAwardTextDto.setUserId(loginUser.getId());
+ seeAwardTextDto.setCompanyId(loginUser.getCompanyId());
+ SeeAwardTextVo seeAwardTextVO = activitySignReceiveRecordDao.selectSeeAwardTextVOById(seeAwardTextDto);
+ AjaxResult result=AjaxResult.buildSuccessInstance(seeAwardTextVO);
+ return result;
+ }
+
--
Gitblit v1.9.1