From 9d35ba657fa5e3add766405d76e3ff8c4dcd4ad4 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 04 七月 2020 15:38:00 +0800
Subject: [PATCH] 多系统兼容优化
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/PushCouponController.java | 10 ++++------
1 files changed, 4 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 2e43298..48e6140 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;
@@ -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,7 +205,6 @@
/**
* 鎺ㄩ��
- * @param id 鎺ㄩ�乮d
* @param out
* @throws Exception
*/
@@ -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