From 37f89b3118620daa2277e227c2abdb574496ef56 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 19 十二月 2020 16:16:40 +0800
Subject: [PATCH] bug修复
---
service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityAssistController.java | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 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 f0d0a97..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,19 +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.ActivityJoinAssistEvent;
-import com.ks.lucky.pojo.DO.LuckyActivityJoinAssist;
+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;
@@ -31,11 +35,14 @@
@RequestMapping("api/client/activity/assist")
public class ActivityAssistController {
- @Reference(version = "1.0")
+ @Reference(version = "1.0.0")
private LuckyActivityJoinAssistService luckyActivityJoinAssistService;
- @Reference(version = "1.0")
+ @Reference(version = "1.0.0")
private LuckyActivityJoinService luckyActivityJoinService;
+
+ @Reference(version = "1.0.0")
+ private LuckyActivityService luckyActivityService;
@Resource
private UserInfoService userInfoService;
@@ -43,8 +50,14 @@
@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("");
--
Gitblit v1.8.0