diff --git a/src/main/java/com/yhjd/controller/UserController.java b/src/main/java/com/yhjd/controller/UserController.java index 04a66e1..e5e997f 100644 --- a/src/main/java/com/yhjd/controller/UserController.java +++ b/src/main/java/com/yhjd/controller/UserController.java @@ -63,9 +63,13 @@ public class UserController { @PostMapping("/confirmUser") @ApiOperation(value = "认证user", notes = "认证user") @ResponseBody - public Result confirmUser(String name, String num) { - String result = userService.confirmUser(name, num); - return ResultBuilder.withPayload(result).build(); + public Result confirmUser(String name, String num,String workNum) { + boolean result = userService.confirmUser(name, num,workNum); + if(result){ + return ResultBuilder.withPayload("认证成功").build(); + }else{ + return ResultBuilder.error("认证失败").build(); + } } @PostMapping("/queryUserById") diff --git a/src/main/java/com/yhjd/handler/MsgHandler.java b/src/main/java/com/yhjd/handler/MsgHandler.java index e82e30e..3d72f22 100644 --- a/src/main/java/com/yhjd/handler/MsgHandler.java +++ b/src/main/java/com/yhjd/handler/MsgHandler.java @@ -67,8 +67,8 @@ public class MsgHandler extends AbstractHandler { Item item = new Item(); item.setTitle(name); item.setDescription(result.getDescription()); - item.setPicUrl(result.getPreviewUrl()); - item.setUrl("backend.emaylearningsh.com/oss/download?fileName="+result.getFileUrl()); + item.setPicUrl("http://backend.emaylearningsh.com/img/"+result.getPreviewUrl()); + item.setUrl(result.getH5Url()); articles.add(item); // return new TextBuilder().build(content, wxMessage, weixinService); return new NewsBuilder().articles(articles).fromUser(wxMessage.getToUser()).toUser(wxMessage.getFromUser()).build(); diff --git a/src/main/java/com/yhjd/service/impl/UserServiceImpl.java b/src/main/java/com/yhjd/service/impl/UserServiceImpl.java index d88efc7..c43ab74 100644 --- a/src/main/java/com/yhjd/service/impl/UserServiceImpl.java +++ b/src/main/java/com/yhjd/service/impl/UserServiceImpl.java @@ -68,12 +68,25 @@ public class UserServiceImpl extends ServiceImpl implements IU return jsonObject; } - public String confirmUser(String name, String num){ - List users = userMapper.selectList(new EntityWrapper().eq("name", name).and().eq("erp_num", num).or().eq("work_num", num).or().eq("telephone", num)); + public boolean confirmUser(String name, String num,String workNum){ + if(name.equals("")){ + return false; + } + if(num.equals("")&&workNum.equals("")){ + return false; + } + Wrapper userWrapper = new EntityWrapper().eq("name",name); + if(!num.equals("")){ + userWrapper.eq("telephone", num); + } + if(!workNum.equals("")){ + userWrapper.eq("work_num", workNum); + } + List users = userMapper.selectList(userWrapper); if(users.size()>0){ - return "认证成功"; + return true; }else { - return "认证失败"; + return false; } }