From febef797f9a8c98150275a6e0b721551c6ec383b Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 01 十一月 2023 17:13:59 +0800
Subject: [PATCH] 支付会员送券功能补充 运营商权限bug修改
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TAppUserController.java | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 54 insertions(+), 5 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 d2e43da..f1a5b51 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
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.dsh.course.feignClient.account.AppUserClient;
import com.dsh.course.feignClient.account.CityManagerClient;
import com.dsh.course.feignClient.account.StoreStaffClient;
@@ -12,13 +13,16 @@
import com.dsh.course.feignClient.activity.model.BodySideAppointment;
import com.dsh.course.feignClient.activity.model.QueryBodySideAppointment;
import com.dsh.course.feignClient.activity.model.QueryBodySideAppointmentVO;
+import com.dsh.course.feignClient.competition.CompetitionClient;
+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.StoreClient;
import com.dsh.course.feignClient.other.model.SiteChangeStateVO;
import com.dsh.guns.config.UserExt;
+import com.dsh.guns.modular.system.controller.util.MD5;
import com.dsh.guns.modular.system.model.*;
-import com.dsh.guns.modular.system.service.ICityService;
-import com.dsh.guns.modular.system.service.IRoleService;
-import com.dsh.guns.modular.system.service.IUserService;
+import com.dsh.guns.modular.system.service.*;
import com.dsh.guns.modular.system.util.ResultUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@@ -60,6 +64,14 @@
private IRoleService roleService;
@Autowired
private StudentClient studentClient;
+ @Autowired
+ private IStoreService storeService;
+ @Autowired
+ private CompetitionClient competitionClient;
+ @Autowired
+ private ISiteBookingService siteBookingService;
+ @Autowired
+ private CoursePackageClient coursePackageClient;
/**
* 跳转体测预约管理首页
*/
@@ -81,6 +93,9 @@
Integer roleType = UserExt.getUser().getObjectType();
List<TCity> list = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
List<User> sales = userService.list(new QueryWrapper<User>().eq("deptid", 2));
+ if(UserExt.getUser().getObjectType()==3){
+ sales = userService.list(new QueryWrapper<User>().eq("deptid", 2).eq("objectType",3).eq("objectId",UserExt.getUser().getObjectId()));
+ }
model.addAttribute("list",list);
model.addAttribute("roleType",roleType);
model.addAttribute("sales",sales);
@@ -133,6 +148,9 @@
SimpleDateFormat format2 = new SimpleDateFormat("yyyy-MM-dd");
String format3 = format2.format(data.getVipEndTime());
model.addAttribute("vipEndTime",format3);
+ }else {
+ model.addAttribute("vipEndTime","");
+
}
if (data.getViplevelId()!=null){
// todo创建会员等级表
@@ -152,6 +170,9 @@
@ResponseBody
public List<QueryAppUserVO> listAll(String province, String city,String name,
String phone,Integer isVip, String salesmanUserName){
+ Integer objectType = UserExt.getUser().getObjectType();
+ Integer objectId = UserExt.getUser().getObjectId();
+
QueryAppUser queryAppUser = new QueryAppUser();
queryAppUser.setProvince(province);
queryAppUser.setCity(city);
@@ -167,13 +188,40 @@
TCity c = cityService.getOne(new QueryWrapper<TCity>().eq("code", city));
queryAppUser.setCity(c.getName());
}
- Integer objectType = UserExt.getUser().getObjectType();
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))
+ .stream().map(TStore::getId).collect(Collectors.toList());
+ // 根据门店id集合查询 属于该运营商下的门店举办的赛事
+ ListQuery listQuery = new ListQuery();
+ 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))
+ .stream().map(SiteBooking::getAppUserId).collect(Collectors.toList());
+ // 获取课程购买记录
+
+ // 获取游戏记录
+ }
+
+
+
+
+
for (QueryAppUserVO queryAppUserVO : queryAppUserVOS) {
if (queryAppUserVO.getSalesmanUserId()!=null){
- queryAppUserVO.setSalesmanUserName(userService.getById(queryAppUserVO.getSalesmanUserId()).getName());
+ User byId = userService.getById(queryAppUserVO.getSalesmanUserId());
+ if (byId!=null){
+ queryAppUserVO.setSalesmanUserName(byId.getName());
+ }
}
}
if (salesmanUserName!=null && (!salesmanUserName.equals(""))){
@@ -200,6 +248,7 @@
@ResponseBody
public Object addAppUser(@RequestBody TAppUser appUser){
Integer objectType = UserExt.getUser().getObjectType();
+ appUser.setPassword(MD5.md5("111111"));
appUser.setInsertType(objectType);
appUser.setAddUserId(UserExt.getUser().getObjectId());
Object o = appUserClient.addAppUser1(appUser);
--
Gitblit v1.7.1