From 2dda6304029c95e171b2f9e32406eb4600d77ebd Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 01 十一月 2023 18:57:58 +0800
Subject: [PATCH] 支付会员送券功能补充 运营商权限bug修改
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 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 57e53ef..b6fd68a 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
@@ -152,6 +152,7 @@
Integer objectType = UserExt.getUser().getObjectType();
System.out.println(objectType);
model.addAttribute("item",coupon);
+ model.addAttribute("objectType",objectType);
return PREFIX + "TCouponInfo.html";
}
@@ -174,8 +175,10 @@
@RequestMapping("/storeDetailsOfSearch")
@ResponseBody
public Object listOfStore(String provinceId,String cityId,Integer operatorId,String storeName){
-
-
+ if (UserExt.getUser().getObjectType()== 2){
+ // 筛选这个运营商下的门店
+ operatorId = UserExt.getUser().getObjectId();
+ }
Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
List<Map<String,Object>> storeList = storeService.queryListOfpage(provinceId,cityId,operatorId,storeName,page);
if (storeList.size() > 0 ){
@@ -216,9 +219,15 @@
ofSearch.setUserPopulation(userPopulation);
ofSearch.setStatus(status);
ofSearch.setState(state);
+ if (UserExt.getUser().getObjectType()==2) {
+ ofSearch.setOperatorId(UserExt.getUser().getObjectId());
+ }
if (UserExt.getUser().getObjectType()==3) {
ofSearch.setStoreId(UserExt.getUser().getObjectId());
+ ofSearch.setObjType(UserExt.getUser().getObjectType());
}
+
+
return client.getCouponListOfSearch(ofSearch);
}
@@ -342,9 +351,22 @@
System.out.println(dataVo);
Integer objectType = UserExt.getUser().getObjectType();
dataVo.setUserType(objectType);
+ dataVo.setCityManagerId(UserExt.getUser().getObjectId());
+ if(UserExt.getUser().getObjectType()==3){
+ dataVo.setStoreIds(UserExt.getUser().getObjectId().toString());
+ dataVo.setCompany(3);
+ }
+ dataVo.setObjType(UserExt.getUser().getObjectType());
+ if(UserExt.getUser().getObjectType()==3){
+ dataVo.setStoreIds(UserExt.getUser().getObjectId().toString());
+ dataVo.setCompany(3);
+ }
+ dataVo.setObjType(UserExt.getUser().getObjectType());
client.insertIntoData(dataVo);
return new SuccessTip<>();
}
+
+
@PostMapping(value = "/update")
@ResponseBody
public Object update( Integer id,Integer num,Integer num1,String text){
@@ -352,6 +374,9 @@
coupon.setQuantityIssued(num);
coupon.setPickUpQuantity(num1);
coupon.setIllustrate(text);
+ if (UserExt.getUser().getObjectType()==3) {
+ coupon.setAuditStatus(1);
+ }
client.updateCouponData(coupon);
return new SuccessTip<>();
}
--
Gitblit v1.7.1