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);
			}
			@@ -960,7 +960,8 @@
			merMemberPageDto.setStartBirthday(startBirthday.format(formatter));
			}
			// 获取当前登陆人的可视权限
			SysUser sysUser = SecurityUtils.getSysUser();
			SysUser sysUserId = SecurityUtils.getSysUser();
			SysUser sysUser = sysUserService.getSysUser(sysUserId.getUserId()).getData();
			// 店铺ids
			List<Long> scope = new ArrayList<>();
			if (sysUser!=null){
			@@ -2181,7 +2182,7 @@
			integralRecord.setUserId(integralChangeDto.getUserId());
			integralRecord.setChangeType(integralType);
			integralRecord.setCreateTime(new Date());
			//1分享获取2平台建议获取3门店建议获取4每日签到5消费得积分
			//1分享获取2平台建议获取3门店建议获取4每日签到5消费得积分6抽奖获得积分
			switch(integralType){
			case 1:
			changeIntegral = appOtherConfigGetVo.getShareIntegral();
			@@ -2223,6 +2224,16 @@
			integralRecord.setChangeIntegral(changeIntegral);
			integralRecord.setSurpIntegral(memberTotal.getUseableIntegral()+changeIntegral);
			integralRecord.setChangeReason("订单【"+integralChangeDto.getOrderNo()+"】获得积分");
			integralRecord.setOrderId(integralChangeDto.getOrderId());
			integralRecord.setOrderNo(integralChangeDto.getOrderNo());
			memberTotal.setTotalIntegral(memberTotal.getTotalIntegral()+changeIntegral);
			memberTotal.setUseableIntegral(memberTotal.getUseableIntegral()+changeIntegral);
			memberTotal.setBuyFlag(1);
			break;
			case 6:
			integralRecord.setChangeIntegral(changeIntegral);
			integralRecord.setSurpIntegral(memberTotal.getUseableIntegral()+changeIntegral);
			integralRecord.setChangeReason("抽奖获得积分");
			integralRecord.setOrderId(integralChangeDto.getOrderId());
			integralRecord.setOrderNo(integralChangeDto.getOrderNo());
			memberTotal.setTotalIntegral(memberTotal.getTotalIntegral()+changeIntegral);
			@@ -2323,9 +2334,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();
			}