From f425a4523a844a71ed9b1acf74b94e94d0886a0f Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期三, 29 十一月 2023 14:06:22 +0800
Subject: [PATCH] 修改金汇办事指南线上线下问题
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/JinHuiCommnuityApi.java | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/JinHuiCommnuityApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/JinHuiCommnuityApi.java
index 502182b..6f5d6c0 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/JinHuiCommnuityApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/JinHuiCommnuityApi.java
@@ -53,7 +53,7 @@
comActActivityVO.setUserId(this.getLoginUserInfo().getUserId());
comActActivityVO.setStatus(2);
comActActivityVO.setHasPrize(0);
- comActActivityVO.setHaveIntegralReward(0);
+ comActActivityVO.setHaveIntegralReward(2);
return communityService.addActivity(comActActivityVO);
}
@@ -933,19 +933,17 @@
return communityBraceletService.WXdispose(braceletEarlyWarningDO);
}
-
-
/**
* 微信我的预警数据
* @return
*/
@GetMapping("/braceletApi/getEarlyWarningList")
public R getList(@RequestParam("pageNum") Integer pageNum,
- @RequestParam("pageSize") Integer pageSize,
- @RequestParam(value = "equipmentNumber",required = false) String equipmentNumber,
- @RequestParam(value = "type",required = false) String type,
- @RequestParam(value = "userName",required = false) String userName,
- @RequestParam(value = "phone",required = false) String phone)
+ @RequestParam("pageSize") Integer pageSize,
+ @RequestParam(value = "equipmentNumber",required = false) String equipmentNumber,
+ @RequestParam(value = "type",required = false) String type,
+ @RequestParam(value = "userName",required = false) String userName,
+ @RequestParam(value = "phone",required = false) String phone)
{
return communityBraceletService.getList(pageNum,pageSize,getCommunityId()+"",equipmentNumber,
getUserId()+"",type,userName,phone);
--
Gitblit v1.7.1