From 42521c9b51c1bd9a40036f18fd610cd46601222d Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期一, 28 十一月 2022 14:45:22 +0800
Subject: [PATCH] #feat .
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 172 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 151 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 9843310..eda1ddf 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.*;
@@ -309,7 +310,7 @@
Boolean isIndustryOrExpertAccount=(userDao.isIndustryCenterAccount(name)>0 || userDao.isExpertAccount(name)>0);
if (1 == type) {
sysUserDO = userDao.selectOne(
- new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getType, type).eq(SysUserDO::getOpenid, name));
+ new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getType, type).eq(SysUserDO::getOpenid, name).eq(SysUserDO::getAppId, appId));
}else if(isIndustryOrExpertAccount) {
//三说会堂行业分中心或专家后台账号登陆
sysUserDO = userDao.selectOne(
@@ -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());
}
@@ -363,6 +372,20 @@
roleDOList.forEach(sysRoleDO -> {
set.add(sysRoleDO.getRoleKey());
});
+ }
+ //是否为人大代表
+ if (StringUtils.isNotEmpty(sysUserDO.getPhone()) && StringUtils.isNotEmpty(sysUserDO.getName())){
+ 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);
}
@@ -510,6 +533,44 @@
ComSanshuoExpertVO expertVO=userDao.isExpert(loginUserInfoVO.getPhone());
if (nonNull(expertVO)){
loginUserInfoVO.setType(13);
+ }
+ //是否为人大代表
+ if (StringUtils.isNotEmpty(phone) && StringUtils.isNotEmpty(sysUserDO.getName())){
+ int i = userDao.isDpcMember(phone, sysUserDO.getName());
+ 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);
}
@@ -778,6 +839,13 @@
//是否是防疫工作人员
loginUserInfoVO.setIsAcidMember(0);
ComActAcidMemberVO acidMember = userDao.selectAcidMemberByPhone(loginUserInfoVO.getPhone());
+ //是否为普达物业公司后台账号
+ if (nonNull(sysUserDO.getPhone())){
+ Long propertyAccount = userDao.isPropertyAccount(sysUserDO.getPhone());
+ if (nonNull(propertyAccount)){
+ loginUserInfoVO.setPropertyId(propertyAccount);
+ }
+ }
if (nonNull(acidMember)) {
if (acidMember.getRelationName().equals("panzhihua") || acidMember.getRelationName().equals("西区") || acidMember.getRelationName().equals("东区") || acidMember.getRelationName().equals("仁和区") || acidMember.getRelationName().equals("米易县") || acidMember.getRelationName().equals("盐边县")) {
loginUserInfoVO.setIsAcidMember(1);
@@ -987,7 +1055,7 @@
userDao.updateComPbMemberUserId(idCard, sysUserDO.getUserId());
}
- SysUserDO user = userDao.selectById(loginUserInfoVO.getUserId());
+ /*SysUserDO user = userDao.selectById(loginUserInfoVO.getUserId());
if (user != null) {
// 实名认证成功推送订阅消息给用户
try {
@@ -1000,7 +1068,7 @@
} catch (Exception e) {
log.error("推送用户订阅消息失败，失败原因：" + e.getMessage());
}
- }
+ }*/
return R.ok();
}
return R.fail();
@@ -1323,7 +1391,6 @@
menu.add(300L);
menu.add(303L);
}
-
sysRoleDO.setRoleSort(0);
sysRoleDO.setCreateBy(administratorsUserVO.getUserId());
SysRoleDO sysRoleDO1 = roleDAO.selectOne(
@@ -1340,6 +1407,8 @@
this.putMenuRole(menuRoleVO);
}
}
+ log.info("======================type"+administratorsUserVO.getType());
+ log.info("=======================roleId"+roleId);
SysRoleDO roleDO = roleDAO.selectById(roleId);
if (ObjectUtils.isEmpty(roleDO)) {
return R.fail("角色不存在");
@@ -1347,6 +1416,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);
@@ -1360,7 +1432,6 @@
} else if (e.getMessage().contains("23000")) {
throw new ServiceException("手机号已存在");
}
-
}
if (insert > 0) {
SysUserDO sysUserDO1 = userDao
@@ -1570,11 +1641,11 @@
|| operlog.getTitle().equals(UPDATEACIDRECORD));
if (flag) {
//保存数据
-// try {
-//// operlog.setBeforeUpdateData(saveBeforeUpdateData(operlog));
-// } catch (JsonProcessingException e) {
-// e.printStackTrace();
-// }
+ try {
+ operlog.setBeforeUpdateData(saveBeforeUpdateData(operlog));
+ } catch (JsonProcessingException e) {
+ e.printStackTrace();
+ }
}
SysOperLogDO sysOperLogDO = new SysOperLogDO();
BeanUtils.copyProperties(operlog, sysOperLogDO);
@@ -2831,7 +2902,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("账户已经存在");
}
@@ -2840,12 +2912,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());
@@ -2959,14 +3032,24 @@
}
// 获取最近二十天数据
- List<Date> serverndays = com.panzhihua.common.utlis.DateUtils.getOldDays();
- serverndays.forEach(date -> {
- // 查询社区活动数量
- DataKanbanDTO dataKanbanDTO = userDao.selectCommunityAddUserOrder(dataKanBansDto.getAppId(), date);
+ List<Date> activeDate = getTwentyDays();
+
+ String twentyDay = com.panzhihua.common.utlis.DateUtils.getTwentyDay();
+ //获取最近活跃人数
+ List<UsersStatisticsDTO> actives = userDao.selectActive(twentyDay, dataKanBansDto.getAppId());
+ //获取最近注册人数
+ List<UsersStatisticsDTO> dailyAdds = userDao.selectDailyAdd(twentyDay, dataKanBansDto.getAppId());
+
+ Map<String, String> activeMap = actives.stream().collect(Collectors.toMap(UsersStatisticsDTO::getSpecificDate, UsersStatisticsDTO::getTotal));
+ Map<String, String> dailyAddMap = dailyAdds.stream().collect(Collectors.toMap(UsersStatisticsDTO::getSpecificDate, UsersStatisticsDTO::getTotal));
+
+
+ for (Date date : activeDate) {
+ String dateStr = DateUtil.format(date, "yyyy-MM-dd");
communityActiveUserX.add(DateFormatUtils.format(date, "MM-dd"));
- communityActiveUserY.add(dataKanbanDTO.getNum());
- communityActiveUserZ.add(dataKanbanDTO.getDayNum());
- });
+ communityActiveUserY.add(dailyAddMap.containsKey(dateStr) ? Integer.parseInt(dailyAddMap.get(dateStr)) : 0);
+ communityActiveUserZ.add(activeMap.containsKey(dateStr) ? Integer.parseInt(activeMap.get(dateStr)) : 0);
+ }
indexDataKanbanVO.setCommunityActiveUserX(communityActiveUserX);
indexDataKanbanVO.setCommunityAddUserY(communityActiveUserY);
indexDataKanbanVO.setCommunityActiveUserY(communityActiveUserZ);
@@ -3683,6 +3766,27 @@
}
@Override
+ public R getAllCommunityList() {
+ List<Integer> areaList = areaCodeList();
+ List<AreaVOS> areaVOList = new ArrayList<>();
+ for (Integer code : areaList) {
+ AreaVOS areaVO = new AreaVOS();
+ areaVO.setId(code);
+ areaVO.setName(areaCodeToName(code.longValue()));
+ List<StreetVOS> streetVOS = userDao.selectStreetByAreaCode(code);
+ Iterator<StreetVOS> iterator = streetVOS.listIterator();
+ while (iterator.hasNext()) {
+ StreetVOS vo = iterator.next();
+ List<CommunityVO> communityVOS = userDao.selectCommunityByStreetId(vo.getId(), 3);
+ vo.setChildList(communityVOS);
+
+ }
+ areaVO.setChildList(streetVOS);
+ areaVOList.add(areaVO);
+ }
+ return R.ok(areaVOList);
+ }
+ @Override
public R getCommunityList(String name, Long id) {
//区级账号名
String[] streetList = {"bingcaogangjiedao", "donghuajiedao", "nongnongpingjiedao", "dadukoujiedaojiedao", "guazipingjiedao",
@@ -3690,7 +3794,7 @@
"jingjiangzhen", "renhezhen", "pingdizhen", "datianzhen", "tongdezhen", "futianzhen", "qianjinzhen", "panlianzhen", "binguzhen", "baimazhen",
"salianzhen", "puweizhen", "deshizhen", "wanqiuyizuxiang", "caochangzhen", "xinshanlisuzuxiang", "tongzilinzhen", "yongxingzhen", "yumenzhen",
"honggezhen", "hongguoyizuxiang"};
- List<Integer> ids = userDao.selectIdsByAccount(streetList);
+// List<Integer> ids = userDao.selectIdsByAccount(streetList);
//村或社区账号
Integer type = isVilliage(name);
//是否为市级账号
@@ -3904,6 +4008,32 @@
return R.ok();
}
+ @Override
+ public R feedBackReply(SysUserFeedbackVO sysUserFeedbackVO) {
+ 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,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