From 47fcad8f1bf069dde662f5311d7f0dfd670360a4 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 07 十二月 2019 09:19:17 +0800
Subject: [PATCH] 补贴修复
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/PushCouponController.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/PushCouponController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/PushCouponController.java
index 169b300..2e43298 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/PushCouponController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/PushCouponController.java
@@ -3,6 +3,7 @@
import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Date;
import java.util.List;
import javax.annotation.Resource;
@@ -16,8 +17,8 @@
import com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken;
import com.yeshi.fanli.entity.push.PushCoupon;
-import com.yeshi.fanli.exception.PushException;
import com.yeshi.fanli.exception.push.PushCouponException;
+import com.yeshi.fanli.exception.push.PushException;
import com.yeshi.fanli.service.inter.push.PushCouponRecordService;
import com.yeshi.fanli.service.inter.push.PushCouponService;
import com.yeshi.fanli.tag.PageEntity;
@@ -45,18 +46,16 @@
* @param out
*/
@RequestMapping(value = "save")
- public void save(String callback, PushCoupon pushCoupon, String arrayIOS, String arrayAndroid, PrintWriter out) {
+ public void save(String callback, PushCoupon pushCoupon, PrintWriter out) {
try {
- convertVersion(pushCoupon, arrayIOS, arrayAndroid);
-
pushCouponService.save(pushCoupon);
- JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎿嶄綔鎴愬姛"));
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鍙戞斁鎴愬姛"));
} catch (PushCouponException e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
} catch (Exception e) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鍙戦�佸け璐�"));
e.printStackTrace();
}
}
@@ -175,6 +174,8 @@
convertVersionList(pushCouponVO);
+ Date createTime = pushCouponVO.getCreateTime();
+ pushCouponVO.setPushTime(createTime);
listVO.add(pushCouponVO);
}
--
Gitblit v1.8.0