From 6368a855afb72f3c23eed5aedd085c55fe7a2d9f Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 25 十月 2023 10:02:43 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/CoursePackagePaymentController.java | 14 ++--
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java | 13 +++-
cloud-server-course/src/main/resources/mapper/CoursePackagePaymentConfigMapper.xml | 5 +
cloud-server-course/src/main/resources/mapper/CoursePackageSchedulingMapper.xml | 8 ++
cloud-server-other/src/main/java/com/dsh/other/entity/BookingQuery.java | 2
cloud-server-account/src/main/resources/mapper/TStudentMapper.xml | 5 +
cloud-server-account/src/main/java/com/dsh/account/dto/StudentSearch.java | 3 +
cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java | 20 +++---
cloud-server-management/src/main/java/com/dsh/course/dto/StudentSearch.java | 4 +
cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java | 24 ++++----
cloud-server-management/src/main/webapp/WEB-INF/view/system/dataStatistics/storeIncome.html | 1
cloud-server-course/src/main/java/com/dsh/course/controller/CourseStudentController.java | 11 +++
cloud-server-course/src/main/java/com/dsh/course/mapper/CoursePackageSchedulingMapper.java | 2
cloud-server-course/src/main/java/com/dsh/course/model/CoursePackagePaymentQuery.java | 2
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/DataStatisticsController.java | 23 +++++++
cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/dto/BookingQuery.java | 2
cloud-server-other/src/main/resources/mapper/GameMapper.xml | 6 ++
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java | 2
cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CoursePackageClient.java | 7 ++
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java | 4 +
cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/CoursePackagePaymentQuery.java | 3 +
21 files changed, 122 insertions(+), 39 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/dto/StudentSearch.java b/cloud-server-account/src/main/java/com/dsh/account/dto/StudentSearch.java
index 32d455a..be30987 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/dto/StudentSearch.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/dto/StudentSearch.java
@@ -4,6 +4,8 @@
import lombok.Data;
import lombok.NoArgsConstructor;
+import java.util.List;
+
@Data
@AllArgsConstructor
@NoArgsConstructor
@@ -12,4 +14,5 @@
private String city;String name;
private String userName;
private String phone;
+ private List<Integer> ids;
}
diff --git a/cloud-server-account/src/main/resources/mapper/TStudentMapper.xml b/cloud-server-account/src/main/resources/mapper/TStudentMapper.xml
index c4a040b..145ba1c 100644
--- a/cloud-server-account/src/main/resources/mapper/TStudentMapper.xml
+++ b/cloud-server-account/src/main/resources/mapper/TStudentMapper.xml
@@ -51,6 +51,11 @@
<if test="item.phone != null and item.phone != ''">
and o.phone LIKE CONCAT('%',#{item.phone},'%')
</if>
+ <if test="item.ids != null and item.ids.size >0 ">
+ and o.appUserId in <foreach collection="item.ids" separator="," open="(" item="id" close=")">
+ #{id}
+ </foreach>
+ </if>
</where>
</select>
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
index 849004e..7b27028 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
@@ -199,18 +199,18 @@
@ResponseBody
@PostMapping("/base/pointMerchars/getCommoditys")
public PointMerchandiseVo getVicinityGoods(@RequestBody CommodityRequest request){
- if (request.getShopId()!=null){
- List<CoursePackage> coursePackages = coursePackageClient.queryByStoreId(request.getShopId());
- List<Integer> coursIds = new ArrayList<>();
- for (CoursePackage coursePackage : coursePackages) {
- coursIds.add(coursePackage.getId());
- }
- List<PointsMerchandise> points = pointsMerchandiseService.list(new QueryWrapper<PointsMerchandise>().eq("state",1).eq("shelves",1).in("coursePackageId", coursIds));
- PointMerchandiseVo pointMerchandiseVo = new PointMerchandiseVo();
- pointMerchandiseVo.setMerchandises(points);
- return pointMerchandiseVo;
-
- }
+// if (request.getShopId()!=null){
+// List<CoursePackage> coursePackages = coursePackageClient.queryByStoreId(request.getShopId());
+// List<Integer> coursIds = new ArrayList<>();
+// for (CoursePackage coursePackage : coursePackages) {
+// coursIds.add(coursePackage.getId());
+// }
+// List<PointsMerchandise> points = pointsMerchandiseService.list(new QueryWrapper<PointsMerchandise>().eq("state",1).eq("shelves",1).in("coursePackageId", coursIds));
+// PointMerchandiseVo pointMerchandiseVo = new PointMerchandiseVo();
+// pointMerchandiseVo.setMerchandises(points);
+// return pointMerchandiseVo;
+//
+// }
diff --git a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java b/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
index 1dd80f7..bf3970b 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
@@ -754,12 +754,12 @@
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
})
public ResultUtil<List<AppUserVideoResponse>> queryAfterSourceList( CourseOfAfterRequest search){
- try {
- Integer appUserId = tokenUtil.getUserIdFormRedis();
-
- if(null == appUserId){
- return ResultUtil.tokenErr();
- }
+// try {
+// Integer appUserId = tokenUtil.getUserIdFormRedis();
+//
+// if(null == appUserId){
+// return ResultUtil.tokenErr();
+// }
//
// List<Integer> courseIds = new ArrayList<>();
// QueryWrapper<TCoursePackagePayment> queryWrapper = new QueryWrapper<TCoursePackagePayment>().eq("appUserId", appUserId)
@@ -773,7 +773,7 @@
// }
- QueryWrapper<CoursePackageStudent> queryWrapper1 = new QueryWrapper<CoursePackageStudent>().eq("appUserId", appUserId);
+ QueryWrapper<CoursePackageStudent> queryWrapper1 = new QueryWrapper<CoursePackageStudent>().eq("appUserId", 19);
if (ToolUtil.isNotEmpty(search.getCourseTypeId())){
queryWrapper1.eq("coursePackageId",search.getCourseTypeId());
}
@@ -797,9 +797,9 @@
- }catch (Exception e){
- return ResultUtil.runErr();
- }
+// }catch (Exception e){
+// return ResultUtil.runErr();
+// }
}
/**
diff --git a/cloud-server-course/src/main/java/com/dsh/course/controller/CourseStudentController.java b/cloud-server-course/src/main/java/com/dsh/course/controller/CourseStudentController.java
index ee637bb..cf5625e 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/controller/CourseStudentController.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/controller/CourseStudentController.java
@@ -3,6 +3,7 @@
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.dsh.course.entity.*;
@@ -85,6 +86,16 @@
}
+ @ResponseBody
+ @PostMapping("/queryIdsByStore")
+ public List<Integer> queryIdsByStore(@RequestBody Integer objectId){
+ List<TCoursePackage> list = packageService.list(new LambdaQueryWrapper<TCoursePackage>().eq(TCoursePackage::getStoreId, objectId));
+ List<Integer> collect = list.stream().map(TCoursePackage::getId).collect(Collectors.toList());
+ if(collect.size()==0){
+ collect.add(-1);
+ }
+ return collect;
+ }
//获取学员课时数信息
diff --git a/cloud-server-course/src/main/java/com/dsh/course/mapper/CoursePackageSchedulingMapper.java b/cloud-server-course/src/main/java/com/dsh/course/mapper/CoursePackageSchedulingMapper.java
index 7ac82ef..0a595a5 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/mapper/CoursePackageSchedulingMapper.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/mapper/CoursePackageSchedulingMapper.java
@@ -25,7 +25,7 @@
*/
List<Map<String, Object>> queryCoursePackageSchedulingList(Page<Map<String, Object>> page, @Param("item") QueryCoursePackageSchedulingList queryCoursePackageSchedulingList);
- List<AppUserVideoResponse> queryAll(List<Long> longs);
+ List<AppUserVideoResponse> queryAll(@Param("longs") List<Long> longs);
Integer isHave(Integer videoId);
}
diff --git a/cloud-server-course/src/main/java/com/dsh/course/model/CoursePackagePaymentQuery.java b/cloud-server-course/src/main/java/com/dsh/course/model/CoursePackagePaymentQuery.java
index b96c46b..fd8a135 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/model/CoursePackagePaymentQuery.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/model/CoursePackagePaymentQuery.java
@@ -27,4 +27,6 @@
private String payUser;
// 购买学员
private String payStudent;
+
+ private List<Integer> ids;
}
diff --git a/cloud-server-course/src/main/resources/mapper/CoursePackagePaymentConfigMapper.xml b/cloud-server-course/src/main/resources/mapper/CoursePackagePaymentConfigMapper.xml
index b6f7bdf..66adb5f 100644
--- a/cloud-server-course/src/main/resources/mapper/CoursePackagePaymentConfigMapper.xml
+++ b/cloud-server-course/src/main/resources/mapper/CoursePackagePaymentConfigMapper.xml
@@ -54,6 +54,11 @@
<if test="query.payStatus!=null and query.payStatus!= ''">
and t1.payStatus = #{query.payStatus}
</if>
+ <if test="query.ids !=null and query.ids.size >0">
+ and t2.storeId in <foreach collection="query.ids" close=")" item="id" open="(" separator=",">
+ #{id}
+ </foreach>
+ </if>
</where>
</select>
<select id="listAllRegister" resultType="com.dsh.course.model.RegisterOrderVO">
diff --git a/cloud-server-course/src/main/resources/mapper/CoursePackageSchedulingMapper.xml b/cloud-server-course/src/main/resources/mapper/CoursePackageSchedulingMapper.xml
index 7545dec..e938055 100644
--- a/cloud-server-course/src/main/resources/mapper/CoursePackageSchedulingMapper.xml
+++ b/cloud-server-course/src/main/resources/mapper/CoursePackageSchedulingMapper.xml
@@ -32,9 +32,13 @@
<select id="queryAll" resultType="com.dsh.course.model.vo.response.AppUserVideoResponse">
SELECT cs.courseId as videoId,cs.coursePackageId as coursePackageId,tc.coverDrawing,tc.name as videoName,tc.introduce as synopsis,cs.integral
- FROM t_course_package_scheduling4 cs
+ FROM t_course_package_scheduling cs
LEFT JOIN t_course tc ON cs.courseId = tc.id
- WHERE cs.courseId IS NOT NULL and cs.id in #{longs}
+ WHERE cs.courseId IS NOT NULL and cs.id in
+ <foreach collection="longs" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
+
</select>
<select id="isHave" resultType="int">
SELECT COUNT(1) FROM t_user_video_details WHERE courseId = #{videoId}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/dto/StudentSearch.java b/cloud-server-management/src/main/java/com/dsh/course/dto/StudentSearch.java
index 8f9a1a4..4b3449f 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/dto/StudentSearch.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/dto/StudentSearch.java
@@ -4,6 +4,8 @@
import lombok.Data;
import lombok.NoArgsConstructor;
+import java.util.List;
+
@Data
@AllArgsConstructor
@@ -14,4 +16,6 @@
private String name;
private String userName;
private String phone;
+
+ private List<Integer> ids;
}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CoursePackageClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CoursePackageClient.java
index c5c328e..f08f08c 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CoursePackageClient.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CoursePackageClient.java
@@ -84,4 +84,11 @@
@PostMapping("/courdent/bypac")
List<Map<String, Object>> bypac(PacQueryDto pacQueryDto);
+
+
+ @PostMapping("/courdent/queryIdsByStore")
+ List<Integer> queryIdsByStore(Integer objectId);
+
+
+
}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/CoursePackagePaymentController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/CoursePackagePaymentController.java
index a0d9606..77fda77 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/CoursePackagePaymentController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/CoursePackagePaymentController.java
@@ -31,7 +31,7 @@
import java.util.stream.Collectors;
/**
- * 购课记录控制器
+ * 广告管理控制器
*
*/
@Controller
@@ -123,17 +123,17 @@
@ResponseBody
public List<CoursePackagePaymentVO> listAll(CoursePackagePaymentQuery query) {
Integer objectType = UserExt.getUser().getObjectType();
+ List<Integer> ids =new ArrayList<>();
+ if(objectType==3){
+ // 找出当前门店的课包
+ ids = coursePackageClient.queryIdsByStore(UserExt.getUser().getObjectId());
+ query.setIds(ids);
+ }
if (objectType == 2){
Integer objectId = UserExt.getUser().getObjectId();
List<Integer> operatorId = storeService.list(new QueryWrapper<TStore>().eq("operatorId", objectId))
.stream().map(TStore::getId).collect(Collectors.toList());
query.setStoreIds(operatorId);
- }
- if (objectType == 3){
- Integer objectId = UserExt.getUser().getObjectId();
- List<Integer> list = new ArrayList<>();
- list.add(objectId);
- query.setStoreIds(list);
}
return coursePackagePaymentClient.listAll(query);
}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/DataStatisticsController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/DataStatisticsController.java
index 30d3ca7..cfcfb40 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/DataStatisticsController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/DataStatisticsController.java
@@ -720,6 +720,9 @@
@RequestMapping(value = "/backStore")
@ResponseBody
public Object backStore(Integer id) {
+ if(UserExt.getUser().getObjectType()==3){
+ id = UserExt.getUser().getObjectId();
+ }
HashMap<String, Object> map = new HashMap<>();
List<Integer> userPt = appUserClient.getUserStore(id);
if(userPt.size()==0){
@@ -884,6 +887,9 @@
@RequestMapping(value = "/userAndVipStore")
@ResponseBody
public Object userAndVipStore(Integer id) {
+ if(UserExt.getUser().getObjectType()==3){
+ id = UserExt.getUser().getObjectId();
+ }
HashMap<String, Object> map = appUserClient.userAndVipStore(id);
return map;
}
@@ -948,6 +954,12 @@
@RequestMapping(value = "/actStore")
@ResponseBody
public Object actStore(Integer id) {
+
+
+ Integer objectType = UserExt.getUser().getObjectType();
+ if(objectType==3){
+ id = UserExt.getUser().getObjectId();
+ }
List<Integer> userPt = appUserClient.getUserStore(id);
HashMap<String, Object> map = competitionClient.actPt(userPt);
@@ -1110,6 +1122,10 @@
// 找出平台的用户
List<User> list = sysUserService.list(new LambdaQueryWrapper<User>().eq(User::getObjectType, 2));
List<Integer> ids = list.stream().map(User::getId).collect(Collectors.toList());
+ Integer objectType = UserExt.getUser().getObjectType();
+ if(objectType==3){
+ id = UserExt.getUser().getObjectId();
+ }
List<Integer> userIds = appUserClient.getUserStore(id);
QueryDataFee queryDataFee = new QueryDataFee(time, userIds);
// 会员费
@@ -1368,6 +1384,9 @@
@RequestMapping("/stuUserDataStore")
@ResponseBody
public Object stuUserDataStore(Integer id) {
+ if(UserExt.getUser().getObjectType()==3){
+ id = UserExt.getUser().getObjectId();
+ }
ArrayList<Integer> objects = new ArrayList<>();
objects.add(1);
HashMap<String, Object> map = appUserClient.queryUserAgeStore(id);
@@ -1403,6 +1422,10 @@
@RequestMapping("/selectStoreJx")
@ResponseBody
public Object selectStoreJx(Integer id) {
+ Integer objectType = UserExt.getUser().getObjectType();
+ if(objectType==3){
+ id = UserExt.getUser().getObjectId();
+ }
ArrayList<Integer> objects = new ArrayList<>();
objects.add(1);
HashMap<String, Object> map1 = appUserClient.queryUserAgeStore1(id);
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java
index fa819e5..f146b76 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java
@@ -1097,7 +1097,7 @@
* @return
*/
@ResponseBody
- @PostMapping("/queryWalkInStudentList")
+ @PostMapping("/queryWalkInStudentListqueryCoursePackageLists")
public Object queryWalkInStudentList(Long coursePackageSchedulingId, String userName, String studentName){
Page<Map<String, Object>> page = coursePackageService.queryWalkInStudentList(coursePackageSchedulingId, userName, studentName);
return super.packForBT(page);
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
index e656163..a1e3151 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
@@ -880,6 +880,10 @@
@RequestMapping("/yuyuelist")
@ResponseBody
public List<Map<String,Object>> yuyuelist(BookingQuery bookingQuery) {
+ Integer objectType = UserExt.getUser().getObjectType();
+ if(objectType==3){
+ bookingQuery.setStoreId(UserExt.getUser().getObjectId());
+ }
List<Map<String,Object>> orders = ballClient.listorder(bookingQuery);
System.out.println("=======ballQueryDto=========="+bookingQuery);
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java
index fa7e8a3..a33be2c 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java
@@ -44,10 +44,7 @@
import java.math.RoundingMode;
import java.text.ParseException;
import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* 控制器
@@ -340,7 +337,15 @@
@RequestMapping("/list")
@ResponseBody
public List<TStudentDto> list(StudentSearch search) {
+ List<Integer> ids = new ArrayList<>();
+ if(UserExt.getUser().getObjectType()==3){
+ ids = appUserClient.getUserStore(UserExt.getUser().getObjectId());
+ if(ids.size()==0){
+ ids.add(-1);
+ }
+ search.setIds(ids);
+ }
System.out.println("============学员查询接口=========");
return itStudentService.listAll(search);
}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/CoursePackagePaymentQuery.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/CoursePackagePaymentQuery.java
index 0b2e57f..9fc272a 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/CoursePackagePaymentQuery.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/CoursePackagePaymentQuery.java
@@ -28,4 +28,7 @@
// 购买学员
private String payStudent;
+
+ private List<Integer> ids;
+
}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/dto/BookingQuery.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/dto/BookingQuery.java
index b667169..fc66086 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/dto/BookingQuery.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/dto/BookingQuery.java
@@ -15,5 +15,5 @@
Integer state;
Integer payMethod;
-
+ Integer storeId;
}
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/dataStatistics/storeIncome.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/dataStatistics/storeIncome.html
index 7e2c0a4..4ec90bb 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/dataStatistics/storeIncome.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/dataStatistics/storeIncome.html
@@ -1766,6 +1766,7 @@
if(type==1){
srtj()
tuifei()
+ income()
}
if(type==2){
diff --git a/cloud-server-other/src/main/java/com/dsh/other/entity/BookingQuery.java b/cloud-server-other/src/main/java/com/dsh/other/entity/BookingQuery.java
index 4bbde6e..3dfd08a 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/entity/BookingQuery.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/entity/BookingQuery.java
@@ -15,5 +15,5 @@
Integer state;
Integer payMethod;
-
+ Integer storeId;
}
diff --git a/cloud-server-other/src/main/resources/mapper/GameMapper.xml b/cloud-server-other/src/main/resources/mapper/GameMapper.xml
index 16290e2..df086c5 100644
--- a/cloud-server-other/src/main/resources/mapper/GameMapper.xml
+++ b/cloud-server-other/src/main/resources/mapper/GameMapper.xml
@@ -14,6 +14,9 @@
<if test ="query.type==3">
and st.id =#{query.id}
</if>
+ <if test ="query.type==2">
+ and ga.operationId =#{query.id}
+ </if>
<if test="query.provinceCode!=null and query.provinceCode!=''">
and ga.provinceCode = #{query.provinceCode}
@@ -68,6 +71,9 @@
<if test="state!=null ">
and bk.status=#{state}
</if>
+ <if test="storeId!=null ">
+ and st.id=#{storeId}
+ </if>
</where>
--
Gitblit v1.7.1