From 5034f8d1c79c8bef20310fbc618c3bff4cb77c39 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 25 十月 2023 11:21:58 +0800
Subject: [PATCH] update
---
cloud-server-course/src/main/java/com/dsh/course/service/CancelledClassesService.java | 2
cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java | 16 +++++++
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TDiscountController.java | 4 ++
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TBodySideAppointmentsController.java | 3 -
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TFinanceController.java | 3 +
cloud-server-course/src/main/resources/mapper/CancelledClassesMapper.xml | 6 +++
cloud-server-course/src/main/java/com/dsh/course/controller/CancelledClassesController.java | 13 ++++++
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java | 3 +
cloud-server-course/src/main/java/com/dsh/course/model/CancelClassesQuery.java | 2 +
cloud-server-course/src/main/java/com/dsh/course/service/impl/CancelledClassesServiceImpl.java | 4 +-
cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/CancelClassesQuery.java | 2 +
cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageDiscountServiceImpl.java | 5 ++
cloud-server-course/src/main/java/com/dsh/course/mapper/CancelledClassesMapper.java | 2
13 files changed, 57 insertions(+), 8 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java
index 208e0cb..fced99b 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java
@@ -228,7 +228,21 @@
@ResponseBody
@PostMapping("/base/coupon/queryCouponListSearch")
public List<Map<String,Object>> getCouponListOfSearch(@RequestBody CouponListOfSearch ofSearch){
- List<Map<String, Object>> mapList = couponService.queryCouponListOfSearch(ofSearch);
+ List<Map<String, Object>> mapList1 = couponService.queryCouponListOfSearch(ofSearch);
+ List<Map<String, Object>> mapList = new ArrayList<>();
+
+ if(ofSearch.getStoreId()!=null){
+ for (Map<String, Object> map : mapList1) {
+ List<CouponStore> id = couStoreService.list(new LambdaQueryWrapper<CouponStore>().eq(CouponStore::getCouponId, map.get("id").toString()));
+ List<Integer> collect = id.stream().map(CouponStore::getStoreId).collect(Collectors.toList());
+ if(collect.size()==0){
+ collect.add(-1);
+ }
+ if(collect.contains(ofSearch.getStoreId())){
+ mapList.add(map);
+ }
+ }
+ }
if (mapList.size() > 0){
for (Map<String, Object> stringObjectMap : mapList) {
Integer o = (Integer) stringObjectMap.get("id");
diff --git a/cloud-server-course/src/main/java/com/dsh/course/controller/CancelledClassesController.java b/cloud-server-course/src/main/java/com/dsh/course/controller/CancelledClassesController.java
index 4da42ab..17c7e01 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/controller/CancelledClassesController.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/controller/CancelledClassesController.java
@@ -1,7 +1,9 @@
package com.dsh.course.controller;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.dsh.course.entity.CancelledClasses;
import com.dsh.course.entity.CoursePackageScheduling;
+import com.dsh.course.entity.TCoursePackage;
import com.dsh.course.entity.TCoursePackagePayment;
import com.dsh.course.feignclient.account.AppUserClient;
import com.dsh.course.feignclient.account.CoachClient;
@@ -22,6 +24,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.stream.Collectors;
/**
* @author zhibing.pu
@@ -81,8 +84,16 @@
query.setCoachIds(c);
}
}
+ List<Integer> collect =new ArrayList<>();
+ if(query.getStoreId()!=null){
+ List<TCoursePackage> list = coursePackageService.list(new LambdaQueryWrapper<TCoursePackage>().eq(TCoursePackage::getStoreId, query.getStoreId()));
+ collect = list.stream().map(TCoursePackage::getId).collect(Collectors.toList());
+ if(collect.size()==0){
+ collect.add(-1);
+ }
+ }
- List<CancelClassesVO> result = cancelledClassesService.listAll(query);
+ List<CancelClassesVO> result = cancelledClassesService.listAll(query,collect);
for (CancelClassesVO cancelClassesVO : result) {
CoursePackageScheduling byId1 = coursePackageSchedulingService.getById(cancelClassesVO.getCoursePackageSchedulingId());
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
diff --git a/cloud-server-course/src/main/java/com/dsh/course/mapper/CancelledClassesMapper.java b/cloud-server-course/src/main/java/com/dsh/course/mapper/CancelledClassesMapper.java
index cf5446a..213c5ae 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/mapper/CancelledClassesMapper.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/mapper/CancelledClassesMapper.java
@@ -20,7 +20,7 @@
public interface CancelledClassesMapper extends BaseMapper<CancelledClasses> {
- List<CancelClassesVO> listAll(@Param("query") CancelClassesQuery query,@Param("sTime")String sTime,@Param("eTime")String eTime);
+ List<CancelClassesVO> listAll(@Param("query") CancelClassesQuery query, @Param("sTime")String sTime, @Param("eTime")String eTime, @Param("collect") List<Integer> collect);
List<MoneyBack> getRefund();
diff --git a/cloud-server-course/src/main/java/com/dsh/course/model/CancelClassesQuery.java b/cloud-server-course/src/main/java/com/dsh/course/model/CancelClassesQuery.java
index 46971a8..a051cfc 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/model/CancelClassesQuery.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/model/CancelClassesQuery.java
@@ -21,4 +21,6 @@
private List<Integer> coachIds;
// 学员ids
private List<Integer> studentIds;
+
+ private Integer storeId;
}
diff --git a/cloud-server-course/src/main/java/com/dsh/course/service/CancelledClassesService.java b/cloud-server-course/src/main/java/com/dsh/course/service/CancelledClassesService.java
index d2079fd..226f8d8 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/service/CancelledClassesService.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/service/CancelledClassesService.java
@@ -17,6 +17,6 @@
*/
public interface CancelledClassesService extends IService<CancelledClasses> {
- List<CancelClassesVO> listAll(CancelClassesQuery query);
+ List<CancelClassesVO> listAll(CancelClassesQuery query, List<Integer> collect);
}
diff --git a/cloud-server-course/src/main/java/com/dsh/course/service/impl/CancelledClassesServiceImpl.java b/cloud-server-course/src/main/java/com/dsh/course/service/impl/CancelledClassesServiceImpl.java
index cb516f2..5776e85 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/service/impl/CancelledClassesServiceImpl.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/service/impl/CancelledClassesServiceImpl.java
@@ -27,13 +27,13 @@
private CancelledClassesMapper cancelledClassesMapper;
@Override
- public List<CancelClassesVO> listAll(CancelClassesQuery query) {
+ public List<CancelClassesVO> listAll(CancelClassesQuery query, List<Integer> collect) {
String STime = null;
String ETime = null;
if (StringUtils.hasLength(query.getTime())) {
STime = query.getTime().split(" - ")[0] + " 00:00:00";
ETime = query.getTime().split(" - ")[1] + " 23:59:59";
}
- return cancelledClassesMapper.listAll(query,STime,ETime);
+ return cancelledClassesMapper.listAll(query,STime,ETime,collect);
}
}
diff --git a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageDiscountServiceImpl.java b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageDiscountServiceImpl.java
index f0e8c04..e294b35 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageDiscountServiceImpl.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageDiscountServiceImpl.java
@@ -387,6 +387,11 @@
@Override
public List<DiscountList> queryDiscountList(QueryDiscountList queryDiscountList) {
Page<DiscountList> discountListPage = new Page<>(queryDiscountList.getOffset(), queryDiscountList.getLimit());
+ List<Integer> ids = queryDiscountList.getIds();
+ if(ids.size()==0){
+ ids.add(-1);
+ queryDiscountList.setIds(ids);
+ }
List<DiscountList> discountLists = this.baseMapper.queryDiscountList(discountListPage, queryDiscountList.getPCode(), queryDiscountList.getCCode(), queryDiscountList.getName(), queryDiscountList.getType(), queryDiscountList.getIds());
for (DiscountList discountList : discountLists) {
List<TCoursePackageDiscount> tCoursePackageDiscounts = this.baseMapper.selectList(new LambdaQueryWrapper<TCoursePackageDiscount>().eq(TCoursePackageDiscount::getCoursePackageId, discountList.getCourseId()).eq(TCoursePackageDiscount::getAuditStatus,2).orderByAsc(TCoursePackageDiscount::getType));
diff --git a/cloud-server-course/src/main/resources/mapper/CancelledClassesMapper.xml b/cloud-server-course/src/main/resources/mapper/CancelledClassesMapper.xml
index d6f6339..bf4e3b7 100644
--- a/cloud-server-course/src/main/resources/mapper/CancelledClassesMapper.xml
+++ b/cloud-server-course/src/main/resources/mapper/CancelledClassesMapper.xml
@@ -32,6 +32,12 @@
#{id}
</foreach>
</if>
+ <if test="collect != null and collect.size>0">
+ AND t2.id IN
+ <foreach collection="collect" separator="," item="id" open="(" close=")">
+ #{id}
+ </foreach>
+ </if>
</where>
</select>
<select id="getRefund" resultType="com.dsh.course.entity.MoneyBack">
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TBodySideAppointmentsController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TBodySideAppointmentsController.java
index 15abeb8..291bd82 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TBodySideAppointmentsController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TBodySideAppointmentsController.java
@@ -140,8 +140,7 @@
vo.setIds(collect);
}else if(roleType == 3){
List<Integer> list = new ArrayList<>();
- TStoreStaff storeByStoreStaffId = storeStaffClient.getStoreByStoreStaffId(objectId);
- list.add(storeByStoreStaffId.getStoreId());
+ list.add(objectId);
vo.setIds(list);
}
List<QueryBodySideAppointmentVO> queryBodySideAppointmentVOS = bodySideAppointmentClient.listAll(vo);
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java
index d205961..57e53ef 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java
@@ -216,6 +216,9 @@
ofSearch.setUserPopulation(userPopulation);
ofSearch.setStatus(status);
ofSearch.setState(state);
+ if (UserExt.getUser().getObjectType()==3) {
+ ofSearch.setStoreId(UserExt.getUser().getObjectId());
+ }
return client.getCouponListOfSearch(ofSearch);
}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TDiscountController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TDiscountController.java
index 8f39ecc..9832c4f 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TDiscountController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TDiscountController.java
@@ -12,6 +12,7 @@
import com.dsh.course.feignClient.course.CoursePackagePaymentConfigClient;
import com.dsh.course.feignClient.course.model.*;
import com.dsh.course.model.AuditDiscount;
+import com.dsh.guns.config.UserExt;
import com.dsh.guns.core.base.controller.BaseController;
import com.dsh.guns.core.base.tips.ErrorTip;
import com.dsh.guns.core.base.tips.SuccessTip;
@@ -217,6 +218,9 @@
if(ToolUtil.isNotEmpty(shopName)){
wrapper.like(TStore::getName, shopName);
}
+ if(UserExt.getUser().getObjectType()==3){
+ wrapper.eq(TStore::getId, UserExt.getUser().getObjectId());
+ }
List<TStore> list = storeService.list(wrapper);
Page<DiscountList> page = new PageFactory<DiscountList>().defaultPage();
List<DiscountList> discountLists = courseClient.queryDiscountList(new QueryDiscountList(page.getCurrent(),page.getSize(),provinceCode,cityCode,name,type,list.stream().map(TStore::getId).collect(Collectors.toList())));
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TFinanceController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TFinanceController.java
index 0fbd82e..e62a599 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TFinanceController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TFinanceController.java
@@ -604,6 +604,9 @@
coachQuery.setCoachName(coachName);
coachQuery.setCourseName(courseName);
coachQuery.setTime(beginTime);
+ if(UserExt.getUser().getObjectType()==3){
+ coachQuery.setStoreId(UserExt.getUser().getObjectId());
+ }
return cancelledClassesClient.listAll(coachQuery);
}
/**
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/CancelClassesQuery.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/CancelClassesQuery.java
index 27fd6a7..a99c29b 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/CancelClassesQuery.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/CancelClassesQuery.java
@@ -21,4 +21,6 @@
private List<Integer> coachIds;
// 学员ids
private List<Integer> studentIds;
+
+ private Integer storeId;
}
--
Gitblit v1.7.1