java/HongRuiTang.git

			@@ -283,10 +283,10 @@
			member.setCreateTime(new Date());
			member.setMobile(mobile);
			initMemberTotal(memberId);
			log.info("sysUser01-----------------" + sysUser.toString());
			// log.info("sysUser01-----------------" + sysUser.toString());
			} else {
			sysUser = sysUserService.getSysUser(member.getUserId()).getData();
			log.info("sysUser02-----------------" + sysUser.toString());
			// log.info("sysUser02-----------------" + sysUser.toString());
			}
			member.setWxUnionid(appUserRegisterDto.getWxUnionid());
			member.setMiniOpenid(appUserRegisterDto.getMiniOpenid());
			@@ -433,12 +433,12 @@
			}
			}
			//今日到店用户
			if(1 == merMemberPageDto.getIsTodayStore()){
			if(null != merMemberPageDto.getIsTodayStore() && 1 == merMemberPageDto.getIsTodayStore()){
			List<Integer> data = remoteOrderService.countShopServicePerson(merMemberPageDto.getShopId()).getData();
			merMemberPageDto.setUserIds(data);
			}
			//有未跟进的任务用户
			if(1 == merMemberPageDto.getIsTask()){
			if(null != merMemberPageDto.getIsTask() && 1 == merMemberPageDto.getIsTask()){
			List<Integer> data = remoteShopService.getMemberIngTotal(merMemberPageDto.getShopId()).getData();
			merMemberPageDto.setUserIds(data);
			}
			@@ -2324,9 +2324,8 @@
			File file = wxMaService.getQrcodeService().createWxaCodeUnlimit(scene, path);
			FileInputStream input = new FileInputStream(file);
			MultipartFile multipartFile = new MyMultipartFile("file", file.getName(), "text/plain", IOUtils.toByteArray(input));

			SysFile sysFile = remoteFileService.upload(multipartFile).getData();
			return sysFile.getUrl();
			String data = remoteFileService.uploadOSS(multipartFile).getData();
			return data;
			} catch (Exception e) {
			e.printStackTrace();
			}