From a2a27ad42039fd54c5010305aa8c3793e8a5be5d Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期二, 20 十二月 2022 18:56:30 +0800
Subject: [PATCH] #feat uu洗车域名更换
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 86 ++++++++++++++++++++++++++++++++----------
1 files changed, 65 insertions(+), 21 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 608245b..604c9ca 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());
}
@@ -532,12 +541,36 @@
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);
}
@@ -853,6 +886,14 @@
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);
+ }
+
return R.ok(loginUserInfoVO);
}
@@ -1358,7 +1399,6 @@
menu.add(300L);
menu.add(303L);
}
-
sysRoleDO.setRoleSort(0);
sysRoleDO.setCreateBy(administratorsUserVO.getUserId());
SysRoleDO sysRoleDO1 = roleDAO.selectOne(
@@ -1376,10 +1416,6 @@
}
}
log.info("======================type"+administratorsUserVO.getType());
- if (administratorsUserVO.getType().equals(20)){
- roleId=1559112102373756548L;
- administratorsUserVO.setType(3);
- }
log.info("=======================roleId"+roleId);
SysRoleDO roleDO = roleDAO.selectById(roleId);
if (ObjectUtils.isEmpty(roleDO)) {
@@ -1388,6 +1424,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);
@@ -2871,7 +2910,8 @@
@Transactional(rollbackFor = Exception.class)
public R addConvenientMerchantUser(ConvenientMerchantDTO convenientMerchantDTO) {
SysUserDO sysUserDO;
- sysUserDO = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getAccount, convenientMerchantDTO.getAccount()));
+ sysUserDO = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getAccount, convenientMerchantDTO.getAccount())
+ .eq(SysUserDO::getPhone,convenientMerchantDTO.getMobilePhone()).eq(SysUserDO::getAppId,"wx118de8a734d269f0"));
if (nonNull(sysUserDO)) {
return R.fail("账户已经存在");
}
@@ -2880,12 +2920,13 @@
String encode = new BCryptPasswordEncoder().encode(convenientMerchantDTO.getPassword());
BeanUtils.copyProperties(convenientMerchantDTO, sysUserDO);
sysUserDO.setAccount(convenientMerchantDTO.getAccount());
- sysUserDO.setType(10);
+ sysUserDO.setType(5);
sysUserDO.setAreaId(null);
sysUserDO.setStatus(1);
- sysUserDO.setPhone(null);
+ sysUserDO.setPhone(convenientMerchantDTO.getMobilePhone());
sysUserDO.setName(convenientMerchantDTO.getContacts());
sysUserDO.setPassword(encode);
+ sysUserDO.setAppId("wx118de8a734d269f0");
try {
userDao.insert(sysUserDO);
return R.ok(sysUserDO.getUserId());
@@ -3375,7 +3416,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"));
@@ -3735,16 +3776,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);
}
@@ -3977,14 +4018,17 @@
@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);
}
--
Gitblit v1.7.1