From 8f1b5245c592cd6dc5eb5a73f9a0ceb2a85f2048 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 19 一月 2021 18:27:35 +0800
Subject: [PATCH] 外网部署参数修改
---
service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityAssistController.java | 70 ++++++++++++++++++++++++++++++-----
1 files changed, 60 insertions(+), 10 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 cffaafe..3aa6309 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,17 +1,24 @@
package com.ks.daylucky.controller.api.client;
+import com.google.gson.Gson;
import com.ks.daylucky.pojo.DO.UserInfo;
-import com.ks.daylucky.pojo.VO.AcceptData;
-import com.ks.daylucky.pojo.VO.ActivityFriendAssistInfoVO;
-import com.ks.daylucky.pojo.VO.AssistFriendVO;
-import com.ks.daylucky.pojo.VO.SimpleUser;
+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.lucky.pojo.DO.LuckyActivityJoinAssist;
+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.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;
@@ -22,7 +29,6 @@
import javax.annotation.Resource;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -30,11 +36,53 @@
@RequestMapping("api/client/activity/assist")
public class ActivityAssistController {
- @Reference
+ @Reference(version = "1.0.0", check = false)
private LuckyActivityJoinAssistService luckyActivityJoinAssistService;
+
+ @Reference(version = "1.0.0", check = false)
+ private LuckyActivityJoinService luckyActivityJoinService;
+
+ @Reference(version = "1.0.0", check = false)
+ private LuckyActivityService luckyActivityService;
@Resource
private UserInfoService userInfoService;
+
+
+ @ResponseBody
+ @RequestMapping("assist")
+ 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(), dto.getUid() + "");
+ //涓嶅瓨鍦ㄥ姪鍔�
+ if (record == null) {
+ return JsonUtil.loadFalseResult("");
+ }
+
+ try {
+ luckyActivityJoinAssistService.assist(activityId, acceptData.getApp().getId(), acceptData.getUid() + "", record.getUid(), ActivityJoinAssistEvent.assist, 1);
+
+
+ UserInfo user = userInfoService.getUserDetail(Long.parseLong(record.getUid()));
+ JSONObject data = new JSONObject();
+ if (user != null) {
+ //鍔╁姏鎴愬姛
+ data.put("invite", new AssistResultInfoVO(new SimpleUser(user.getId(), user.getNickName(), user.getPortrait()), "閭�璇蜂綘鍔╁姏鎷兼墜姘旀娊濂�"));
+ }
+ return JsonUtil.loadTrueResult(data);
+ } catch (LuckyActivityException e) {
+ e.printStackTrace();
+ } catch (LuckyActivityJoinAssistException e) {
+ e.printStackTrace();
+ }
+
+ return JsonUtil.loadFalseResult("鍔╁姏澶辫触");
+ }
@ResponseBody
@@ -52,12 +100,14 @@
if (uidList.size() > 0) {
Map<Long, UserInfo> userInfoMap = userInfoService.listUserInfoAsMap(UserInfoUtil.getBaseUserList(recordList));
for (ActivityAssistFriend assistFriend : recordList) {
- list.add(new AssistFriendVO(userInfoMap.get(Long.parseLong(assistFriend.getUid())), assistFriend.getAssistCount()));
+ UserInfo user = userInfoMap.get(Long.parseLong(assistFriend.getUid()));
+
+ list.add(new AssistFriendVO(new SimpleUser(user.getId(), user.getNickName(), user.getPortrait()), assistFriend.getAssistCount()));
}
}
}
JSONObject data = new JSONObject();
- data.put("data", JsonUtil.getApiCommonGson().toJson(list));
+ data.put("data", new Gson().toJson(list));
data.put("count", count);
return JsonUtil.loadTrueResult(data);
}
@@ -82,7 +132,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