From a9f950c0d11a687a7a940443b8c765f6d87ae4f1 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 20 Apr 2021 00:26:22 +0800
Subject: [PATCH] 合并新的修改
---
zq-erp/src/main/java/com/matrix/system/activity/service/ActivitySignAwardSetService.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 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 8839bcd..01910f4 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,6 +53,9 @@
//获取当前登录人员信息
SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
Long companyId = user.getCompanyId();
+ /**
+ * todo签到活动的唯一性
+ */
//新增活动主表信息
ShopActivities shopActivities = new ShopActivities();
@@ -189,7 +192,7 @@
//获取当前登录人员信息
QueryUtil.setQueryLimitCom(updateSignAwardSetDto);
SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
- Long actId = updateSignAwardSetDto.getActId();
+ Long actId = updateSignAwardSetDto.getActMainId();
Long companyId = user.getCompanyId();
ShopActivities shopActivity = shopActivitiesDao.selectById(actId);
//更新活动主表信息
@@ -234,8 +237,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