From b27efc697f2f81e0d0f247a2708e58af52a5df9b Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 23 十月 2025 15:14:33 +0800
Subject: [PATCH] bug修改,后台新增修改用户积分
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java | 179 +++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 154 insertions(+), 25 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 e5a03ce..4370fa7 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
@@ -11,10 +11,8 @@
import com.dsh.course.feignClient.account.model.QueryByNamePhone;
import com.dsh.course.feignClient.account.model.TAppUser;
import com.dsh.course.feignClient.activity.CouponClient;
-import com.dsh.course.feignClient.activity.model.Coupon;
-import com.dsh.course.feignClient.activity.model.CouponCity;
-import com.dsh.course.feignClient.activity.model.CouponListOfSearch;
-import com.dsh.course.feignClient.activity.model.CouponRecordQuery;
+import com.dsh.course.feignClient.activity.model.*;
+import com.dsh.course.feignClient.other.model.Site;
import com.dsh.guns.config.UserExt;
import com.dsh.guns.core.base.tips.SuccessTip;
import com.dsh.guns.core.common.constant.factory.PageFactory;
@@ -68,12 +66,15 @@
private TOperatorService operatorService;
@Autowired
private TOperatorCityService operatorCityService;
+ @Autowired
+ private ITSiteService siteService;
/**
* 跳转到优惠券管理首页
*/
@RequestMapping("")
public String index(Model model) {
+ model.addAttribute("objectType",UserExt.getUser().getObjectType());
return PREFIX + "TCoupon.html";
}
@@ -84,7 +85,9 @@
public String memberCouponAdd(Model model) {
Integer objectType = UserExt.getUser().getObjectType();
System.out.println(objectType);
+ List<PointsMerchandise> pointsMerchandises = client.goodsList();
model.addAttribute("userType",objectType);
+ model.addAttribute("goods",pointsMerchandises);
return PREFIX + "TCouponAdd.html";
}
@@ -96,8 +99,6 @@
model.addAttribute("type",coupon.getType());
return PREFIX + "TCouponRecord.html";
}
-
-
@RequestMapping("/coupon_detail/{id}")
public String memberCouponDetail(@PathVariable Integer id,Model model) {
@@ -124,16 +125,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) {
+ User byId = userService.getById(tStore.getStoreStaffId());
+
+ tStore.setProvince(tStore.getProvince() + tStore.getCity());
+ tStore.setPhone(byId.getName() + "-" + byId.getPhone());
+
}
}
-
}
model.addAttribute("city",list);
model.addAttribute("store",list2);
@@ -153,10 +167,17 @@
System.out.println(objectType);
model.addAttribute("item",coupon);
model.addAttribute("objectType",objectType);
+ List<PointsMerchandise> pointsMerchandises = client.goodsList();
+ model.addAttribute("goods",pointsMerchandises);
return PREFIX + "TCouponInfo.html";
}
-
+ // 积分商品活动状态 未开始和已开始状态 上架
+ @RequestMapping("/goodsList")
+ @ResponseBody
+ public Object goodsList() {
+ return client.goodsList();
+ }
/**
* 跳转到门店管理列表页
@@ -168,7 +189,23 @@
@RequestMapping("/updateType")
@ResponseBody
public Object updateType(Long id) {
- client.updateType(id);
+ if (UserExt.getUser().getObjectType()==1){
+ client.updateType(id);
+ }
+ if (UserExt.getUser().getObjectType()!=1){
+ if (UserExt.getUser().getObjectType()==2){
+ TStore tStore = storeService.getById(UserExt.getUser().getObjectId());
+ client.updateTypeOther(id,tStore.getOperatorId()==null?0:tStore.getOperatorId(),
+ tStore.getId(),0);
+ }
+ if (UserExt.getUser().getObjectType()==3){
+ TSite site = siteService.getById(UserExt.getUser().getObjectId());
+ TStore tStore = storeService.getById(site.getStoreId());
+ client.updateTypeOther(id,tStore.getOperatorId()==null?0:tStore.getOperatorId(),
+ tStore.getId(),site.getId());
+ }
+ }
+
return new SuccessTip<>();
}
@@ -187,21 +224,72 @@
String cityName = (String) stringObjectMap.get("city");
stringObjectMap.put("provinceCity",provinceName+cityName);
Integer managerId = (Integer) stringObjectMap.get("operatorId");
- if (managerId==0){
+ if (managerId == null){
stringObjectMap.put("accountName","平台");
}else{
+ if (managerId==0){
+ stringObjectMap.put("accountName","平台");
+ }else{
+ TOperator operator = operatorService.getOne(new QueryWrapper<TOperator>().eq("id", managerId));
+ if (ToolUtil.isNotEmpty(operator)){
+ stringObjectMap.put("accountName",operator.getName());
+ }else{
+ stringObjectMap.put("accountName","平台");
+ }
+ }
+ }
+ }
+ }
+ return storeList;
+ }
+ // 查询场地列表
+ @RequestMapping("/siteDetailsOfSearch")
+ @ResponseBody
+ public Object siteDetailsOfSearch(String provinceId,String cityId,Integer operatorId,String storeName){
+ List<Map<String, Object>> res = new ArrayList<>();
+ Integer storeId = null;
+ if (UserExt.getUser().getObjectType()== 2){
+ // 筛选这个运营商下的门店
+ operatorId = UserExt.getUser().getObjectId();
+ List<Integer> storeIds = storeService.lambdaQuery().eq(TStore::getOperatorId, operatorId).list()
+ .stream().map(TStore::getId).collect(Collectors.toList());
+ if (storeIds.isEmpty()){
+ storeIds.add(0);
+ }
+ res = storeService.querySiteListOfpageOperator(provinceId,cityId,operatorId,storeName,storeIds);
+ }else if (UserExt.getUser().getObjectType()== 3){
+ // 筛选这个运营商下的门店
+ storeId = UserExt.getUser().getObjectId();
+ res = storeService.querySiteListOfpage(provinceId,cityId,operatorId,storeName,storeId);
+ }else{
+ List<Integer> storeIds = new ArrayList<>();
+ res = storeService.querySiteListOfpageOperator(provinceId,cityId,operatorId,storeName,storeIds);
+ }
+ if (res.size() > 0 ){
+ for (Map<String, Object> stringObjectMap : res) {
+ String provinceName = (String) stringObjectMap.get("province");
+ String cityName = (String) stringObjectMap.get("city");
+ stringObjectMap.put("provinceCity",provinceName+cityName);
+
+ Integer managerId = (Integer) stringObjectMap.get("operatorId");
+
+ Integer type = (Integer) stringObjectMap.get("type");
+ if (type == 1){
+ // 平台
+ stringObjectMap.put("account","平台");
+ }else{
+ // 根据门店获取运营商id 查询运营商名称
+
+ // 查询运营商名称
TOperator operator = operatorService.getOne(new QueryWrapper<TOperator>().eq("id", managerId));
if (ToolUtil.isNotEmpty(operator)){
- stringObjectMap.put("accountName",operator.getName());
- }else{
- stringObjectMap.put("accountName","平台");
-
+ stringObjectMap.put("account",operator.getName());
}
}
}
}
- return storeList;
+ return res;
}
/**
@@ -220,16 +308,41 @@
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());
+ // 查询当前门店属于哪个运营商
+ List<TOperatorCity> operatorId = operatorCityService.list(new QueryWrapper<TOperatorCity>().eq("operatorId", UserExt.getUser().getObjectId()));
+ ofSearch.setOperatorCities(operatorId);
}
if (UserExt.getUser().getObjectType()==3) {
ofSearch.setStoreId(UserExt.getUser().getObjectId());
ofSearch.setObjType(UserExt.getUser().getObjectType());
}
+ // 运营商可以查看平台添加的优惠券应只展示使用范围为全国通用、
+ // 指定城市有运营商管辖的、指定门店有运营商旗下门店
+ List<Map<String, Object>> couponListOfSearch = client.getCouponListOfSearch(ofSearch);
-
- return client.getCouponListOfSearch(ofSearch);
+ return couponListOfSearch;
}
+ @RequestMapping(value = "/listSelect")
+ @ResponseBody
+ public Object listOfDatas(String name, Integer type, Integer status, Integer state) {
+ Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+ CouponListOfSearch ofSearch = new CouponListOfSearch();
+ ofSearch.setPage(page);
+ ofSearch.setName(name);
+ ofSearch.setType(type);
+ ofSearch.setStatus(status);
+ ofSearch.setState(state);
+ List<Map<String, Object>> couponListOfSearch = client.getCouponListAllOfSearch(ofSearch);
+ return couponListOfSearch;
+ }
+
+
/**
* 获取 优惠券管理
@@ -248,6 +361,8 @@
ofSearch.setState(state);
ofSearch.setCityCode(cityCode);
ofSearch.setStoreId(storeId);
+ ofSearch.setObjType(UserExt.getUser().getObjectType());
+ ofSearch.setOperatorId(UserExt.getUser().getObjectId());
return client.getCouponListOfSearch1(ofSearch);
}
@@ -256,15 +371,12 @@
@RequestMapping(value = "/listRecord")
@ResponseBody
public Object listRecord(Integer id,String name, Integer type, String phone) {
- Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
List<TAppUser> tAppUsers = appUserClient.queryByNamePhone(new QueryByNamePhone(name, phone));
if(tAppUsers.size()==0){
return new ArrayList<>();
}
CouponRecordQuery ofSearch = new CouponRecordQuery();
ofSearch.setId(id);
- ofSearch.setLimit(page.getSize());
- ofSearch.setOffset(page.getCurrent());
ofSearch.setIds(tAppUsers.stream().map(TAppUser::getId).collect(Collectors.toList()));
ofSearch.setType(type);
List<Map<String, Object>> maps = client.listRecord(ofSearch);
@@ -303,6 +415,14 @@
return regiService.list(new LambdaQueryWrapper<Region>()
.eq(Region::getParentId,province));
}
+ @RequestMapping(value = "/getCity1")
+ @ResponseBody
+ public Object getCity1(String province){
+ // 获取省的id
+ Integer code = regiService.getOne(new QueryWrapper<Region>().eq("code", province)).getId();
+ return regiService.list(new LambdaQueryWrapper<Region>()
+ .eq(Region::getParentId,code));
+ }
// 通过市 获取运营商
@RequestMapping(value = "/getOperator")
@ResponseBody
@@ -322,6 +442,8 @@
if (imgFile != null){
String originalFilename = imgFile.getOriginalFilename();
String newName = originalFilename.substring(imgFile.getOriginalFilename().lastIndexOf("."));
+
+
String url = OssUploadUtil.ossUpload("img/",imgFile);
Map<String, String> map = new HashMap<String, String>();
//是否上传成功
@@ -352,9 +474,16 @@
Integer objectType = UserExt.getUser().getObjectType();
dataVo.setUserType(objectType);
dataVo.setCityManagerId(UserExt.getUser().getObjectId());
- if(UserExt.getUser().getObjectType()==3){
+ if(UserExt.getUser().getObjectType()==2){
+ dataVo.setCompany(3);
+ dataVo.setUserType(2);
+ dataVo.setCityManagerId(UserExt.getUser().getObjectId());
+ }else if(UserExt.getUser().getObjectType()==3){
dataVo.setStoreIds(UserExt.getUser().getObjectId().toString());
dataVo.setCompany(3);
+ dataVo.setUserType(3);
+ }else{
+ dataVo.setUserType(1);
}
dataVo.setObjType(UserExt.getUser().getObjectType());
client.insertIntoData(dataVo);
--
Gitblit v1.7.1