From 790515f0b126354b82fad95b5b73d7729cd9919d Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期日, 05 五月 2019 12:16:33 +0800
Subject: [PATCH] 品牌+奖励券推送提交
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/PushCouponController.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 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..155d998 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;
@@ -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