From e0d4647635dd7ca974e2f147da254e8cefe6821a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 16 十二月 2020 18:27:10 +0800
Subject: [PATCH] 商品列表,商品详情接口完善
---
service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityController.java | 16 ++++++----------
1 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityController.java b/service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityController.java
index f08268c..a669bf6 100644
--- a/service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityController.java
+++ b/service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityController.java
@@ -1,18 +1,12 @@
package com.ks.daylucky.controller.api.client;
-import com.ks.daylucky.pojo.DO.ActivityTag;
-import com.ks.daylucky.pojo.DO.UserInfo;
import com.ks.daylucky.pojo.VO.AcceptData;
-import com.ks.daylucky.pojo.VO.ActivityDetailInfoVO;
-import com.ks.daylucky.pojo.VO.SimpleUser;
+import com.ks.daylucky.pojo.DTO.ActivityDetailInfoDTO;
import com.ks.daylucky.service.ActivityService;
import com.ks.daylucky.service.ActivityTagService;
import com.ks.daylucky.service.UserInfoService;
import com.ks.daylucky.util.Constant;
-import com.ks.daylucky.util.UserInfoUtil;
import com.ks.lucky.pojo.DO.LuckyActivity;
-import com.ks.lucky.pojo.DO.LuckyActivityJoinRecord;
-import com.ks.lucky.pojo.DTO.ActivitySimpleUser;
import com.ks.lucky.remote.service.LuckyActivityJoinService;
import com.ks.lucky.remote.service.LuckyActivityService;
import net.sf.json.JSONObject;
@@ -24,7 +18,6 @@
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
-import java.util.Map;
@Controller
@RequestMapping("api/client/activity")
@@ -56,7 +49,7 @@
@ResponseBody
@RequestMapping("getActivityDetail")
public String getActivityDetail(AcceptData acceptData, Long activityId) {
- ActivityDetailInfoVO vo = activityService.getActivityDetail(activityId, acceptData.getApp().getId(), acceptData.getUid(), true, 20, false);
+ ActivityDetailInfoDTO vo = activityService.getActivityDetail(activityId, acceptData.getApp().getId(), acceptData.getUid(), true, 20, false);
if (vo == null) {
return JsonUtil.loadFalseResult("娲诲姩涓嶅瓨鍦�");
}
@@ -84,7 +77,10 @@
activityIds.add(activity.getId());
}
}
- List<ActivityDetailInfoVO> voList = activityService.getActivityDetail(activityIds, acceptData.getApp().getId(), acceptData.getUid(), false);
+ List<ActivityDetailInfoDTO> voList = activityService.getActivityDetail(activityIds, acceptData.getApp().getId(), acceptData.getUid(), false);
+
+
+
JSONObject data = new JSONObject();
data.put("data", voList);
data.put("count", count);
--
Gitblit v1.8.0