双十一活动

mec-student/src/main/java/com/ym/mec/student/controller/LuckDrawController.java

@@ -64,7 +64,12 @@ public class LuckDrawController extends BaseController {
 			String startTime = sysConfigDao.findConfigValue("start_time_of_1111");
 			String endTime = sysConfigDao.findConfigValue("end_time_of_1111");
 			if(DateUtil.contents(startTime,endTime,new Date())){
-				List<LuckDrawLog> log = JSONObject.parseArray(str, LuckDrawLog.class);
+				List<LuckDrawLog> log;
+				if(user.getOrganId().equals(4)){
+					log = JSONObject.parseArray(str, LuckDrawLog.class);
+				}else {
+					log = JSONObject.parseArray(str2, LuckDrawLog.class);
+				}
 				pageInfo.getRows().addAll(log);
 				pageInfo.setTotal(pageInfo.getTotal() + log.size());
 			}
@@ -144,5 +149,39 @@ public class LuckDrawController extends BaseController {
 			"    {\"user\": {\"username\": \"王胜利\"},\"luckDrawPrize\":{\"name\": \"瑞夫纳帽卡\"}},\n" +
 			"    {\"user\": {\"username\": \"李木子\"},\"luckDrawPrize\":{\"name\": \"弯得林优选笛头\"}}\n" +
 			"]";
+	private static String str2 = "[\n" +
+			"    {\"user\": {\"username\": \"陈昊然\"},\"luckDrawPrize\":{\"name\": \"SoonyAngle盲盒\"}},\n" +
+			"    {\"user\": {\"username\": \"王木槿\"},\"luckDrawPrize\":{\"name\": \"宇航员蓝牙音箱\"}},\n" +
+			"    {\"user\": {\"username\": \"刘天钧\"},\"luckDrawPrize\":{\"name\": \"喜马拉雅会员\"}},\n" +
+			"    {\"user\": {\"username\": \"刘天宇\"},\"luckDrawPrize\":{\"name\": \"喜马拉雅会员\"}},\n" +
+			"    {\"user\": {\"username\": \"刘润玉\"},\"luckDrawPrize\":{\"name\": \"有道词典笔\"}},\n" +
+			"    {\"user\": {\"username\": \"李暮词\"},\"luckDrawPrize\":{\"name\": \"SoonyAngle盲盒\"}},\n" +
+			"    {\"user\": {\"username\": \"陈叶开\"},\"luckDrawPrize\":{\"name\": \"百科全书\"}},\n" +
+			"    {\"user\": {\"username\": \"赵崇光\"},\"luckDrawPrize\":{\"name\": \"百科全书\"}},\n" +
+			"    {\"user\": {\"username\": \"赵绮年\"},\"luckDrawPrize\":{\"name\": \"小度G1\"}},\n" +
+			"    {\"user\": {\"username\": \"吴玉堂\"},\"luckDrawPrize\":{\"name\": \"SoonyAngle盲盒\"}},\n" +
+			"    {\"user\": {\"username\": \"吴勇师\"},\"luckDrawPrize\":{\"name\": \"SoonyAngle盲盒\"}},\n" +
+			"    {\"user\": {\"username\": \"陈康文\"},\"luckDrawPrize\":{\"name\": \"喜马拉雅会员\"}},\n" +
+			"    {\"user\": {\"username\": \"赵康健\"},\"luckDrawPrize\":{\"name\": \"百科全书\"}},\n" +
+			"    {\"user\": {\"username\": \"赵高轩\"},\"luckDrawPrize\":{\"name\": \"小度G1\"}},\n" +
+			"    {\"user\": {\"username\": \"赵玉书\"},\"luckDrawPrize\":{\"name\": \"SoonyAngle盲盒\"}},\n" +
+			"    {\"user\": {\"username\": \"赵叶欢\"},\"luckDrawPrize\":{\"name\": \"弯得林优选笛头\"}},\n" +
+			"    {\"user\": {\"username\": \"李高兴\"},\"luckDrawPrize\":{\"name\": \"喜马拉雅会员\"}},\n" +
+			"    {\"user\": {\"username\": \"吴文瑞\"},\"luckDrawPrize\":{\"name\": \"喜马拉雅会员\"}},\n" +
+			"    {\"user\": {\"username\": \"高勇\"},\"luckDrawPrize\":{\"name\": \"SoonyAngle盲盒\"}},\n" +
+			"    {\"user\": {\"username\": \"李艺彤\"},\"luckDrawPrize\":{\"name\": \"宇航员蓝牙音箱\"}},\n" +
+			"    {\"user\": {\"username\": \"邹辰悦\"},\"luckDrawPrize\":{\"name\": \"SoonyAngle盲盒\"}},\n" +
+			"    {\"user\": {\"username\": \"王笑笑\"},\"luckDrawPrize\":{\"name\": \"20节vip小课\"}},\n" +
+			"    {\"user\": {\"username\": \"肖国庆\"},\"luckDrawPrize\":{\"name\": \"有道词典笔\"}},\n" +
+			"    {\"user\": {\"username\": \"李红旗\"},\"luckDrawPrize\":{\"name\": \"SoonyAngle盲盒\"}},\n" +
+			"    {\"user\": {\"username\": \"王乐乐\"},\"luckDrawPrize\":{\"name\": \"乐器清洁套装\"}},\n" +
+			"    {\"user\": {\"username\": \"孙朵朵\"},\"luckDrawPrize\":{\"name\": \"SoonyAngle盲盒\"}},\n" +
+			"    {\"user\": {\"username\": \"孙雨轩\"},\"luckDrawPrize\":{\"name\": \"百科全书\"}},\n" +
+			"    {\"user\": {\"username\": \"孙文睿\"},\"luckDrawPrize\":{\"name\": \"宇航员蓝牙音箱\"}},\n" +
+			"    {\"user\": {\"username\": \"高可心\"},\"luckDrawPrize\":{\"name\": \"SoonyAngle盲盒\"}},\n" +
+			"    {\"user\": {\"username\": \"高可云\"},\"luckDrawPrize\":{\"name\": \"宇航员蓝牙音箱\"}},\n" +
+			"    {\"user\": {\"username\": \"王胜利\"},\"luckDrawPrize\":{\"name\": \"有道词典笔\"}},\n" +
+			"    {\"user\": {\"username\": \"李木子\"},\"luckDrawPrize\":{\"name\": \"百科全书\"}}\n" +
+			"]";
 
 }