From 7b64e3cebf5e95f57875d59198809b874f6c41fb Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 21 Apr 2021 15:59:35 +0800
Subject: [PATCH] merge score_shop
---
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopActivitiesSignAction.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopActivitiesSignAction.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopActivitiesSignAction.java
index 00a854b..c172110 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopActivitiesSignAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopActivitiesSignAction.java
@@ -107,11 +107,10 @@
List<ActivitySignRecordVo> activitySignRecordVos = activitySignRecordDao.selectRecordByMonth(actId,userId,DateUtil.date());
if(CollUtil.isNotEmpty(activitySignRecordVos)){
signBasicInfoVo.setActivitySignRecords(activitySignRecordVos);
- signBasicInfoVo.setActAumulativeDay(activitySignRecordVos.size());
- }else{
- signBasicInfoVo.setActAumulativeDay(0);
}
-
+ //累计签到日期
+ int cumulativeDay = getCumulativeDay(actId, userId, DateUtil.date(), 0);
+ signBasicInfoVo.setActAumulativeDay(cumulativeDay);
ajaxResult = AjaxResult.buildSuccessInstance("");
ajaxResult.setData(signBasicInfoVo);
return ajaxResult;
--
Gitblit v1.9.1