From 478e6722fd36bf9b5d8608c8cca2000190da5496 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 22 十二月 2020 19:16:15 +0800
Subject: [PATCH] 功能完善
---
service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityAssistController.java | 28 +++++++++++++++++++++-------
1 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityAssistController.java b/service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityAssistController.java
index e533dc1..f505300 100644
--- a/service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityAssistController.java
+++ b/service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityAssistController.java
@@ -1,18 +1,23 @@
package com.ks.daylucky.controller.api.client;
import com.ks.daylucky.pojo.DO.UserInfo;
+import com.ks.daylucky.pojo.DTO.AssistJoinInfoDTO;
import com.ks.daylucky.pojo.VO.*;
import com.ks.daylucky.service.UserInfoService;
import com.ks.daylucky.util.Constant;
+import com.ks.daylucky.util.RSAUtil;
import com.ks.daylucky.util.UserInfoUtil;
+import com.ks.daylucky.util.activity.ActivityUtil;
import com.ks.lucky.exception.LuckyActivityException;
import com.ks.lucky.exception.LuckyActivityJoinAssistException;
-import com.ks.lucky.pojo.DO.LuckyActivityJoinAssist;
+import com.ks.lucky.pojo.DO.ActivityJoinAssistEvent;
+import com.ks.lucky.pojo.DO.LuckyActivity;
import com.ks.lucky.pojo.DO.LuckyActivityJoinRecord;
import com.ks.lucky.pojo.DTO.ActivityAssistFriend;
import com.ks.lucky.pojo.DTO.ActivityFriendAssistInfo;
import com.ks.lucky.remote.service.LuckyActivityJoinAssistService;
import com.ks.lucky.remote.service.LuckyActivityJoinService;
+import com.ks.lucky.remote.service.LuckyActivityService;
import net.sf.json.JSONObject;
import org.apache.dubbo.config.annotation.Reference;
import org.springframework.stereotype.Controller;
@@ -30,11 +35,14 @@
@RequestMapping("api/client/activity/assist")
public class ActivityAssistController {
- @Reference
+ @Reference(version = "1.0.0")
private LuckyActivityJoinAssistService luckyActivityJoinAssistService;
- @Resource
+ @Reference(version = "1.0.0")
private LuckyActivityJoinService luckyActivityJoinService;
+
+ @Reference(version = "1.0.0")
+ private LuckyActivityService luckyActivityService;
@Resource
private UserInfoService userInfoService;
@@ -42,15 +50,21 @@
@ResponseBody
@RequestMapping("assist")
- public String assist(AcceptData acceptData, Long activityId, Long joinId, int page) {
- LuckyActivityJoinRecord record = luckyActivityJoinService.getJoinRecord(joinId);
+ public String assist(AcceptData acceptData, Long activityId, String joinInfo) {
+ AssistJoinInfoDTO dto = ActivityUtil.parseShareJoinInfo(joinInfo);
+ if (dto == null) {
+ return JsonUtil.loadFalseResult("鍙備笌淇℃伅瑙ｆ瀽澶辫触");
+ }
+
+
+ LuckyActivityJoinRecord record = luckyActivityJoinService.getJoinInfo(activityId, acceptData.getApp().getId(), acceptData.getUid() + "");
//涓嶅瓨鍦ㄥ姪鍔�
if (record == null) {
return JsonUtil.loadFalseResult("");
}
try {
- luckyActivityJoinAssistService.assist(activityId, acceptData.getApp().getId(), acceptData.getUid() + "", record.getUid(), LuckyActivityJoinAssist.ActivityJoinAssistEvent.assist, 1);
+ luckyActivityJoinAssistService.assist(activityId, acceptData.getApp().getId(), acceptData.getUid() + "", record.getUid(), ActivityJoinAssistEvent.assist, 1);
UserInfo user = userInfoService.getUserDetail(Long.parseLong(record.getUid()));
@@ -115,7 +129,7 @@
if (user != null) {
List<String> eventList = new ArrayList<>();
if (info.getEventList() != null) {
- for (LuckyActivityJoinAssist.ActivityJoinAssistEvent event : info.getEventList()) {
+ for (ActivityJoinAssistEvent event : info.getEventList()) {
eventList.add(event.getName());
}
}
--
Gitblit v1.8.0