From 9434605b2a844d3efa511415b15a43c44f21755b Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 15 Apr 2021 19:41:28 +0800
Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop
---
zq-erp/src/main/java/com/matrix/system/activity/service/ActivitySignAwardSetService.java | 5 ++++-
1 files changed, 4 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..aed8a95 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);
//更新活动主表信息
--
Gitblit v1.9.1