|
@@ -77,15 +77,15 @@ public class ActivityController extends BaseController {
|
|
|
if (sysUser.getOrganId() == null) {
|
|
|
return failed("用户信息有误,没有分部信息");
|
|
|
}
|
|
|
- Map<String,Object> resultMap = new HashMap<>(3);
|
|
|
+ Map<String,Object> resultMap = new HashMap<>(1);
|
|
|
resultMap.put("activityDetailList",marketActivityService.queryActivity(2,sysUser.getOrganId()));
|
|
|
- resultMap.put("horseRaceLampList",luckDrawPrizeService.queryHorseRaceLampDto(2));
|
|
|
- LuckDrawCount luckDrawCount = luckDrawCountService.findByIdAndGroupId(sysUser.getId(),2);
|
|
|
- if(luckDrawCount != null){
|
|
|
- resultMap.put("drawNum",luckDrawCount.getAvailableCount());
|
|
|
- }else {
|
|
|
- resultMap.put("drawNum",0);
|
|
|
- }
|
|
|
+// resultMap.put("horseRaceLampList",luckDrawPrizeService.queryHorseRaceLampDto(2));
|
|
|
+// LuckDrawCount luckDrawCount = luckDrawCountService.findByIdAndGroupId(sysUser.getId(),2);
|
|
|
+// if(luckDrawCount != null){
|
|
|
+// resultMap.put("drawNum",luckDrawCount.getAvailableCount());
|
|
|
+// }else {
|
|
|
+// resultMap.put("drawNum",0);
|
|
|
+// }
|
|
|
return succeed(resultMap);
|
|
|
}
|
|
|
|