java/zhihuishenqu.git

			@@ -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,7 +20,6 @@
			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.vos.community.ComAreaTownCommunityVO;
			@@ -44,7 +40,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 +95,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 +103,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;

			@@ -2259,14 +2252,20 @@
			String encode = new BCryptPasswordEncoder().encode(storeVO.getStorePassword());
			BeanUtils.copyProperties(storeVO, sysUserDO);
			sysUserDO.setAccount(storeVO.getStoreAccount());
			sysUserDO.setType(5);
			sysUserDO.setType(20);
			sysUserDO.setCommunityId(communityId);
			sysUserDO.setAreaId(null);
			sysUserDO.setStatus(1);
			sysUserDO.setPhone(storeVO.getPhone());
			sysUserDO.setName(storeVO.getContacts());
			sysUserDO.setPassword(encode);
			sysUserDO.setAppId("wx0cef797390444b75");
			try {
			insert = userDao.insert(sysUserDO);
			SysUserRoleDO sysUserRoleDO = new SysUserRoleDO();
			sysUserRoleDO.setUserId(sysUserDO.getUserId());
			sysUserRoleDO.setRoleId(sysRoleDO.getRoleId());
			sysUserRoleDAO.insert(sysUserRoleDO);
			// 把SysUserId赋值给店铺
			if (sysUserDO.getUserId() != null) {
			userDao.updateStoreByPhone(storeVO.getPhone(), sysUserDO.getUserId());
			@@ -3285,7 +3284,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&timestamp="+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&timestamp="+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 +3512,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 +3525,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 +3538,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 +3643,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 +3668,15 @@
			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
			public R getAreaAndStreet() {