From 01955bc3f6e6eec6d82a5a3848efde1fa6cc8137 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 30 九月 2020 17:29:26 +0800
Subject: [PATCH] 云发单优化
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/redpack/RedPackRecordAdminController.java | 77 ++++++++++++++++++++++++++++++++++++--
1 files changed, 73 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/redpack/RedPackRecordAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/redpack/RedPackRecordAdminController.java
index 70ebdcf..01fc19c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/redpack/RedPackRecordAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/redpack/RedPackRecordAdminController.java
@@ -5,6 +5,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;
@@ -12,11 +13,14 @@
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.yeshi.fanli.entity.redpack.RedPackDetail;
+import com.yeshi.fanli.entity.redpack.RedPackWinInvite;
+import com.yeshi.fanli.entity.redpack.RedPackWinInvite.RedPackWinInviteTypeEnum;
import com.yeshi.fanli.service.inter.redpack.RedPackBalanceService;
import com.yeshi.fanli.service.inter.redpack.RedPackDetailService;
import com.yeshi.fanli.service.inter.redpack.RedPackExchangeService;
+import com.yeshi.fanli.service.inter.redpack.RedPackWinInviteService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
-import com.yeshi.fanli.tag.PageEntity;
+import com.yeshi.common.entity.PageEntity;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.vo.redpack.RedPackBalanceVO;
@@ -37,6 +41,9 @@
@Resource
private RedPackDetailService redPackDetailService;
+
+ @Resource
+ private RedPackWinInviteService redPackWinInviteService;
/**
@@ -49,8 +56,8 @@
* @param out
*/
@RequestMapping(value = "query")
- public void query(String callback, Integer pageIndex, Integer pageSize, String key, Integer state,
- Integer order, PrintWriter out) {
+ public void query(AdminAcceptData acceptData, String callback, Integer pageIndex, Integer pageSize, String key, Integer state,
+ Integer order, PrintWriter out) {
if (pageIndex == null || pageIndex < 1) {
pageIndex = 1;
}
@@ -105,7 +112,7 @@
* @param out
*/
@RequestMapping(value = "queryDetail")
- public void queryDetail(String callback, Integer pageIndex, Integer pageSize, String key, Long uid, Integer type,
+ public void queryDetail(AdminAcceptData acceptData,String callback, Integer pageIndex, Integer pageSize, String key, Long uid, Integer type,
PrintWriter out) {
if (pageIndex == null || pageIndex < 1) {
pageIndex = 1;
@@ -146,4 +153,66 @@
}
}
+
+ /**
+ * 鏄庣粏鏌ヨ
+ * @param callback
+ * @param pageIndex
+ * @param pageSize
+ * @param key 鎼滅储锛氭殏鍙彁渚泆id
+ * @param type 绫诲瀷锛�1璧犻�� 2浣跨敤 3浣撶幇 4鎵ｉ櫎
+ * @param out
+ */
+ @RequestMapping(value = "queryInviteWin")
+ public void queryInviteWin(AdminAcceptData acceptData,String callback, Integer pageIndex, Integer pageSize, String key, Integer status,
+ PrintWriter out) {
+ if (pageIndex == null || pageIndex < 1) {
+ pageIndex = 1;
+ }
+
+ if (pageSize == null || pageSize < 1) {
+ pageSize = Constant.PAGE_SIZE;
+ }
+
+ String type = null;
+ if (status != null) {
+ if (status == 0) {
+ type = RedPackWinInviteTypeEnum.zeroStageReward.name();
+ } else if (status == 1) {
+ type = RedPackWinInviteTypeEnum.oneStageReward.name();
+ } else if (status == 2) {
+ type = RedPackWinInviteTypeEnum.twoStageReward.name();
+ } else if (status == 3) {
+ type = RedPackWinInviteTypeEnum.threeStageReward.name();
+ }
+ }
+
+ try {
+ List<RedPackWinInvite> list = redPackWinInviteService.query(pageIndex, pageSize, key, type);
+ if (list == null || list.size() == 0) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏈煡鎵惧埌鐩稿叧淇℃伅"));
+ return;
+ }
+
+ for (RedPackWinInvite win: list) {
+ win.setInviter(userInfoService.selectByPKey(win.getUid()));
+ win.setInvitee(userInfoService.selectByPKey(win.getTeamUid()));
+ }
+
+ long count = redPackWinInviteService.count(key, type);
+ int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
+ PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);
+ GsonBuilder gsonBuilder = new GsonBuilder();
+ gsonBuilder.serializeNulls();
+ Gson gson = gsonBuilder.setDateFormat("yyyy/MM/dd HH:mm:ss").create();
+
+ JSONObject data = new JSONObject();
+ data.put("pe", pe);
+ data.put("result_list", gson.toJson(list));
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
+ } catch (Exception e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
+ e.printStackTrace();
+ }
+ }
}
--
Gitblit v1.8.0