From 0271719bce3d6be197eab2e143e478dbf010b8a8 Mon Sep 17 00:00:00 2001
From: liyj <1003249715@qq.com>
Date: Wed, 04 Sep 2024 10:53:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
dyh-service/dyh-cust/src/main/java/cn/huge/module/pauser/controller/wechat/PaUserWechatController.java | 119 ++++++++++++++++++++++++++---------------------------------
1 files changed, 52 insertions(+), 67 deletions(-)
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/pauser/controller/wechat/PaUserWechatController.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/pauser/controller/wechat/PaUserWechatController.java
index 09b4b55..f364bdb 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/pauser/controller/wechat/PaUserWechatController.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/pauser/controller/wechat/PaUserWechatController.java
@@ -1,7 +1,8 @@
-package cn.huge.module.pauser.controller.web;
+package cn.huge.module.pauser.controller.wechat;
import cn.huge.base.common.utils.ReturnFailUtils;
import cn.huge.base.common.utils.ReturnSucUtils;
+import cn.huge.base.config.CurrentUser;
import cn.huge.module.pauser.domain.po.PaUser;
import cn.huge.module.pauser.service.PaUserService;
import com.google.common.collect.Maps;
@@ -15,21 +16,16 @@
import javax.servlet.http.HttpServletRequest;
import java.util.Map;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
/**
- * @title: 公众用户表接口api-web端
- * @description: 公众用户表接口api-web端
+ * @title: 公众用户表接口api-wechat端
+ * @description: 公众用户表接口api-wechat端
* @company: hugeinfo
- * @author: liyj
- * @time: 2024-08-19 20:04:19
- * @version: 1.0.0
*/
@Slf4j
@RestController
-@RequestMapping("/api/web/paUser")
-public class PaUserWebController {
+@RequestMapping("/api/wechat/paUser")
+public class PaUserWechatController {
@Autowired(required = false)
private HttpServletRequest request;
@@ -190,85 +186,74 @@
return terms;
}
+
/**
- * 条件查询多个
- * @url {ctx}/api/web/paUser/listQuery
- * @return Object
- */
- @GetMapping("/listQuery")
- public Object listQuery() {
+ * 当事人小程序-个人中心
+ * url: {ctx}/api/wechat/paUser/personal
+ * type: post
+ */
+ @GetMapping(value = "/personal")
+ public Object personal(@CurrentUser String userId) {
try {
- Map<String, Object> terms = getParameter();
- return ReturnSucUtils.getRepInfo(service.listTerms(terms));
+ return ReturnSucUtils.getRepInfo(service.wechatPersonal(userId));
} catch (Exception e) {
- return ReturnFailUtils.getRepInfo();
+ log.error("Controller接口[PaUserWechatController.personal]请求异常："+e, e);
+ return ReturnFailUtils.getRepInfo(e.getMessage());
}
}
/**
- * 条件分页查询
- * @url {ctx}/api/web/paUser/pageQuery
- * @param page 页码
- * @param size 每页数量
- * @return Object
- */
- @GetMapping("/pageQuery")
- public Object pageQuery(@RequestParam(value = "page") int page, @RequestParam(value = "size") int size) {
+ * 当事人小程序-查询当前登录人个人信息
+ * url: {ctx}/api/wechat/paUser/getUserInfo
+ * type: post
+ */
+ @GetMapping(value = "/getUserInfo")
+ public Object getUserInfo(@CurrentUser String userId) {
try {
- Map<String, Object> terms = getParameter();
- Sort sort = Sort.by(Sort.Direction.DESC, "create_time");
- PageRequest pageRequest = PageRequest.of(page-1, size, sort);
- Page<PaUser> paUserPage = service.pageQuery(pageRequest, terms);
- return ReturnSucUtils.getRepInfo( "处理成功", paUserPage);
+ PaUser paUser = service.getById(userId);
+ return ReturnSucUtils.getRepInfo(paUser);
} catch (Exception e) {
- return ReturnFailUtils.getRepInfo();
+ log.error("Controller接口[PaUserWechatController.getUserInfo]请求异常："+e, e);
+ return ReturnFailUtils.getRepInfo(e.getMessage());
}
}
/**
- * 根据编号查询单个
- * @url {ctx}/api/web/paUser/getById
- * @param id 主键编号
- * @return Object
- */
- @GetMapping("/getById")
- public Object getById(@RequestParam(value = "id") String id) {
+ * 当事人小程序-完善资料
+ * url: {ctx}/api/wechat/paUser/perfectInfo
+ * type: post
+ */
+ @PostMapping(value = "/perfectInfo")
+ public Object perfectInfo(@CurrentUser String userId, @RequestBody PaUser paUser) {
try {
- return ReturnSucUtils.getRepInfo(service.getById(id));
- } catch (Exception e) {
- return ReturnFailUtils.getRepInfo();
- }
- }
-
- /**
- * 根据主键单个
- * @url {ctx}/api/web/paUser/deleteById
- * @param id 主键编号
- * @return Object
- */
- @GetMapping("/deleteById")
- public Object deleteById(@RequestParam(value = "id") String id) {
- try {
- service.removeById(id);
+ paUser.setId(userId);
+ service.perfectInfo(paUser);
return ReturnSucUtils.getRepInfo();
} catch (Exception e) {
- return ReturnFailUtils.getRepInfo();
+ log.error("Controller接口[PaUserWechatController.perfectInfo]请求异常："+e, e);
+ return ReturnFailUtils.getRepInfo(e.getMessage());
}
}
/**
- * 新增或更新对象
- * @url {ctx}/api/web/paUser/savePaUser
- * @param paUser 实体对象
- * @return Object
- */
- @PostMapping("/savePaUser")
- public Object savePaUser(@RequestBody PaUser paUser) {
+ * 当事人小程序-实名认证
+ * url: {ctx}/api/weChat/paUser/realAuth
+ * type: post
+ */
+ @PostMapping(value = "/realAuth")
+ public Object realAuth(@CurrentUser String userId, @RequestBody PaUser paUser) {
try {
- service.savePaUser(paUser);
- return ReturnSucUtils.getRepInfo();
+ paUser.setId(userId);
+ service.wechatRealAuth(paUser);
+ Map<String, Object> result = Maps.newHashMap();
+ result.put("userId", paUser.getId());
+ result.put("trueName", paUser.getTrueName());
+ result.put("realStatus", paUser.getRealStatus());
+// result.put("faceStatus", paUser.getFaceStatus());
+ return ReturnSucUtils.getRepInfo(result);
} catch (Exception e) {
- return ReturnFailUtils.getRepInfo();
+ log.error("Controller接口[PaUserWechatController.realAuth]请求异常："+e, e);
+ return ReturnFailUtils.getRepInfo(e.getMessage());
}
}
--
Gitblit v1.8.0