From eb6b6dbb35a9f029e0b7d269773685c19fd40976 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 11 七月 2024 10:47:51 +0800
Subject: [PATCH] 玩湃微信商户认证代码
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TAppUserController.java | 54 ++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 40 insertions(+), 14 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TAppUserController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TAppUserController.java
index f1a5b51..27b13d2 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TAppUserController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TAppUserController.java
@@ -17,6 +17,7 @@
import com.dsh.course.feignClient.competition.model.Competition;
import com.dsh.course.feignClient.competition.model.ListQuery;
import com.dsh.course.feignClient.course.CoursePackageClient;
+import com.dsh.course.feignClient.other.BallClient;
import com.dsh.course.feignClient.other.StoreClient;
import com.dsh.course.feignClient.other.model.SiteChangeStateVO;
import com.dsh.guns.config.UserExt;
@@ -24,6 +25,7 @@
import com.dsh.guns.modular.system.model.*;
import com.dsh.guns.modular.system.service.*;
import com.dsh.guns.modular.system.util.ResultUtil;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
@@ -72,6 +74,9 @@
private ISiteBookingService siteBookingService;
@Autowired
private CoursePackageClient coursePackageClient;
+ @Autowired
+ private BallClient ballClient;
+
/**
* 跳转体测预约管理首页
*/
@@ -153,7 +158,7 @@
}
if (data.getViplevelId()!=null){
- // todo创建会员等级表
+
model.addAttribute("level","黄金");
}
model.addAttribute("level","黄金");
@@ -190,9 +195,6 @@
}
queryAppUser.setInsertType(objectType);
queryAppUser.setTypeId(UserExt.getUser().getObjectId());
- List<QueryAppUserVO> queryAppUserVOS = appUserClient.listAll(queryAppUser);
- // 根据赛事支付记录
-
if (objectType == 2){
// 获取运营商下的所有门店id集合
List<Integer> storeIds = storeService.list(new QueryWrapper<TStore>().eq("operatorId", objectId))
@@ -202,20 +204,36 @@
listQuery.setIds(storeIds);
// 通过门店ids 获取赛事的支付记录 获取到用户的ids
List<Integer> list = competitionClient.getUserIds(listQuery);
- // todo 写根据用户ids查询用户的方法
// 获取场地预约记录 拿到用户ids
- List<Integer> storeId = siteBookingService.list(new QueryWrapper<SiteBooking>().in("storeId", storeIds))
+ List<Integer> siteUsers = siteBookingService.list(new QueryWrapper<SiteBooking>().in("storeId", storeIds))
.stream().map(SiteBooking::getAppUserId).collect(Collectors.toList());
- // 获取课程购买记录
-
- // 获取游戏记录
+ // 获取课程购买记录 拿到用户ids
+ List<Integer> cpUsers = coursePackageClient.getCoursePackageByStoreIds(storeIds);
+ // 获取游戏记录 拿到用户ids
+ List<Integer> gameUsers = ballClient.getGameByStoreIds(storeIds);
+ // 用户ids
+ List<Integer> users = new ArrayList<>();
+ users.addAll(list);
+ users.addAll(siteUsers);
+ users.addAll(cpUsers);
+ users.addAll(gameUsers);
+ // 去重后的用户id
+ List<Integer> collect = users.stream().distinct().collect(Collectors.toList());
+ queryAppUser.setUserIds(collect);
+// List<QueryAppUserVO> queryAppUserVOS1 = new ArrayList<>();
+// // 根据用户消费记录 去查询用户ids
+// for (Integer integer : collect) {
+// if (!collect1.contains(integer)){
+// TAppUser tAppUser = appUserClient.queryAppUser1(integer);
+// QueryAppUserVO queryAppUserVO = new QueryAppUserVO();
+// BeanUtils.copyProperties(tAppUser,queryAppUserVO);
+// queryAppUserVOS.add(queryAppUserVO);
+// }
+// }
}
-
-
-
-
-
+ List<QueryAppUserVO> queryAppUserVOS = appUserClient.listAll(queryAppUser);
+ List<Integer> collect1 = queryAppUserVOS.stream().map(QueryAppUserVO::getId).collect(Collectors.toList());
for (QueryAppUserVO queryAppUserVO : queryAppUserVOS) {
if (queryAppUserVO.getSalesmanUserId()!=null){
User byId = userService.getById(queryAppUserVO.getSalesmanUserId());
@@ -249,6 +267,10 @@
public Object addAppUser(@RequestBody TAppUser appUser){
Integer objectType = UserExt.getUser().getObjectType();
appUser.setPassword(MD5.md5("111111"));
+ appUser.setProvince("");
+ appUser.setProvinceCode("");
+ appUser.setCity("");
+ appUser.setCityCode("");
appUser.setInsertType(objectType);
appUser.setAddUserId(UserExt.getUser().getObjectId());
Object o = appUserClient.addAppUser1(appUser);
@@ -262,6 +284,10 @@
@RequestMapping("/addAppUserStudent")
@ResponseBody
public Object addAppUser(@RequestBody TStudent student){
+ Double height = student.getHeight();
+ Double weight = student.getWeight();
+ double v = weight / (height * height);
+ student.setBmi(v);
return studentClient.addStudent(student);
}
/**
--
Gitblit v1.7.1