From fe646416d8d46de7b896ddbf65a3ad0cd30b729b Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 15 七月 2020 16:05:56 +0800
Subject: [PATCH] 大淘客与好单库与主包剥离
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/PushCouponController.java | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 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 2e43298..13317ab 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
@@ -8,6 +8,7 @@
import javax.annotation.Resource;
+import com.yeshi.fanli.entity.accept.AdminAcceptData;
import org.apache.commons.beanutils.PropertyUtils;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -46,7 +47,7 @@
* @param out
*/
@RequestMapping(value = "save")
- public void save(String callback, PushCoupon pushCoupon, PrintWriter out) {
+ public void save(AdminAcceptData acceptData,String callback, PushCoupon pushCoupon, PrintWriter out) {
try {
pushCouponService.save(pushCoupon);
@@ -68,7 +69,7 @@
* @param out
*/
@RequestMapping(value = "delete")
- public void delete(String callback, String idArray, PrintWriter out) {
+ public void delete(AdminAcceptData acceptData,String callback, String idArray, PrintWriter out) {
try {
if (StringUtil.isNullOrEmpty(idArray)) {
@@ -102,7 +103,7 @@
* @param out
*/
@RequestMapping(value = "getPushInfo")
- public void getPushInfo(String callback, Long id, PrintWriter out) {
+ public void getPushInfo(AdminAcceptData acceptData,String callback, Long id, PrintWriter out) {
if (id == null) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鍙傛暟涓嶈兘涓虹┖"));
@@ -143,7 +144,7 @@
* @param out
*/
@RequestMapping(value = "query")
- public void query(String callback, Integer pageIndex, Integer pageSize, String key, Integer state, PrintWriter out) {
+ public void query(AdminAcceptData acceptData, String callback, Integer pageIndex, Integer pageSize, String key, Integer state, PrintWriter out) {
if (pageIndex == null || pageIndex < 1) {
pageIndex = 1;
@@ -155,7 +156,7 @@
try {
- List<PushCoupon> list = pushCouponService.listQuery((pageIndex - 1) * pageSize, pageSize, key, state);
+ List<PushCoupon> list = pushCouponService.listQuery((pageIndex - 1) * pageSize, pageSize, key, state,acceptData.getSystem());
if (list == null || list.size() == 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
@@ -180,7 +181,7 @@
listVO.add(pushCouponVO);
}
- long count = pushCouponService.countQuery(key, state);
+ long count = pushCouponService.countQuery(key, state,acceptData.getSystem());
int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);
@@ -204,12 +205,11 @@
/**
* 鎺ㄩ��
- * @param id 鎺ㄩ�乮d
* @param out
* @throws Exception
*/
@RequestMapping(value = "push")
- public void push(String callback, String idArray, PrintWriter out) throws Exception {
+ public void push(AdminAcceptData acceptData,String callback, String idArray, PrintWriter out) throws Exception {
if (idArray == null || idArray.trim().length() == 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("浼犻�掑弬鏁颁笉鑳戒负绌�"));
@@ -243,7 +243,6 @@
/**
* 鐗堟湰杞崲涓簂ist
- * @param pushGoods
*/
public void convertVersionList(PushCouponVO pushCouponVO) {
String versions = pushCouponVO.getVersions();
@@ -271,7 +270,6 @@
/**
* 杞崲json
- * @param pushGoods
*/
public void convertVersion(PushCoupon pushCoupon, String arrayIOS, String arrayAndroid) {
--
Gitblit v1.8.0