From a1557f3f07287c86e8a4a408f03ba19993e5a48c Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 25 十月 2023 09:41:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/CoursePackagePaymentController.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
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 6e8ad57..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
@@ -1,6 +1,7 @@
package com.dsh.guns.modular.system.controller.code;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.dsh.course.feignClient.account.AppUserClient;
import com.dsh.course.feignClient.account.CityManagerClient;
import com.dsh.course.feignClient.account.model.CityManager;
@@ -27,6 +28,7 @@
import java.math.BigDecimal;
import java.util.*;
+import java.util.stream.Collectors;
/**
* 广告管理控制器
@@ -94,7 +96,7 @@
// 获取课包id
Integer coursePackageId = tCoursePackagePayment.getCoursePackageId();
List<TCoursePackageDiscount> list = coursePackageDiscountClient.queryByCoursePackageId(coursePackageId);
- TCoursePackageDiscount tCoursePackageDiscount1 = list.get(0);
+
// 获取当前课包价格配置
CoursePackagePaymentConfig coursePackagePaymentConfigs = coursePackagePaymentConfigClient.getById(id);
Integer coursePackageId1 = tCoursePackagePayment.getCoursePackageId();
@@ -120,6 +122,19 @@
@RequestMapping(value = "/listAll")
@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);
+ }
return coursePackagePaymentClient.listAll(query);
}
--
Gitblit v1.7.1