From 0e001c62f48700847ab05e4cc30fe679bd1056fb Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 22 Apr 2021 15:58:12 +0800
Subject: [PATCH] 20210422 签到
---
zq-erp/src/main/java/com/matrix/system/activity/action/ActivitySignAwardSetAction.java | 38 ++++++++++++++++++++++++++++----------
1 files changed, 28 insertions(+), 10 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/activity/action/ActivitySignAwardSetAction.java b/zq-erp/src/main/java/com/matrix/system/activity/action/ActivitySignAwardSetAction.java
index 997821c..c22744d 100644
--- a/zq-erp/src/main/java/com/matrix/system/activity/action/ActivitySignAwardSetAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/activity/action/ActivitySignAwardSetAction.java
@@ -1,30 +1,29 @@
package com.matrix.system.activity.action;
+import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.matrix.core.constance.MatrixConstance;
import com.matrix.core.pojo.AjaxResult;
import com.matrix.core.tools.StringUtils;
-import com.matrix.system.activity.dto.ActivitiesListDto;
-import com.matrix.system.activity.dto.AddSignAwardSetDto;
-import com.matrix.system.activity.dto.BeCloseDto;
-import com.matrix.system.activity.dto.BeReadyDto;
-import com.matrix.system.activity.dto.CouponDto;
-import com.matrix.system.activity.dto.DelRowDto;
-import com.matrix.system.activity.dto.GoodsDto;
-import com.matrix.system.activity.dto.SignForUpdateDto;
-import com.matrix.system.activity.dto.SignReceiveListDto;
-import com.matrix.system.activity.dto.UpdateSignAwardSetDto;
+import com.matrix.core.tools.WebUtil;
+import com.matrix.system.activity.dto.*;
import com.matrix.system.activity.service.ActivitySignAwardSetService;
import com.matrix.system.activity.vo.ActivitiesListVo;
import com.matrix.system.activity.vo.CouponVo;
import com.matrix.system.activity.vo.GoodsVo;
import com.matrix.system.activity.vo.SignReceiveListVo;
+import com.matrix.system.common.bean.SysUsers;
import com.matrix.system.hive.action.util.QueryUtil;
+import com.matrix.system.shopXcx.bean.ShopActivities;
+import com.matrix.system.shopXcx.dao.ShopActivitiesDao;
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.web.bind.annotation.*;
+
+import java.util.List;
/**
* @description 奖品设置表
@@ -37,6 +36,25 @@
@Autowired
private ActivitySignAwardSetService activitySignAwardSetService;
+ @Autowired
+ private ShopActivitiesDao shopActivitiesDao;
+
+ /**
+ * 马上创建签到活动
+ */
+ @PostMapping(value = "/createSignAwardSet")
+ public @ResponseBody
+ AjaxResult createSignAwardSet() {
+ //获取当前登录人员信息
+ SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
+ Long companyId = user.getCompanyId();
+ //签到活动的唯一性
+ List<ShopActivities> shopActivitiesDone = shopActivitiesDao.selectOneByCompanyIdAndActType(companyId,ShopActivities.ACTIVITIES_TYPE_SIGN);
+ if(CollUtil.isNotEmpty(shopActivitiesDone)){
+ return new AjaxResult(AjaxResult.STATUS_FAIL, "签到活动已经创建，请去活动管理菜单查看");
+ }
+ return new AjaxResult(AjaxResult.STATUS_SUCCESS, "");
+ }
/**
* 新增签到活动
--
Gitblit v1.9.1