From f4a0f2acc63d7785eab108419a4e16f5f688cb95 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 18 一月 2020 12:06:27 +0800
Subject: [PATCH] 用户注册信息
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/UserSystemCouponAdminController.java | 81 ++++++++++++++++++++++++++++++++++++----
1 files changed, 73 insertions(+), 8 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/UserSystemCouponAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/UserSystemCouponAdminController.java
index a2f6c35..699c8a2 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/UserSystemCouponAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/UserSystemCouponAdminController.java
@@ -13,7 +13,10 @@
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.yeshi.fanli.controller.admin.utils.AdminUtils;
+import com.yeshi.fanli.dto.ChartTDO;
+import com.yeshi.fanli.entity.bus.user.UserSystemCouponGiveRecord;
import com.yeshi.fanli.service.inter.count.UserSystemCouponCountService;
+import com.yeshi.fanli.service.inter.user.UserSystemCouponGiveRecordService;
import com.yeshi.fanli.tag.PageEntity;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
@@ -29,6 +32,9 @@
@Resource
private UserSystemCouponCountService userSystemCouponCountService;
+
+ @Resource
+ private UserSystemCouponGiveRecordService userSystemCouponGiveRecordService;
/**
* 鐢ㄦ埛濂栧姳鍒稿垪琛�
@@ -147,7 +153,7 @@
return;
}
- long count = userSystemCouponCountService.countSystemCouponFree(key);
+ long count = list.size();
int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);
@@ -275,6 +281,68 @@
e.printStackTrace();
}
}
+
+
+
+ /**
+ * 鏌ヨ璧犻�佸厤鍒�
+ * @param callback
+ * @param pageIndex
+ * @param pageSize
+ * @param key
+ * @param type 1璧犻�佸厤鍗曞埜 銆�2-濂栧姳鍒�
+ * @param state
+ * @param out
+ */
+ @RequestMapping(value = "listGiveCoupon")
+ public void listGiveCoupon(String callback, Integer pageIndex, Integer pageSize, String key, Integer type,
+ Integer state, PrintWriter out) {
+
+ if (pageIndex == null || pageIndex < 1) {
+ pageIndex = 1;
+ }
+
+ if (pageSize == null || pageSize < 1) {
+ pageSize = Constant.PAGE_SIZE;
+ }
+
+ String couponType = null;
+ if (type != null) {
+ if (type == 1) {
+ couponType = "freeCouponGive";
+ } else if (type == 2){
+ couponType = "rebatePercentCoupon";
+ }
+ }
+
+ try {
+ List<UserSystemCouponGiveRecord> list = userSystemCouponGiveRecordService.listGiveRecord((pageIndex - 1) * pageSize,
+ pageSize, couponType, state);
+
+ if (list == null || list.size() == 0) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
+ return;
+ }
+
+ long count = userSystemCouponGiveRecordService.countGiveRecord(couponType, state);
+
+ 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();
+ }
+ }
+
/**
* 濂栧姳鍒告暟閲忔洸绾垮浘
@@ -342,8 +410,7 @@
public void getFreeCouponMoneyCharts(String callback, Integer dateType, String year, String startTime,
String endTime, Integer coupon, PrintWriter out){
try {
-
- if (coupon == null || (coupon != 1 && coupon != 2)) {
+ if (coupon == null || (coupon.intValue() < 0 && coupon.intValue() > 4)) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鍒哥被鍨嬩笉姝ｇ‘"));
return;
}
@@ -359,8 +426,9 @@
couponType = "freeCoupon";
} else if (coupon == 2){
couponType = "welfareFreeCoupon";
+ } else if (coupon == 3){
+ couponType = "freeCouponBuy";
}
-
JSONObject data = getChartsData(dateType, year, startTime, endTime, 3, couponType);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
@@ -372,7 +440,6 @@
public JSONObject getChartsData(Integer dateType, String year, String startTime,
String endTime, int source, String couponType) throws Exception {
-
if (dateType != 1 && (!StringUtil.isNullOrEmpty(startTime) || !StringUtil.isNullOrEmpty(endTime))) {
startTime = null;
endTime = null;
@@ -401,7 +468,7 @@
List<String> dateList = AdminUtils.getDateList(dateType, startTime, endTime, year);
JSONObject innerList = new JSONObject();
- List<Map<String, Object>> list = null;
+ List<ChartTDO> list = null;
if (source == 1) {
// 濂栧姳鍒告暟閲�
innerList.put("name", "鏁伴噺");
@@ -419,9 +486,7 @@
startTime, endTime, couponType);
}
-
Object objectDate = null;
-
if (dateType != 3) {
innerList.put("data", gson.toJson(AdminUtils.dayOrMonthDataFactory(dateType, dateList, list)));
} else {
--
Gitblit v1.8.0