From e1a62ec62e7331d97af9302e90e1ce44af8235eb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 27 一月 2021 15:26:55 +0800
Subject: [PATCH] 拼多多授权绑定
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/ActivityAdminController.java | 28 +++++++++++++---------------
1 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/ActivityAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/ActivityAdminController.java
index 1fa5233..3c36cb8 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/ActivityAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/ActivityAdminController.java
@@ -8,6 +8,7 @@
import javax.annotation.Resource;
+import com.yeshi.fanli.entity.accept.AdminAcceptData;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.yeshi.utils.JsonUtil;
@@ -19,8 +20,7 @@
import com.yeshi.fanli.entity.bus.activity.RecommendActivityInviteInfo;
import com.yeshi.fanli.exception.ActivityException;
import com.yeshi.fanli.service.inter.activity.ActivityService;
-import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;
-import com.yeshi.fanli.tag.PageEntity;
+import com.yeshi.common.entity.PageEntity;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
@@ -34,8 +34,6 @@
@Resource
private ActivityService activityService;
- @Resource
- private TaoBaoGoodsBriefService taoBaoGoodsBriefService;
/**
* 鑾峰彇娲诲姩鐢ㄦ埛鍒楄〃
@@ -44,7 +42,7 @@
* @param out
*/
@RequestMapping(value = "getActivityUserList")
- public void getUserList(String callback, PrintWriter out) {
+ public void getUserList(AdminAcceptData acceptData, String callback, PrintWriter out) {
List<ActivityUser> list = activityService.getActivityUserList();
if (StringUtil.isNullOrEmpty(callback)) {
out.print(JsonUtil.loadTrueResult(JsonUtil.getSimpleGson().toJson(list)));
@@ -54,7 +52,7 @@
}
@RequestMapping(value = "getActivity")
- public void getActivity(String callback, long id, PrintWriter out) {
+ public void getActivity(AdminAcceptData acceptData,String callback, long id, PrintWriter out) {
try {
RecommendActivity recommendActivity = activityService.getRecommendActivityById(id);
@@ -120,7 +118,7 @@
}
@RequestMapping(value = "addShareGoodsActivity")
- public void addShareGoodsActivity(String callback, Long uid, String actionIds, RecommendActivity activity, PrintWriter out) {
+ public void addShareGoodsActivity(AdminAcceptData acceptData,String callback, Long uid, String actionIds, RecommendActivity activity, PrintWriter out) {
if (uid == null) {
out.print(callback + "(" + JsonUtil.loadFalseResult(1, "璇烽�夋嫨鍙戝竷鐢ㄦ埛") + ")");
@@ -160,7 +158,7 @@
// 淇敼鍟嗗搧鍒嗕韩鍔ㄦ��
@RequestMapping(value = "updateShareGoodsActivity")
- public void updateShareGoodsActivity(String callback, Long uid, String actionIds, RecommendActivity activity, PrintWriter out) {
+ public void updateShareGoodsActivity(AdminAcceptData acceptData,String callback, Long uid, String actionIds, RecommendActivity activity, PrintWriter out) {
if (activity.getId() == null) {
out.print(callback + "(" + JsonUtil.loadFalseResult(1, "璇蜂笂浼營D") + ")");
@@ -219,7 +217,7 @@
* @param out
*/
@RequestMapping(value = "addInviteActivity")
- public void addInviteActivity(String callback, Long uid,RecommendActivity activity, String img,
+ public void addInviteActivity(AdminAcceptData acceptData,String callback, Long uid,RecommendActivity activity, String img,
int px, int py, int size, PrintWriter out) {
if (uid == null) {
@@ -272,7 +270,7 @@
* @param out
*/
@RequestMapping(value = "updateInviteActivity")
- public void updateInviteActivity(String callback, Long uid, RecommendActivity activity, String img,
+ public void updateInviteActivity(AdminAcceptData acceptData,String callback, Long uid, RecommendActivity activity, String img,
int px, int py, int size, PrintWriter out) {
if (activity.getId() == null) {
@@ -325,7 +323,7 @@
* @param out
*/
@RequestMapping(value = "addTextImgActivity")
- public void addTextImgActivity(String callback, Long uid, RecommendActivity activity, String imgs,
+ public void addTextImgActivity(AdminAcceptData acceptData,String callback, Long uid, RecommendActivity activity, String imgs,
PrintWriter out) {
if (uid == null) {
out.print(callback + "(" + JsonUtil.loadFalseResult(1, "璇烽�夋嫨鍙戝竷鐢ㄦ埛") + ")");
@@ -374,7 +372,7 @@
* @param out
*/
@RequestMapping(value = "updateTextImgActivity")
- public void updateTextImgActivity(String callback, Long uid, String imgs, RecommendActivity activity, PrintWriter out) {
+ public void updateTextImgActivity(AdminAcceptData acceptData,String callback, Long uid, String imgs, RecommendActivity activity, PrintWriter out) {
if (activity.getId() == null) {
out.print(callback + "(" + JsonUtil.loadFalseResult(1, "璇蜂笂浼營D") + ")");
@@ -427,7 +425,7 @@
* @param out
*/
@RequestMapping(value = "query")
- public void query(String callback, Integer pageIndex, Integer pageSize, String key, PrintWriter out) {
+ public void query(AdminAcceptData acceptData,String callback, Integer pageIndex, Integer pageSize, String key, PrintWriter out) {
if (pageIndex == null || pageIndex < 1) {
pageIndex = 1;
@@ -492,7 +490,7 @@
@RequestMapping(value = "saveModify")
- public void saveModify(String callback, RecommendActivity recommendActivity, PrintWriter out) {
+ public void saveModify(AdminAcceptData acceptData,String callback, RecommendActivity recommendActivity, PrintWriter out) {
try {
Long id = recommendActivity.getId();
@@ -521,7 +519,7 @@
@RequestMapping(value = "delete")
- public void delete(String callback, String idArray, PrintWriter out) {
+ public void delete(AdminAcceptData acceptData,String callback, String idArray, PrintWriter out) {
if (StringUtil.isNullOrEmpty(idArray)) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇烽�夋嫨鎿嶄綔鐨勬暟鎹�"));
--
Gitblit v1.8.0