From ee88b54979c633a4ade518d4c124a2d07d378562 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 11 十月 2019 10:56:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/UserSystemCouponAdminController.java | 8 ++------
1 files changed, 2 insertions(+), 6 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..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,6 +13,7 @@
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;
@@ -409,7 +410,6 @@
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;
@@ -430,7 +430,6 @@
couponType = "freeCouponBuy";
}
-
JSONObject data = getChartsData(dateType, year, startTime, endTime, 3, couponType);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
} catch (Exception e) {
@@ -441,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;
@@ -470,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", "鏁伴噺");
@@ -488,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