From 8c0b5b30e5200e7bd45aa34507c3623e17fcce91 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期四, 24 八月 2023 13:47:24 +0800
Subject: [PATCH] 新增小程序积分列表 修改积分发放流程
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventController.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventController.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventController.java
index ce7841d..58cecc0 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventController.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventController.java
@@ -168,14 +168,16 @@
Page pagination = new Page(pageNo, pageSize);
ComEvent comEvent=new ComEvent();
BeanUtils.copyProperties(comEventVO, comEvent);
- log.info("==================参数vo"+comEventVO);
- log.info("==================参数comEvent"+comEvent);
LoginUserInfoVO loginUserInfo = getLoginUserInfo();
if (isNull(comEventVO.getAppId())){
- String appId = userService.detailUser(loginUserInfo.getUserId()).getData().getAppId();
+// String appId = userService.detailUser(loginUserInfo.getUserId()).getData().getAppId();
+ String appId = getAppId();
comEvent.setAppId(appId);
}
- return comEventService.pageByComEvent(comEvent, pagination,this.getLoginUserInfo());
+// LoginUserInfoVO loginUserInfo1 = this.getLoginUserInfo();
+// loginUserInfo1.setType(userService.detailUser(loginUserInfo.getUserId()).getData().getType());
+// loginUserInfo1.setType(loginUserInfo.getType());
+ return comEventService.pageByComEvent(comEvent, pagination,loginUserInfo);
}
@@ -334,8 +336,10 @@
*/
@ApiOperation("事件各种状态(处理状态1待处理2待验证3专家已受理4专家未受理，拒绝5调解中6已结案归档7调解取消8 已删除)数据统计")
@GetMapping("/status/calculate")
- public R calculate() {
- return comEventService.calculate(getLoginUserInfo());
+ public R calculate(@RequestParam(value = "level",required = false)Integer level,@RequestParam(value = "id",required = false)Long id) {
+ LoginUserInfoVO loginUserInfo = getLoginUserInfo();
+// loginUserInfo.setType(userService.detailUser(loginUserInfo.getUserId()).getData().getType());
+ return comEventService.calculate(loginUserInfo,level,id);
}
/**
--
Gitblit v1.7.1