From e892ea04b56194b6208b5a902f1622f40d4c56a7 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 10 Jul 2021 09:10:08 +0800
Subject: [PATCH] 新增美度正式环境配置
---
zq-erp/src/main/java/com/matrix/system/activity/service/ActivitySignAwardSetService.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/activity/service/ActivitySignAwardSetService.java b/zq-erp/src/main/java/com/matrix/system/activity/service/ActivitySignAwardSetService.java
index aed8a95..905c4fa 100644
--- a/zq-erp/src/main/java/com/matrix/system/activity/service/ActivitySignAwardSetService.java
+++ b/zq-erp/src/main/java/com/matrix/system/activity/service/ActivitySignAwardSetService.java
@@ -53,10 +53,12 @@
//获取当前登录人员信息
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();
shopActivities.setActName(addSignAwardSetDto.getActName());
@@ -109,11 +111,8 @@
if(ObjectUtil.isEmpty(shopActivity)) {
return AjaxResult.buildFailInstance("网络不通畅，请刷新页面");
}
- /**
- * 未发布状态即使达到活动时间也不进入进行中状态
- */
- //未发布状态点击发布，状态变成未开始，且是开启状态
- shopActivity.setActStatus(ShopActivities.ACTSTATUS_STATUS_READY);
+ //未发布状态点击发布，状态变成进行中，且是开启状态
+ shopActivity.setActStatus(ShopActivities.ACTSTATUS_STATUS_ING);
shopActivity.setIsStart(ShopActivities.ACTIVITIES_STATUS_OPEN);
shopActivitiesDao.updateByModel(shopActivity);
return AjaxResult.buildSuccessInstance("操作成功");
@@ -237,8 +236,10 @@
activitySignAwardSetUpdate.setUpdateBy(user.getSuName());
activitySignAwardSetUpdate.setCompanyId(companyId);
activitySignAwardSetUpdate.setActivityId(actId);
+ activitySignAwardSetUpdate.setAwardState(ActivitySignAwardSet.AWARDSTATE_WORK);
activitySignAwardSetDao.insert(activitySignAwardSetUpdate);
}else {
+ activitySignAwardSetUpdate.setAwardState(ActivitySignAwardSet.AWARDSTATE_WORK);
activitySignAwardSetDao.updateById(activitySignAwardSetUpdate);
arrayListUpdate.add(actSubid);
}
--
Gitblit v1.9.1