From eec7e789a87863c25d92c10ad5dfc22ad80c448d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 14 七月 2020 12:36:48 +0800
Subject: [PATCH] 系统区分BUG修复
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/user/cloud/UserCloudAdminController.java | 50 +++++++++++++++++++++++++++++++++++---------------
1 files changed, 35 insertions(+), 15 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 7259ae5..f9b9204 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,10 +1,12 @@
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;
@@ -12,12 +14,14 @@
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;
@@ -57,15 +61,6 @@
private UserCloudSendRecordService userCloudSendRecordService;
@Resource
- private UserCloudManageService userCloudManageService;
-
- @Resource
- private UserCloudAlipayManager userCloudAlipayManager;
-
- @Resource
- private GoodsEvaluateService goodsEvaluateService;
-
- @Resource
private UserCloudSendContentService userCloudSendContentService;
@@ -79,7 +74,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;
@@ -129,7 +124,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;
@@ -180,7 +175,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;
@@ -228,7 +223,7 @@
* @param out
*/
@RequestMapping(value = "getSendContent")
- public void getSendContent(String callback, String pid, Integer origin, 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) {
@@ -262,7 +257,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) {
@@ -299,7 +294,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;
@@ -341,4 +336,29 @@
}
+
+ /**
+ * 鍙戝湀璁板綍缁熻
+ * @param callback
+ * @param uid
+ * @param out
+ */
+ @RequestMapping(value = "statisticsCloud")
+ public void statisticsCloud(AdminAcceptData acceptData,String callback, Long uid, PrintWriter out) {
+ try {
+ long orderNum = userCloudOrderService.countOrderRecord(uid, 1);
+ long recordNum = userCloudSendRecordService.countRecordNum(uid, null);
+ long goodsNum = userCloudGoodsService.countByUid(uid);
+
+ JSONObject data = new JSONObject();
+ data.put("orderNum", orderNum);
+ data.put("recordNum", recordNum);
+ data.put("goodsNum", goodsNum);
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
+ } catch (Exception e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
+ e.printStackTrace();
+ }
+ }
+
}
--
Gitblit v1.8.0