From 310a187c241a30f8bc237bad9af15afb18e68290 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 23 六月 2020 10:50:31 +0800
Subject: [PATCH] 深夜大福利：先抢券，0点准时下单-22点发圈
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SpecialCardAdminController.java | 39 ++++++++++++++++++++++++++++++++++-----
1 files changed, 34 insertions(+), 5 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SpecialCardAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SpecialCardAdminController.java
index 0c9283d..5c6c2c5 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SpecialCardAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SpecialCardAdminController.java
@@ -19,9 +19,9 @@
import com.yeshi.fanli.entity.AppVersionInfo;
import com.yeshi.fanli.entity.bus.homemodule.AdActivityVersionControl;
import com.yeshi.fanli.entity.bus.homemodule.AdActivityVersionControl.AdActivityType;
+import com.yeshi.fanli.entity.bus.homemodule.CommonShareInfo;
import com.yeshi.fanli.entity.bus.homemodule.Special;
import com.yeshi.fanli.entity.bus.homemodule.SpecialCard;
-import com.yeshi.fanli.entity.bus.homemodule.SpecialExtra;
import com.yeshi.fanli.exception.homemodule.SpecialCardException;
import com.yeshi.fanli.exception.homemodule.SpecialException;
import com.yeshi.fanli.service.inter.config.AppVersionService;
@@ -78,6 +78,31 @@
}
}
+
+
+ /**
+ * 鏌ヨ
+ *
+ * @param callback
+ * @param pageIndex
+ * @param pageSize
+ * @param key
+ * 妯＄硦鏌ヨ锛氳鏄庛�佹爣璇�
+ * @param out
+ */
+ @RequestMapping(value = "queryActivity")
+ public void queryActivity(String callback, Integer pageIndex, Integer pageSize, String key, Integer sort,
+ PrintWriter out) {
+
+ List<Long> listPid = new ArrayList<Long>();
+ listPid.add(15L);
+ listPid.add(16L);
+ listPid.add(17L);
+ queryList(callback, pageIndex, pageSize, key, sort, listPid, out);
+ }
+
+
+
/**
* 鏌ヨ
*
@@ -90,6 +115,11 @@
*/
@RequestMapping(value = "query")
public void query(String callback, Integer pageIndex, Integer pageSize, String key, Integer sort, PrintWriter out) {
+ queryList(callback, pageIndex, pageSize, key, sort, null, out);
+ }
+
+ public void queryList(String callback, Integer pageIndex, Integer pageSize, String key, Integer sort,
+ List<Long> listPid, PrintWriter out) {
if (pageIndex == null || pageIndex < 1) {
pageIndex = 1;
@@ -100,14 +130,14 @@
}
try {
- List<SpecialCard> list = specialCardService.listQuery((pageIndex - 1) * pageSize, pageSize, key, sort);
+ List<SpecialCard> list = specialCardService.listQuery((pageIndex - 1) * pageSize, pageSize, key, sort, listPid);
if (list == null || list.size() == 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
return;
}
- long count = specialCardService.countlistQuery(key);
+ long count = specialCardService.countlistQuery(key, listPid);
int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);
@@ -126,7 +156,6 @@
}
}
-
/**
* 鍒犻櫎
*
@@ -166,7 +195,7 @@
* @param out
*/
@RequestMapping(value = "saveSpecial")
- public void saveSpecial(String callback, Special record, String jumpType, SpecialExtra extra, HttpServletRequest request,
+ public void saveSpecial(String callback, Special record, String jumpType, CommonShareInfo extra, HttpServletRequest request,
PrintWriter out) {
try {
// 1. 鍏堝垽鏂環ttpRequest 鏄惁鍚湁鏂囦欢绫诲瀷
--
Gitblit v1.8.0