From d6f0958babd71a1dc9d24496076f763f86d76ac7 Mon Sep 17 00:00:00 2001 From: 44323 <443237572@qq.com> Date: 星期五, 27 十月 2023 13:08:53 +0800 Subject: [PATCH] 商户认证 --- cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TDiscountController.java | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) 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 b8d1c5d..5c09f57 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 @@ -7,19 +7,21 @@ import com.dsh.course.feignClient.competition.model.Competition; import com.dsh.course.feignClient.competition.model.CompetitionUser; import com.dsh.course.feignClient.competition.model.GetPeopleQuery; -import com.dsh.course.feignClient.competition.model.ListQuery; import com.dsh.course.feignClient.course.CourseClient; import com.dsh.course.feignClient.course.CoursePackageDiscountClient; import com.dsh.course.feignClient.course.CoursePackagePaymentConfigClient; -import com.dsh.course.feignClient.course.CoursePackageTypeClient; 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; import com.dsh.guns.core.common.constant.factory.PageFactory; import com.dsh.guns.core.util.ToolUtil; +import com.dsh.guns.modular.system.model.DiscountUpdateState; import com.dsh.guns.modular.system.model.TCity; import com.dsh.guns.modular.system.model.TStore; +import com.dsh.guns.modular.system.model.dto.CoursePackage; import com.dsh.guns.modular.system.service.ICityService; import com.dsh.guns.modular.system.service.ICoursePackageService; import com.dsh.guns.modular.system.service.IStoreService; @@ -62,9 +64,6 @@ @Autowired private CourseClient courseClient; - - - /** * 跳转到车辆管理首页 @@ -219,6 +218,12 @@ if(ToolUtil.isNotEmpty(shopName)){ wrapper.like(TStore::getName, shopName); } + if(UserExt.getUser().getObjectType()==3){ + wrapper.eq(TStore::getId, UserExt.getUser().getObjectId()); + } + if(UserExt.getUser().getObjectType()==2){ + wrapper.eq(TStore::getOperatorId, 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()))); -- Gitblit v1.7.1