From 7912a94e5de72b628bde39b16e6c7b21172910eb Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 08 六月 2020 17:15:39 +0800
Subject: [PATCH] 2.1.2bug
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/user/cloud/UserCloudAdminController.java | 185 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 183 insertions(+), 2 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 cb32b04..7259ae5 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
@@ -13,15 +13,20 @@
import com.google.gson.GsonBuilder;
import com.yeshi.fanli.entity.bus.user.UserInfo;
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.log.LogHelper;
import com.yeshi.fanli.service.inter.dynamic.GoodsEvaluateService;
-import com.yeshi.fanli.service.inter.order.OrderHongBaoMoneyComputeService;
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;
@@ -49,7 +54,7 @@
private UserInfoService userInfoService;
@Resource
- private OrderHongBaoMoneyComputeService orderHongBaoMoneyComputeService;
+ private UserCloudSendRecordService userCloudSendRecordService;
@Resource
private UserCloudManageService userCloudManageService;
@@ -59,6 +64,9 @@
@Resource
private GoodsEvaluateService goodsEvaluateService;
+
+ @Resource
+ private UserCloudSendContentService userCloudSendContentService;
@@ -160,4 +168,177 @@
LogHelper.errorDetailInfo(e);
}
}
+
+
+ /**
+ * 鏌ヨ鍙戦�佽褰�
+ * @param callback
+ * @param pageIndex
+ * @param pageSize
+ * @param key
+ * @param origin
+ * @param out
+ */
+ @RequestMapping(value = "querySendRecord")
+ public void querySendRecord(String callback, Integer pageIndex, Integer pageSize, String key, Integer origin, PrintWriter out) {
+ try {
+ if (pageIndex == null)
+ pageIndex = 1;
+ if (pageSize == null)
+ pageSize = Constant.PAGE_SIZE;
+ List<UserCloudSendRecord> list = userCloudSendRecordService.query(pageIndex, pageSize, key, origin);
+ if (list == null || list.size() == 0) {
+ out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁")));
+ return;
+ }
+
+ for (UserCloudSendRecord userCloud: list) {
+ UserInfo userInfo = userInfoService.getUserByIdWithMybatis(userCloud.getUid());
+ if (userInfo == null)
+ continue;
+
+ userCloud.setNickName(userInfo.getNickName());
+ userCloud.setPortrait(userInfo.getPortrait());
+ }
+
+ GsonBuilder gsonBuilder = new GsonBuilder();
+ gsonBuilder.serializeNulls(); // 閲嶇偣
+ Gson gson = gsonBuilder.setDateFormat("yyyy/MM/dd HH:mm:ss").create();
+
+ long count = userCloudSendRecordService.count(key, origin);
+ int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
+ PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);
+
+ JSONObject data = new JSONObject();
+ data.put("pe", pe);
+ data.put("list", gson.toJson(list));
+ out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));
+ } catch (Exception e) {
+ out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父")));
+ e.printStackTrace();
+ LogHelper.errorDetailInfo(e);
+ }
+ }
+
+ /**
+ * 鏌ヨ鍙戦�佸唴瀹�
+ * @param callback
+ * @param pid
+ * @param origin
+ * @param out
+ */
+ @RequestMapping(value = "getSendContent")
+ public void getSendContent(String callback, String pid, Integer origin, PrintWriter out) {
+ try {
+ List<UserCloudSendContent> list = userCloudSendContentService.getByPid(pid);
+ if (list == null || list.size() == 0) {
+ out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁")));
+ return;
+ }
+
+ GsonBuilder gsonBuilder = new GsonBuilder();
+ gsonBuilder.serializeNulls(); // 閲嶇偣
+ Gson gson = gsonBuilder.setDateFormat("yyyy/MM/dd HH:mm:ss").create();
+
+ long count = list.size();
+ int totalPage = (int) (count % 20 == 0 ? count / 20 : count / 20 + 1);
+ PageEntity pe = new PageEntity(1, 20, count, totalPage);
+
+ JSONObject data = new JSONObject();
+ data.put("pe", pe);
+ data.put("list", gson.toJson(list));
+ out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));
+ } catch (Exception e) {
+ out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父")));
+ e.printStackTrace();
+ LogHelper.errorDetailInfo(e);
+ }
+ }
+
+ /**
+ * 鏌ヨ鐢ㄦ埛缇や俊鎭�
+ * @param callback
+ * @param uid
+ * @param out
+ */
+ @RequestMapping(value = "getUserGroups")
+ public void getUserGroups(String callback, Long uid, PrintWriter out) {
+ try {
+ List<UserCloudGroup> list = userCloudGroupService.listByUid(uid);
+ if (list == null || list.size() == 0) {
+ out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁")));
+ return;
+ }
+
+ GsonBuilder gsonBuilder = new GsonBuilder();
+ gsonBuilder.serializeNulls(); // 閲嶇偣
+ Gson gson = gsonBuilder.setDateFormat("yyyy/MM/dd HH:mm:ss").create();
+
+ long count = list.size();
+ int totalPage = (int) (count % 20 == 0 ? count / 20 : count / 20 + 1);
+ PageEntity pe = new PageEntity(1, 20, count, totalPage);
+
+ JSONObject data = new JSONObject();
+ data.put("pe", pe);
+ data.put("list", gson.toJson(list));
+ out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));
+ } catch (Exception e) {
+ out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父")));
+ e.printStackTrace();
+ LogHelper.errorDetailInfo(e);
+ }
+ }
+
+
+ /**
+ * 寮�閫氭垚鍔熻褰�
+ * @param callback
+ * @param pageIndex
+ * @param key
+ * @param state
+ * @param out
+ */
+ @RequestMapping(value = "queryGoodsList")
+ public void queryGoodsList(String callback, Integer pageIndex, Integer pageSize, String key, PrintWriter out) {
+ try {
+ if (pageIndex == null)
+ pageIndex = 1;
+ if (pageSize == null)
+ pageSize = Constant.PAGE_SIZE;
+
+ List<UserCloudGoods> list = userCloudGoodsService.query(pageIndex, pageSize, key);
+ if (list == null || list.size() == 0) {
+ out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁")));
+ return;
+ }
+
+ for (UserCloudGoods userCloud: list) {
+ UserInfo userInfo = userInfoService.getUserByIdWithMybatis(userCloud.getUid());
+ if (userInfo == null)
+ continue;
+
+ userCloud.setNickName(userInfo.getNickName());
+ userCloud.setPortrait(userInfo.getPortrait());
+ }
+
+ GsonBuilder gsonBuilder = new GsonBuilder();
+ gsonBuilder.serializeNulls(); // 閲嶇偣
+ Gson gson = gsonBuilder.setDateFormat("yyyy/MM/dd HH:mm:ss").create();
+
+ long count = userCloudGoodsService.count(key);
+ int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
+ PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);
+
+ JSONObject data = new JSONObject();
+ data.put("pe", pe);
+ data.put("list", gson.toJson(list));
+ out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));
+ } catch (Exception e) {
+ out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父")));
+ e.printStackTrace();
+ LogHelper.errorDetailInfo(e);
+ }
+ }
+
+
}
--
Gitblit v1.8.0