From 615ecf5de559f83dede36fc19df6a2bd3e502b9e Mon Sep 17 00:00:00 2001
From: zhaozhengjie <237651143@qq.com>
Date: 星期四, 29 九月 2022 10:43:48 +0800
Subject: [PATCH] Merge branch '20220927' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 65 ++++++++++++++++++++++++++------
1 files changed, 52 insertions(+), 13 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 2350d81..ae377a8 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
@@ -2,7 +2,6 @@
import static java.util.Objects.isNull;
import static java.util.Objects.nonNull;
-import static org.apache.commons.lang3.StringUtils.capitalize;
import static org.apache.commons.lang3.StringUtils.isNotBlank;
import java.math.BigDecimal;
@@ -13,8 +12,6 @@
import javax.annotation.Resource;
-import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.collection.ListUtil;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil;
@@ -23,9 +20,9 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.panzhihua.common.model.dtos.community.microCommercialStreet.BindUserPhoneDTO;
+import com.panzhihua.common.model.dtos.partybuilding.ComPbCheckUserDTO;
import com.panzhihua.common.model.vos.community.ComAreaTownCommunityVO;
import com.panzhihua.common.model.vos.community.acid.ComActAcidCheckRecordVO;
import com.panzhihua.common.model.vos.community.acid.ComActAcidMemberVO;
@@ -44,7 +41,6 @@
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
import org.springframework.util.ObjectUtils;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -100,7 +96,6 @@
import com.panzhihua.service_user.model.dos.SysUserAgreementDO;
import com.panzhihua.service_user.model.dos.SysUserDO;
import com.panzhihua.service_user.model.dos.SysUserFeedbackDO;
-import com.panzhihua.service_user.model.dos.SysUserInputDO;
import com.panzhihua.service_user.model.dos.SysUserNoticeDO;
import com.panzhihua.service_user.model.dos.SysUserRoleDO;
import com.panzhihua.service_user.model.dtos.DataKanbanDTO;
@@ -109,7 +104,6 @@
import cn.hutool.core.util.IdcardUtil;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.RequestParam;
// import com.panzhihua.common.service.grid.GridService;
@@ -756,6 +750,17 @@
else {
loginUserInfoVO.setUserType(2);
}
+ }
+ loginUserInfoVO.setBackstageType(1);
+ String[] account={"dongqu","xiqu","yanbianxian","miyixian","renhequ","fantaixinqu"};
+ if("zuzhibu".equals(sysUserDO.getAccount())){
+ loginUserInfoVO.setBackstageType(2);
+ }
+ if(ArrayUtil.contains(account,sysUserDO.getAccount())){
+ loginUserInfoVO.setBackstageType(3);
+ }
+ if(sysUserDO.getBindingCheckUnitId()!=null){
+ loginUserInfoVO.setBackstageType(4);
}
return R.ok(loginUserInfoVO);
}
@@ -3285,7 +3290,7 @@
}
Map<String, String> headerMap=new HashMap<>();
headerMap.put("appid","10000");
- String resultJson=HttpClientUtil.get("https://api.uucsh.cn/member/wx/get-access?province="+uuLoginVO.getProvince()+"&city="+uuLoginVO.getCity()+"&area="+uuLoginVO.getArea()+"&appid=10000×tamp="+uuLoginVO.getTimestamp()+"&sign="+uuLoginVO.getSign()+"&mobile="+uuLoginVO.getMobile(),headerMap,null);
+ String resultJson=HttpClientUtil.get("https://api.uucsh.cn/member/wx/get-access?province="+uuLoginVO.getProvince()+"&city="+uuLoginVO.getCity()+"&area="+uuLoginVO.getArea()+"&appid=10000×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"));
@@ -3513,7 +3518,7 @@
}
@Override
- public R userActivity(Integer type, Long streetId, Long areaCode, Integer range) {
+ public R userActivity(Integer type, Long streetId, Long areaCode, Integer range, String appId) {
UserActivityAnalysisVO vo=new UserActivityAnalysisVO();
List<Date> activeX=getTwentyDays();
List<String> activeY=new ArrayList<>();
@@ -3526,7 +3531,7 @@
}
SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
for (Date date : activeX) {
- Map<String, Long> map = userDao.getDailyAddAndActive(DateUtil.parse(sdf.format(date)), streetId,areaCode);
+ Map<String, Long> map = userDao.getDailyAddAndActive(DateUtil.parse(sdf.format(date)), streetId,areaCode, appId);
adY.add(map.get("addUser").toString());
activeY.add(map.get("activeUser").toString());
}
@@ -3539,7 +3544,7 @@
@Override
public R uuPush(String washPhone,String phone,String washName,Integer orderStatus) {
if(StringUtils.isNotEmpty(phone)){
- SysUserDO sysUserDO=userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getPhone,phone).orderByDesc(SysUserDO::getCreateAt).last("limit 1"));
+ SysUserDO sysUserDO=userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getPhone,phone).eq(SysUserDO::getAppId,"wx118de8a734d269f0").orderByDesc(SysUserDO::getCreateAt).last("limit 1"));
if(sysUserDO!=null&&StringUtils.isNotEmpty(sysUserDO.getOpenid())){
String status="";
String accessToken="";
@@ -3644,8 +3649,8 @@
}
@Override
- public R resetPassword(Integer type, String account) {
- SysUserDO sysUserDO=userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getAccount,account).eq(SysUserDO::getType,type));
+ public R resetPassword(Integer type, String account,String appId) {
+ SysUserDO sysUserDO=userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getAccount,account).eq(SysUserDO::getType,type).eq(SysUserDO::getAppId,appId));
if(sysUserDO!=null){
sysUserDO.setPassword("$2a$10$F/2lE2NMhKNHJfi5.FLmfu7jIr7ImRWgCTTeO6m3IRNR2V4sv8YR.");
userDao.updateById(sysUserDO);
@@ -3669,6 +3674,40 @@
return R.ok();
}
+ @Override
+ public R accept(Long userId) {
+ SysUserDO sysUserDO=new SysUserDO();
+ sysUserDO.setUserId(userId);
+ sysUserDO.setIsAccept(1);
+ userDao.updateById(sysUserDO);
+ return R.ok();
+ }
+
+ @Override
+ @Transactional
+ public R addComPbCheckUser(ComPbCheckUserDTO comPbCheckUserDTO) {
+ SysUserDO sysUserDO=userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getAccount,comPbCheckUserDTO.getAccount()).eq(SysUserDO::getType,3).eq(SysUserDO::getAppId,"wx118de8a734d269f0"));
+ if(sysUserDO!=null){
+ return R.fail("账户名已存在");
+ }
+ SysUserDO sysUserDO1=new SysUserDO();
+ sysUserDO1.setUserId(Snowflake.getId());
+ sysUserDO1.setAccount(comPbCheckUserDTO.getAccount());
+ sysUserDO1.setPassword(new BCryptPasswordEncoder().encode(comPbCheckUserDTO.getPassword()));
+ sysUserDO1.setType(3);
+ sysUserDO1.setAppId("wx118de8a734d269f0");
+ sysUserDO1.setCommunityId(0L);
+ sysUserDO1.setBindingCheckUnitId(comPbCheckUserDTO.getCheckUnitId());
+ int restlt=userDao.insert(sysUserDO1);
+ if(restlt>0){
+ SysUserRoleDO sysUserRoleDO=new SysUserRoleDO();
+ sysUserRoleDO.setRoleId(123321L);
+ sysUserRoleDO.setUserId(sysUserDO1.getUserId());
+ sysUserRoleDAO.insert(sysUserRoleDO);
+ }
+ return R.ok();
+ }
+
@Override
public R getAreaAndStreet() {
--
Gitblit v1.7.1