From be67478cae6bf9308f15949a21e7d0a57a3f0ecb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 16 七月 2020 15:37:31 +0800
Subject: [PATCH] dubbo集成修改
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/user/cloud/UserCloudAdminController.java | 32 +++++++++-----------------------
1 files changed, 9 insertions(+), 23 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/user/cloud/UserCloudAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/user/cloud/UserCloudAdminController.java
index d5bb0d3..04d46ea 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/user/cloud/UserCloudAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/user/cloud/UserCloudAdminController.java
@@ -1,11 +1,11 @@
package com.yeshi.fanli.controller.admin.user.cloud;
import java.io.PrintWriter;
-import java.util.ArrayList;
import java.util.List;
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;
@@ -13,26 +13,21 @@
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.yeshi.fanli.entity.bus.user.UserInfo;
-import com.yeshi.fanli.entity.bus.user.UserSystemCoupon;
import com.yeshi.fanli.entity.bus.user.cloud.UserCloud;
import com.yeshi.fanli.entity.bus.user.cloud.UserCloudGoods;
import com.yeshi.fanli.entity.bus.user.cloud.UserCloudGroup;
import com.yeshi.fanli.entity.bus.user.cloud.UserCloudOrder;
import com.yeshi.fanli.entity.bus.user.cloud.UserCloudSendContent;
import com.yeshi.fanli.entity.bus.user.cloud.UserCloudSendRecord;
-import com.yeshi.fanli.entity.system.SystemCoupon.CouponTypeEnum;
import com.yeshi.fanli.log.LogHelper;
-import com.yeshi.fanli.service.inter.dynamic.GoodsEvaluateService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.service.inter.user.cloud.UserCloudGoodsService;
import com.yeshi.fanli.service.inter.user.cloud.UserCloudGroupService;
-import com.yeshi.fanli.service.inter.user.cloud.UserCloudManageService;
import com.yeshi.fanli.service.inter.user.cloud.UserCloudOrderService;
import com.yeshi.fanli.service.inter.user.cloud.UserCloudSendContentService;
import com.yeshi.fanli.service.inter.user.cloud.UserCloudSendRecordService;
import com.yeshi.fanli.service.inter.user.cloud.UserCloudService;
-import com.yeshi.fanli.service.manger.alipay.UserCloudAlipayManager;
-import com.yeshi.fanli.tag.PageEntity;
+import com.yeshi.common.entity.PageEntity;
import com.yeshi.fanli.util.Constant;
import net.sf.json.JSONObject;
@@ -60,15 +55,6 @@
private UserCloudSendRecordService userCloudSendRecordService;
@Resource
- private UserCloudManageService userCloudManageService;
-
- @Resource
- private UserCloudAlipayManager userCloudAlipayManager;
-
- @Resource
- private GoodsEvaluateService goodsEvaluateService;
-
- @Resource
private UserCloudSendContentService userCloudSendContentService;
@@ -82,7 +68,7 @@
* @param out
*/
@RequestMapping(value = "queryOrder")
- public void queryOrder(String callback, Integer pageIndex, Integer pageSize, String key, Integer state, PrintWriter out) {
+ public void queryOrder(AdminAcceptData acceptData, String callback, Integer pageIndex, Integer pageSize, String key, Integer state, PrintWriter out) {
try {
if (pageIndex == null)
pageIndex = 1;
@@ -132,7 +118,7 @@
* @param out
*/
@RequestMapping(value = "queryCloud")
- public void queryCloud(String callback, Integer pageIndex, Integer pageSize, String key, Integer state, PrintWriter out) {
+ public void queryCloud(AdminAcceptData acceptData,String callback, Integer pageIndex, Integer pageSize, String key, Integer state, PrintWriter out) {
try {
if (pageIndex == null)
pageIndex = 1;
@@ -183,7 +169,7 @@
* @param out
*/
@RequestMapping(value = "querySendRecord")
- public void querySendRecord(String callback, Integer pageIndex, Integer pageSize, String key, Integer origin, PrintWriter out) {
+ public void querySendRecord(AdminAcceptData acceptData,String callback, Integer pageIndex, Integer pageSize, String key, Integer origin, PrintWriter out) {
try {
if (pageIndex == null)
pageIndex = 1;
@@ -231,7 +217,7 @@
* @param out
*/
@RequestMapping(value = "getSendContent")
- public void getSendContent(String callback, String pid, PrintWriter out) {
+ public void getSendContent(AdminAcceptData acceptData,String callback, String pid, PrintWriter out) {
try {
List<UserCloudSendContent> list = userCloudSendContentService.getByPid(pid);
if (list == null || list.size() == 0) {
@@ -265,7 +251,7 @@
* @param out
*/
@RequestMapping(value = "getUserGroups")
- public void getUserGroups(String callback, Long uid, PrintWriter out) {
+ public void getUserGroups(AdminAcceptData acceptData,String callback, Long uid, PrintWriter out) {
try {
List<UserCloudGroup> list = userCloudGroupService.listByUid(uid);
if (list == null || list.size() == 0) {
@@ -302,7 +288,7 @@
* @param out
*/
@RequestMapping(value = "queryGoodsList")
- public void queryGoodsList(String callback, Integer pageIndex, Integer pageSize, String key, PrintWriter out) {
+ public void queryGoodsList(AdminAcceptData acceptData,String callback, Integer pageIndex, Integer pageSize, String key, PrintWriter out) {
try {
if (pageIndex == null)
pageIndex = 1;
@@ -352,7 +338,7 @@
* @param out
*/
@RequestMapping(value = "statisticsCloud")
- public void statisticsCloud(String callback, Long uid, PrintWriter out) {
+ public void statisticsCloud(AdminAcceptData acceptData,String callback, Long uid, PrintWriter out) {
try {
long orderNum = userCloudOrderService.countOrderRecord(uid, 1);
long recordNum = userCloudSendRecordService.countRecordNum(uid, null);
--
Gitblit v1.8.0