From a9564eae9f0169ca39329b2f14a8f13d13358a0a Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期五, 17 十一月 2023 15:28:44 +0800
Subject: [PATCH] 11.7
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java | 30 +++++++++++++++++++-----------
1 files changed, 19 insertions(+), 11 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 70bb32f..bcc1b1e 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
@@ -139,11 +139,11 @@
}
}
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());
- }
+ User byId = userService.getById(tStore.getStoreStaffId());
+
+ tStore.setProvince(tStore.getProvince() + tStore.getCity());
+ tStore.setPhone(byId.getName() + "-" + byId.getPhone());
+
}
}
}
@@ -321,6 +321,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
@@ -370,14 +378,14 @@
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);
+ }else 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);
+ }else{
+ dataVo.setUserType(1);
}
dataVo.setObjType(UserExt.getUser().getObjectType());
client.insertIntoData(dataVo);
--
Gitblit v1.7.1