From 75bac456c3d66f6b173b1213776158c3bc5f8b96 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期日, 05 十一月 2023 09:45:24 +0800
Subject: [PATCH] 后台bug修改
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java | 34 ++++++++++++++++++++++++++--------
1 files changed, 26 insertions(+), 8 deletions(-)
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 b6fd68a..70bb32f 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
@@ -74,6 +74,7 @@
*/
@RequestMapping("")
public String index(Model model) {
+ model.addAttribute("objectType",UserExt.getUser().getObjectType());
return PREFIX + "TCoupon.html";
}
@@ -96,8 +97,6 @@
model.addAttribute("type",coupon.getType());
return PREFIX + "TCouponRecord.html";
}
-
-
@RequestMapping("/coupon_detail/{id}")
public String memberCouponDetail(@PathVariable Integer id,Model model) {
@@ -124,16 +123,29 @@
list = client.queryCity(coupon.getId());
}
if(coupon.getUseScope()==3){
+ // 门店ids
list1 = client.queryStore(coupon.getId());
+ // 门店集合
list2 = storeService.list(new LambdaQueryWrapper<TStore>().in(TStore::getId, list1));
for (TStore tStore : list2) {
- CityManager cityManager = cmgrClient.queryCityManagerById(tStore.getCityManagerId());
- if (ToolUtil.isNotEmpty(cityManager)){
- tStore.setProvince(tStore.getProvince()+tStore.getCity());
- tStore.setPhone(cityManager.getName()+"-"+cityManager.getPhone());
+ if (coupon.getPublisherType() == 1){
+ // 获取运营商id
+ Integer operatorId = tStore.getOperatorId();
+ TOperator operator = operatorService.getById(operatorId);
+ User user = userService.getById(operator.getUserId());
+ if (ToolUtil.isNotEmpty(user)){
+ tStore.setProvince(tStore.getProvince()+tStore.getCity());
+ tStore.setPhone(user.getName()+"-"+user.getPhone());
+ }
+ }
+ if (coupon.getPublisherType() == 2) {
+ CityManager cityManager = cmgrClient.queryCityManagerById(tStore.getCityManagerId());
+ if (ToolUtil.isNotEmpty(cityManager)) {
+ tStore.setProvince(tStore.getProvince() + tStore.getCity());
+ tStore.setPhone(cityManager.getName() + "-" + cityManager.getPhone());
+ }
}
}
-
}
model.addAttribute("city",list);
model.addAttribute("store",list2);
@@ -220,13 +232,19 @@
ofSearch.setStatus(status);
ofSearch.setState(state);
if (UserExt.getUser().getObjectType()==2) {
+ // 门店ids
+ List<Integer> storeIds = storeService.list(new QueryWrapper<TStore>().eq("operatorId", UserExt.getUser().getObjectId()))
+ .stream().map(TStore::getId).collect(Collectors.toList());
+ ofSearch.setStoreIds(storeIds);
+ ofSearch.setObjType(UserExt.getUser().getObjectType());
ofSearch.setOperatorId(UserExt.getUser().getObjectId());
}
if (UserExt.getUser().getObjectType()==3) {
ofSearch.setStoreId(UserExt.getUser().getObjectId());
ofSearch.setObjType(UserExt.getUser().getObjectType());
}
-
+ // 运营商可以查看平台添加的优惠券应只展示使用范围为全国通用、
+ // 指定城市有运营商管辖的、指定门店有运营商旗下门店
return client.getCouponListOfSearch(ofSearch);
}
--
Gitblit v1.7.1