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, ""); } /** * 新增签到活动 zq-erp/src/main/java/com/matrix/system/activity/service/ActivitySignAwardSetService.java
@@ -53,9 +53,11 @@ //获取当前登录人员信息 SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY); Long companyId = user.getCompanyId(); /** * todo签到活动的唯一性 */ //签到活动的唯一性 List<ShopActivities> shopActivitiesDone = shopActivitiesDao.selectOneByCompanyIdAndActType(companyId,ShopActivities.ACTIVITIES_TYPE_SIGN); if(CollUtil.isNotEmpty(shopActivitiesDone)){ return new AjaxResult(AjaxResult.STATUS_FAIL, "签到活动只能创建一次"); } //新增活动主表信息 ShopActivities shopActivities = new ShopActivities(); zq-erp/src/main/java/com/matrix/system/shopXcx/dao/ShopActivitiesDao.java
@@ -59,4 +59,6 @@ public ShopActivities selectOneByCompanyIdAndActTypeAndActStatus(@Param("companyId")Long companyId, @Param("activitiesTypeSign")int activitiesTypeSign, @Param("actstatusStatusIng")int actstatusStatusIng); List<ShopActivities> selectOneByCompanyIdAndActType(@Param("companyId")Long companyId,@Param("activitiesTypeSign") int activitiesTypeSign); } zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesDao.xml
@@ -428,4 +428,15 @@ and a.act_type=#{activitiesTypeSign} and a.act_status=#{actstatusStatusIng} </select> <select id="selectOneByCompanyIdAndActType" resultType="com.matrix.system.shopXcx.bean.ShopActivities"> SELECT * FROM shop_activities a where a.company_id=#{companyId} and a.act_type=#{activitiesTypeSign} and a.act_status != 5 </select> </mapper> zq-erp/src/main/resources/templates/views/admin/activity/activity-market.html
@@ -31,6 +31,7 @@ .image { width: 100%; height: 100%; display: block; } @@ -58,9 +59,9 @@ <el-card class="box-card" :body-style="{ padding: '10px 10px'}"> <img src="../../../images/sign/meiriqiandao.png" class="image"> <div style="padding: 5px;"> <span style="padding:5px;font-size: 30px;">每日签到</span> <span style="padding:5px;font-size: 18px;">每日签到</span> <div class="bottom clearfix"> <el-button type="primary" class="button" @click="createSign()" round>马上创建</el-button> <el-button type="primary" size="mini" class="button" @click="createSign()" round>马上创建</el-button> </div> </div> </el-card> @@ -69,9 +70,9 @@ <el-card class="box-card" :body-style="{ padding: '10px 10px'}"> <img src="../../../images/sign/tiantianpingtuan.png" class="image"> <div style="padding: 5px;"> <span style="padding:5px;font-size: 30px;">拼团</span> <span style="padding:5px;font-size: 18px;">拼团</span> <div class="bottom clearfix"> <el-button type="primary" class="button" @click="openAdd(1)" round>马上创建</el-button> <el-button type="primary" size="mini" class="button" @click="openAdd(1)" round>马上创建</el-button> </div> </div> </el-card> @@ -80,9 +81,9 @@ <el-card class="box-card" :body-style="{ padding: '10px 10px'}"> <img src="../../../images/sign/jisumiaosha.png" class="image"> <div style="padding: 5px;"> <span style="padding:5px;font-size: 30px;">秒杀</span> <span style="padding:5px;font-size: 18px;">秒杀</span> <div class="bottom clearfix"> <el-button type="primary" class="button" @click="openSecKill()" round>马上创建</el-button> <el-button type="primary" size="mini" class="button" @click="openSecKill()" round>马上创建</el-button> </div> </div> </el-card> @@ -91,9 +92,9 @@ <el-card class="box-card" :body-style="{ padding: '10px 10px'}"> <img src="../../../images/sign/shalonghuodong.png" class="image"> <div style="padding: 5px;"> <span style="padding:5px;font-size: 30px;">沙龙</span> <span style="padding:5px;font-size: 18px;">沙龙</span> <div class="bottom clearfix"> <el-button type="primary" class="button" @click="openSalon()" round>马上创建</el-button> <el-button type="primary" size="mini" class="button" @click="openSalon()" round>马上创建</el-button> </div> </div> </el-card> @@ -126,6 +127,8 @@ methods: { //跳转到设置签到活动 createSign(){ $.AjaxProxy().invoke(basePath + "/admin/activitySignAwardSet/createSignAwardSet", function(loj) { if (loj[0].result.status == '200') { layer.full(layer.open({ type: 2, title: "签到管理", @@ -133,6 +136,13 @@ area: [MUI.SIZE_L, '500px'], content : [ basePath + '/admin/redirect/activity/activity-sign'] })); }else{ _this.$message({ message: data.info, type: 'success', }); } }); }, // 打新增拼团界面 openAdd(value) {
