From 7e7db2fa55a9a3af46d4fd8ede0dee147f101d64 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 09 五月 2020 21:41:27 +0800
Subject: [PATCH] 2.1需求
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/UserSystemCouponAdminController.java | 177 -----------------------------------------------------------
1 files changed, 0 insertions(+), 177 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 8f11622..b31365a 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
@@ -2,7 +2,6 @@
import java.io.PrintWriter;
import java.util.List;
-import java.util.Map;
import javax.annotation.Resource;
@@ -12,17 +11,14 @@
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
-import com.yeshi.fanli.controller.admin.utils.AdminUtils;
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;
import com.yeshi.fanli.vo.user.SystemCouponVO;
import com.yeshi.fanli.vo.user.UserSystemCouponCountVO;
-import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
@Controller
@@ -341,179 +337,6 @@
e.printStackTrace();
}
}
-
- /**
- * 濂栧姳鍒告暟閲忔洸绾垮浘
- * @param callback
- * @param dateType
- * @param year
- * @param startTime
- * @param endTime
- * @param out
- */
- @RequestMapping(value = "getRebateCouponUsedNumCharts")
- public void getRebateCouponUsedNumCharts(String callback, Integer dateType, String year, String startTime,
- String endTime, PrintWriter out){
- try {
- String validateMsg = AdminUtils.validateParams(dateType, startTime, endTime);
- if (validateMsg != null) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(validateMsg));
- return;
- }
- JSONObject data = getChartsData(dateType, year, startTime, endTime, 1, null);
- JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
- } catch (Exception e) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("绯荤粺寮傚父"));
- e.printStackTrace();
- }
- }
-
- /**
- * 濂栧姳鍒告暟閲忔洸绾垮浘
- * @param callback
- * @param dateType
- * @param year
- * @param startTime
- * @param endTime
- * @param out
- */
- @RequestMapping(value = "getRebateCouponMoneyCharts")
- public void getRebateCouponMoneyCharts(String callback, Integer dateType, String year, String startTime,
- String endTime, PrintWriter out){
- try {
- String validateMsg = AdminUtils.validateParams(dateType, startTime, endTime);
- if (validateMsg != null) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(validateMsg));
- return;
- }
- JSONObject data = getChartsData(dateType, year, startTime, endTime, 2, null);
- JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
- } catch (Exception e) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("绯荤粺寮傚父"));
- e.printStackTrace();
- }
- }
-
- /**
- * 濂栧姳鍒告暟閲忔洸绾垮浘
- * @param callback
- * @param dateType
- * @param year
- * @param startTime
- * @param endTime
- * @param out
- */
- @RequestMapping(value = "getFreeCouponMoneyCharts")
- public void getFreeCouponMoneyCharts(String callback, Integer dateType, String year, String startTime,
- String endTime, Integer coupon, PrintWriter out){
- try {
-
- if (coupon == null || (coupon.intValue() < 0 && coupon.intValue() > 4)) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鍒哥被鍨嬩笉姝ｇ‘"));
- return;
- }
-
- String validateMsg = AdminUtils.validateParams(dateType, startTime, endTime);
- if (validateMsg != null) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(validateMsg));
- return;
- }
-
- String couponType = null;
- if (coupon == 1) {
- 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));
- } catch (Exception e) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("绯荤粺寮傚父"));
- e.printStackTrace();
- }
- }
-
- 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;
- }
-
- if (dateType == 1 && year != null) {
- year = null;
- } else if (dateType == 2) {
- if (startTime != null)
- startTime = null;
-
- if (endTime != null)
- endTime = null;
-
- } else if (dateType == 3) {
- if (year != null)
- year = null;
-
- if (startTime != null)
- startTime = null;
-
- if (endTime != null)
- endTime = null;
- }
- Gson gson = new Gson();
- List<String> dateList = AdminUtils.getDateList(dateType, startTime, endTime, year);
-
- JSONObject innerList = new JSONObject();
- List<Map<String, Object>> list = null;
- if (source == 1) {
- // 濂栧姳鍒告暟閲�
- innerList.put("name", "鏁伴噺");
- list = userSystemCouponCountService.getRebateCouponUsedNumToCharts(dateType, year,
- startTime, endTime);
- } else if (source == 2) {
- // 濂栧姳鍒搁噾棰�
- innerList.put("name", "閲戦");
- list = userSystemCouponCountService.getRebateCouponMoneyToCharts(dateType, year,
- startTime, endTime);
- } else if (source == 3) {
- // 濂栧姳鍒搁噾棰�
- innerList.put("name", "閲戦");
- list = userSystemCouponCountService.getFreeCouponMoneyToCharts(dateType, year,
- startTime, endTime, couponType);
- }
-
-
- Object objectDate = null;
-
- if (dateType != 3) {
- innerList.put("data", gson.toJson(AdminUtils.dayOrMonthDataFactory(dateType, dateList, list)));
- } else {
- // 骞磋鍥�
- Map<String, Object> map = AdminUtils.yearsDataFactory(list);
-
- if (objectDate == null) {
- objectDate = map.get("date");
- }
- innerList.put("data", gson.toJson(map.get("value")));
- }
-
- JSONArray line_list = new JSONArray();
- line_list.add(innerList);
-
- JSONObject data = new JSONObject();
- if (objectDate != null) {
- data.put("xAxis_list", gson.toJson(objectDate));
- } else {
- data.put("xAxis_list", gson.toJson(dateList));
- }
-
- data.put("line_list", line_list);
- return data;
- }
}
--
Gitblit v1.8.0