From c161f76f78fead2519b8a66ab30d6e7389deead1 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Tue, 20 Apr 2021 01:15:02 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger
---
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopActivitiesSignAction.java | 3 ++-
1 files changed, 2 insertions(+), 1 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 a86a59e..da861c3 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
@@ -263,7 +263,8 @@
activitySignReceiveRecord.setUpdateBy(user.getVipName());
activitySignReceiveRecord.setUpdateTime(new Date());
activitySignReceiveRecordDao.insert(activitySignReceiveRecord);
-
+
+ signSuccessVo.setScoreCnt(activitySignAwardSetNormal.getScoreCnt());
signSuccessVo.setNormalAwardName(activitySignAwardSetNormal.getAwardName());
signSuccessVo.setNormalAwardImg(activitySignAwardSetNormal.getIntroduceImg());
}
--
Gitblit v1.9.1