From c20f18b987d597b04e110665c57c0cc6eb796525 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期三, 05 七月 2023 10:06:51 +0800
Subject: [PATCH] 修改新增社区 不同区域同名字社区添加报错
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 200 ++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 169 insertions(+), 31 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
index 0271801..612ce4b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -31,6 +31,7 @@
import com.panzhihua.common.model.vos.community.acid.ComActAcidRecordVO;
import com.panzhihua.common.model.vos.community.microCommercialStreet.McsLoginUserInfoVO;
import com.panzhihua.common.model.vos.sanshuo.ComSanshuoExpertVO;
+import com.panzhihua.common.model.vos.shop.ComShopUserAddressVO;
import com.panzhihua.common.model.vos.user.*;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.utlis.*;
@@ -331,6 +332,14 @@
return R.fail();
}
LoginUserInfoVO loginUserInfoVO = new LoginUserInfoVO();
+ //获取后台商家user
+ SysUserDO sysUser = userDao.selectOne(
+ new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getType, 5).eq(SysUserDO::getPhone, sysUserDO.getPhone()).eq(SysUserDO::getAppId, appId));
+ //判断是否是商家账号
+ if (nonNull(sysUser)){
+ loginUserInfoVO.setBackstageUserId(sysUser.getUserId());
+ loginUserInfoVO.setBackstageType(5);
+ }
if (nonNull(sysUserDO.getStreetId())){
loginUserInfoVO.setStreetId(sysUserDO.getStreetId());
}
@@ -369,6 +378,13 @@
int i = userDao.isDpcMember(sysUserDO.getPhone(), sysUserDO.getName());
if (i>0){
loginUserInfoVO.setIsDpcMember(1);
+ }
+ }
+ //是否为物业公司账号
+ if (nonNull(sysUserDO.getPhone())){
+ Long propertyAccount = userDao.isPropertyAccount(sysUserDO.getPhone());
+ if (nonNull(propertyAccount)){
+ loginUserInfoVO.setPropertyId(propertyAccount);
}
}
return R.ok(loginUserInfoVO);
@@ -524,6 +540,37 @@
if (i>0){
loginUserInfoVO.setIsDpcMember(1);
}
+ }
+ //获取后台商家user
+ SysUserDO sysUser = userDao.selectOne(
+ new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getType, 5).eq(SysUserDO::getPhone, sysUserDO.getPhone()).eq(SysUserDO::getAppId, "wx118de8a734d269f0"));
+ //判断是否是商家账号
+ if (nonNull(sysUser)){
+ loginUserInfoVO.setBackstageUserId(sysUser.getUserId());
+ loginUserInfoVO.setBackstageType(5);
+ Long storeId = userDao.selectStoreIdIdByUserId(sysUser.getUserId());
+ loginUserInfoVO.setStoreIdId(storeId);
+
+ }
+ //是否为物业公司账号
+ if (nonNull(sysUserDO.getPhone())){
+ Long propertyAccount = userDao.isPropertyAccount(sysUserDO.getPhone());
+ if (nonNull(propertyAccount)){
+ loginUserInfoVO.setPropertyId(propertyAccount);
+ }
+ }
+ //获取自提点账号
+ if (StrUtil.isNotBlank(sysUserDO.getPhone())){
+ if(userDao.checkPoint(sysUserDO.getPhone()) > 0){
+ loginUserInfoVO.setIsPoint(true);
+ }else {
+ loginUserInfoVO.setIsPoint(false);
+ }
+ }
+ //默认地址
+ ComShopUserAddressVO comShopUserAddressVO = userDao.selectDefaultAddressVO(userId);
+ if (nonNull(comShopUserAddressVO)){
+ loginUserInfoVO.setComShopUserAddressVO(comShopUserAddressVO);
}
return R.ok(loginUserInfoVO);
}
@@ -839,6 +886,18 @@
if (sysUserDO.getBindingCheckUnitId() != null) {
loginUserInfoVO.setBackstageType(4);
}
+ //判断是否是商家账号
+ Long storeId = userDao.selectStoreIdIdByUserId(sysUserDO.getUserId());
+ if (null != storeId){
+ loginUserInfoVO.setBackstageUserId(sysUserDO.getUserId());
+ loginUserInfoVO.setBackstageType(5);
+ loginUserInfoVO.setStoreIdId(storeId);
+ }
+
+ SysUserRoleDO sysUserRoleDO=sysUserRoleDAO.selectOne(new QueryWrapper<SysUserRoleDO>()
+ .lambda().eq(SysUserRoleDO::getUserId,sysUserDO.getUserId()));
+ loginUserInfoVO.setRoleId(sysUserRoleDO.getRoleId().toString());
+
return R.ok(loginUserInfoVO);
}
@@ -1197,6 +1256,15 @@
@Override
@Transactional(rollbackFor = Exception.class)
public R addUserBackstage(AdministratorsUserVO administratorsUserVO) {
+
+ List<SysUserDO> list=userDao.selectList(new QueryWrapper<SysUserDO>().lambda().
+ eq(SysUserDO::getAppId,administratorsUserVO.getAppid()).
+ eq(SysUserDO::getAccount,administratorsUserVO.getAccount()));
+ if(list!=null && list.size()>0)
+ {
+ return R.fail("账户已存在！");
+ }
+
ComActVO comActVO = userDao.selectCommunity(administratorsUserVO.getCommunityId());
if (nonNull(comActVO)) {
List<ComAreaTownCommunityVO> areaTownList = userDao.selectAreaTownCommunity(comActVO.getName());
@@ -1229,11 +1297,29 @@
}
sysRoleDO.setRoleSort(0);
sysRoleDO.setCreateBy(administratorsUserVO.getUserId());
- int insert = roleDAO.insert(sysRoleDO);
- if (insert > 0) {
- SysRoleDO sysRoleDO1 = roleDAO.selectOne(
- new QueryWrapper<SysRoleDO>().lambda().eq(SysRoleDO::getRoleKey, sysRoleDO.getRoleKey()));
- roleId = sysRoleDO1.getRoleId();
+ sysRoleDO.setRoleId(Snowflake.getId());
+
+ SysRoleDO sysRoleDOSelext = roleDAO.selectOne(
+ new QueryWrapper<SysRoleDO>().lambda().eq(SysRoleDO::getRoleKey, sysRoleDO.getRoleKey()));
+
+ if(sysRoleDOSelext==null)
+ {
+ int insert = roleDAO.insert(sysRoleDO);
+ if (insert > 0) {
+ SysRoleDO sysRoleDO1 = roleDAO.selectOne(
+ new QueryWrapper<SysRoleDO>().lambda().eq(SysRoleDO::getRoleId, sysRoleDO.getRoleId()));
+ roleId = sysRoleDO1.getRoleId();
+ // 新角色设置所有权限
+ MenuRoleVO menuRoleVO = new MenuRoleVO();
+ menuRoleVO.setIsAll(1);
+ menuRoleVO.setCommunityId(communityId);
+ menuRoleVO.setRoleId(roleId);
+ this.putMenuRole(menuRoleVO);
+ }
+ }
+ else
+ {
+ roleId = sysRoleDOSelext.getRoleId();
// 新角色设置所有权限
MenuRoleVO menuRoleVO = new MenuRoleVO();
menuRoleVO.setIsAll(1);
@@ -1241,6 +1327,7 @@
menuRoleVO.setRoleId(roleId);
this.putMenuRole(menuRoleVO);
}
+
}
if (roleId.intValue() == 777777777) {
SysRoleDO sysRoleDO = new SysRoleDO();
@@ -1248,11 +1335,47 @@
sysRoleDO.setRoleKey(Constants.STREET_ROLE_KEY + administratorsUserVO.getStreetId());
sysRoleDO.setRoleSort(0);
sysRoleDO.setCreateBy(administratorsUserVO.getUserId());
- int insert = roleDAO.insert(sysRoleDO);
- if (insert > 0) {
- SysRoleDO sysRoleDO1 = roleDAO.selectOne(
- new QueryWrapper<SysRoleDO>().lambda().eq(SysRoleDO::getRoleKey, sysRoleDO.getRoleKey()));
- roleId = sysRoleDO1.getRoleId();
+ sysRoleDO.setRoleId(Snowflake.getId());
+
+ SysRoleDO sysRoleDOSelext = roleDAO.selectOne(
+ new QueryWrapper<SysRoleDO>().lambda().eq(SysRoleDO::getRoleKey, sysRoleDO.getRoleKey()));
+
+ if(sysRoleDOSelext==null)
+ {
+ int insert = roleDAO.insert(sysRoleDO);
+ if (insert > 0) {
+// SysRoleDO sysRoleDO1 = roleDAO.selectOne(
+// new QueryWrapper<SysRoleDO>().lambda().eq(SysRoleDO::getRoleId, sysRoleDO.getRoleId()));
+ roleId = sysRoleDOSelext.getRoleId();
+ // 新街道管理员角色设置固定三社权限
+ MenuRoleVO menuRoleVO = new MenuRoleVO();
+ List<Long> menu = new ArrayList<>();
+ if (administratorsUserVO.getSocialType() == 1) {
+ menu.add(233L);
+ menu.add(234L);
+ menu.add(235L);
+ menu.add(236L);
+ menu.add(237L);
+ } else if (administratorsUserVO.getSocialType() == 2) {
+ menu.add(233L);
+ menu.add(234L);
+ menu.add(236L);
+ menu.add(237L);
+ menu.add(238L);
+ } else if (administratorsUserVO.getSocialType() == 3) {
+ menu.add(233L);
+ menu.add(237L);
+ } else {
+ menuRoleVO.setIsAll(1);
+ }
+ menuRoleVO.setMenuIds(menu);
+ menuRoleVO.setRoleId(roleId);
+ this.putMenuRole(menuRoleVO);
+ }
+ }
+ else
+ {
+ roleId = sysRoleDOSelext.getRoleId();
// 新街道管理员角色设置固定三社权限
MenuRoleVO menuRoleVO = new MenuRoleVO();
List<Long> menu = new ArrayList<>();
@@ -1278,6 +1401,7 @@
menuRoleVO.setRoleId(roleId);
this.putMenuRole(menuRoleVO);
}
+
}
SysRoleDO roleDO = roleDAO.selectById(roleId);
if (ObjectUtils.isEmpty(roleDO)) {
@@ -1344,13 +1468,12 @@
menu.add(300L);
menu.add(303L);
}
-
sysRoleDO.setRoleSort(0);
sysRoleDO.setCreateBy(administratorsUserVO.getUserId());
- SysRoleDO sysRoleDO1 = roleDAO.selectOne(
+ List<SysRoleDO> sysRoleDO1 = roleDAO.selectList(
new QueryWrapper<SysRoleDO>().lambda().eq(SysRoleDO::getRoleKey, sysRoleDO.getRoleKey()));
- if (sysRoleDO1 != null) {
- sysRoleDO = sysRoleDO1;
+ if (sysRoleDO1 != null && sysRoleDO1.size()>0 ) {
+ sysRoleDO = sysRoleDO1.get(0);
roleId = sysRoleDO.getRoleId();
} else {
roleDAO.insert(sysRoleDO);
@@ -1361,9 +1484,8 @@
this.putMenuRole(menuRoleVO);
}
}
- if (administratorsUserVO.getType().equals(20)){
- roleId=1559112102373756548L;
- }
+ log.info("======================type"+administratorsUserVO.getType());
+ log.info("=======================roleId"+roleId);
SysRoleDO roleDO = roleDAO.selectById(roleId);
if (ObjectUtils.isEmpty(roleDO)) {
return R.fail("角色不存在");
@@ -1371,6 +1493,9 @@
String encode = new BCryptPasswordEncoder().encode(administratorsUserVO.getPassword());
administratorsUserVO.setPassword(encode);
BeanUtils.copyProperties(administratorsUserVO, sysUserDO);
+ if (nonNull(administratorsUserVO.getAppid())){
+ sysUserDO.setAppId(administratorsUserVO.getAppid());
+ }
int insert = 0;
try {
insert = userDao.insert(sysUserDO);
@@ -1384,7 +1509,6 @@
} else if (e.getMessage().contains("23000")) {
throw new ServiceException("手机号已存在");
}
-
}
if (insert > 0) {
SysUserDO sysUserDO1 = userDao
@@ -2871,6 +2995,7 @@
sysUserDO.setPhone(convenientMerchantDTO.getMobilePhone());
sysUserDO.setName(convenientMerchantDTO.getContacts());
sysUserDO.setPassword(encode);
+ sysUserDO.setAppId("wx118de8a734d269f0");
try {
userDao.insert(sysUserDO);
return R.ok(sysUserDO.getUserId());
@@ -3360,7 +3485,7 @@
}
Map<String, String> headerMap = new HashMap<>();
headerMap.put("appid", appId);
- String resultJson = HttpClientUtil.get("https://api.uucsh.cn/member/wx/get-access?province=" + uuLoginVO.getProvince() + "&city=" + uuLoginVO.getCity() + "&area=" + uuLoginVO.getArea() + "&appid=" + appId + "×tamp=" + uuLoginVO.getTimestamp() + "&sign=" + uuLoginVO.getSign() + "&mobile=" + uuLoginVO.getMobile() + "&couponId=" + uuLoginVO.getCouponId(), headerMap, null);
+ String resultJson = HttpClientUtil.get("https://uu-api.imashuo.com/member/wx/get-access?province=" + uuLoginVO.getProvince() + "&city=" + uuLoginVO.getCity() + "&area=" + uuLoginVO.getArea() + "&appid=" + appId + "×tamp=" + uuLoginVO.getTimestamp() + "&sign=" + uuLoginVO.getSign() + "&mobile=" + uuLoginVO.getMobile() + "&couponId=" + uuLoginVO.getCouponId(), headerMap, null);
JSONObject result = JSON.parseObject(resultJson);
if (result.get("status").equals(1)) {
return R.ok(result.get("data"));
@@ -3720,16 +3845,16 @@
@Override
public R getAllCommunityList() {
List<Integer> areaList = areaCodeList();
- List<AreaVOS> areaVOList = new ArrayList<>();
+ List<AreaVOStr> areaVOList = new ArrayList<>();
for (Integer code : areaList) {
- AreaVOS areaVO = new AreaVOS();
- areaVO.setId(code);
+ AreaVOStr areaVO = new AreaVOStr();
+ areaVO.setId(code+"");
areaVO.setName(areaCodeToName(code.longValue()));
- List<StreetVOS> streetVOS = userDao.selectStreetByAreaCode(code);
- Iterator<StreetVOS> iterator = streetVOS.listIterator();
+ List<StreetVOStr> streetVOS = userDao.selectStreetByAreaCodeStr(code);
+ Iterator<StreetVOStr> iterator = streetVOS.listIterator();
while (iterator.hasNext()) {
- StreetVOS vo = iterator.next();
- List<CommunityVO> communityVOS = userDao.selectCommunityByStreetId(vo.getId(), 3);
+ StreetVOStr vo = iterator.next();
+ List<CommunityVO> communityVOS = userDao.selectCommunityByStreetId(Long.parseLong(vo.getId()), 3);
vo.setChildList(communityVOS);
}
@@ -3962,17 +4087,30 @@
@Override
public R feedBackReply(SysUserFeedbackVO sysUserFeedbackVO) {
- SysUserFeedbackDO sysUserFeedbackDO=new SysUserFeedbackDO();
- BeanUtils.copyProperties(sysUserFeedbackVO, sysUserFeedbackDO);
- return R.ok(sysUserFeedbackDAO.updateById(sysUserFeedbackDO));
+ if (isNull(sysUserFeedbackVO.getReply())){
+ return R.fail("回复内容不能为空");
+ }
+ SysUserFeedbackDO sysUserFeedbackDO1 = sysUserFeedbackDAO.selectById(sysUserFeedbackVO.getId());
+ sysUserFeedbackDO1.setReply(sysUserFeedbackVO.getReply());
+ return R.ok(sysUserFeedbackDAO.reply(sysUserFeedbackDO1));
}
@Override
- public R myFeedBack(Long id,Integer type) {
- List<SysUserFeedbackDO> sysUserFeedbackDOS = sysUserFeedbackDAO.selectList(new QueryWrapper<SysUserFeedbackDO>().lambda().eq(SysUserFeedbackDO::getType, type).eq(SysUserFeedbackDO::getUserId, id));
+ public R myFeedBack(Long id,Integer type,Long propertyId) {
+ List<SysUserFeedbackDO> sysUserFeedbackDOS = sysUserFeedbackDAO.selectList(new QueryWrapper<SysUserFeedbackDO>().lambda().eq(SysUserFeedbackDO::getType, type).eq(SysUserFeedbackDO::getUserId, id).eq(SysUserFeedbackDO::getPropertyId,propertyId ));
return R.ok(sysUserFeedbackDOS);
}
+ @Override
+ public R propertyCheck(String phone) {
+ Long propertyAccount = userDao.isPropertyAccount(phone);
+ log.info("==============物业公司id"+propertyAccount);
+ if (isNull(propertyAccount)){
+ return R.fail();
+ }
+ return R.ok(propertyAccount);
+ }
+
@Override
public R getAreaAndStreet() {
--
Gitblit v1.7.1