Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

!317 修复合并错误

Browse Source 
Merge pull request !317 from 德仔/develop
This commit is contained in:
德仔 2021-07-14 10:27:20 +00:00 committed by Gitee
commit f71fe6f4cd
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
stdiet-admin/src/main/java/com/stdiet/web/controller/custom/WechatAppletController.java
View File

@ -778,11 +778,12 @@ public class WechatAppletController extends BaseController {
} }
} }
return AjaxResult.success(result); return AjaxResult.success(result);
}*/ }
/** /**
* 查询打卡社区 * 查询打卡社区
*
* @return * @return
*/ */
@GetMapping("/getCommunityPunch") @GetMapping("/getCommunityPunch")
@ -801,18 +802,19 @@ public class WechatAppletController extends BaseController {
/** /**
* 修改健康减脂宣言 * 修改健康减脂宣言
*
* @return * @return
*/ */
@PostMapping("/updateHealthManifesto") @PostMapping("/updateHealthManifesto")
public AjaxResult updateHealthManifesto(@RequestParam("cusId")String cusId, @RequestParam("healthManifesto")String healthManifesto) { public AjaxResult updateHealthManifesto(@RequestParam("cusId") String cusId, @RequestParam("healthManifesto") String healthManifesto) {
if(StringUtils.isEmpty(healthManifesto,cusId)){ if (StringUtils.isEmpty(healthManifesto, cusId)) {
return AjaxResult.error("缺少必要参数"); return AjaxResult.error("缺少必要参数");
} }
cusId = AesUtils.decrypt(cusId); cusId = AesUtils.decrypt(cusId);
if(cusId == null){ if (cusId == null) {
return AjaxResult.error("参数不合法"); return AjaxResult.error("参数不合法");
} }
if(healthManifesto.length() > 200){ if (healthManifesto.length() > 200) {
return AjaxResult.error("健康宣言字数过长"); return AjaxResult.error("健康宣言字数过长");
} }
SysWxUserInfo sysWxUserInfo = new SysWxUserInfo(); SysWxUserInfo sysWxUserInfo = new SysWxUserInfo();
@ -823,21 +825,22 @@ public class WechatAppletController extends BaseController {
/** /**
* 获取个人中心数据（健康宣言、消息条数、打卡社区总打卡次数、打卡次数） * 获取个人中心数据（健康宣言、消息条数、打卡社区总打卡次数、打卡次数）
*
* @return * @return
*/ */
@GetMapping("/getCustomerCenterInfo") @GetMapping("/getCustomerCenterInfo")
public AjaxResult getCustomerCenterInfo(@RequestParam("cusId")String cusId) { public AjaxResult getCustomerCenterInfo(@RequestParam("cusId") String cusId) {
if(StringUtils.isEmpty(cusId)){ if (StringUtils.isEmpty(cusId)) {
return AjaxResult.error("缺少必要参数"); return AjaxResult.error("缺少必要参数");
} }
cusId = AesUtils.decrypt(cusId); cusId = AesUtils.decrypt(cusId);
if(cusId == null){ if (cusId == null) {
return AjaxResult.error("参数不合法"); return AjaxResult.error("参数不合法");
} }
AjaxResult result = AjaxResult.success(); AjaxResult result = AjaxResult.success();
//获取健康宣言 //获取健康宣言
SysWxUserInfo sysWxUserInfo = sysWxUserInfoService.selectSysWxUserInfoByCusId(Long.parseLong(cusId)); SysWxUserInfo sysWxUserInfo = sysWxUserInfoService.selectSysWxUserInfoByCusId(Long.parseLong(cusId));
result.put("healthManifesto",sysWxUserInfo.getHealthManifesto() == null ? "" : sysWxUserInfo.getHealthManifesto()); result.put("healthManifesto", sysWxUserInfo.getHealthManifesto() == null ? "" : sysWxUserInfo.getHealthManifesto());
//获取未读消息条数 //获取未读消息条数
SysMessageNotice messageParam = new SysMessageNotice(); SysMessageNotice messageParam = new SysMessageNotice();
messageParam.setReadType(0); messageParam.setReadType(0);
@ -857,6 +860,7 @@ public class WechatAppletController extends BaseController {
/** /**
* 获取需要在小程序展示的Banner图 * 获取需要在小程序展示的Banner图
*
* @return * @return
*/ */
@GetMapping("/getShowBannerImage") @GetMapping("/getShowBannerImage")