java/zhihuishenqu.git

			@@ -6,6 +6,7 @@
			import com.panzhihua.common.model.vos.R;
			import com.panzhihua.common.model.vos.community.VolunteerCreditsExchangeVO;
			import com.panzhihua.common.model.vos.community.VolunteerIntegralMerchantVO;
			import com.panzhihua.common.service.user.UserService;
			import com.panzhihua.common.utlis.StringUtils;
			import com.panzhihua.service_community.entity.VolunteerIntegralMerchant;
			import com.panzhihua.service_community.service.VolunteerCreditsExchangeService;
			@@ -22,6 +23,9 @@
			{
			@Resource
			private VolunteerIntegralMerchantService merchantService;

			@Resource
			private UserService userService;

			/**
			* 获取单个详情
			@@ -239,8 +243,10 @@
			item.setCommunityId(userInfoVO.getCommunityId()+"");
			}

			R<LoginUserInfoVO> loginUserInfoVOR=userService.getUserInfoByUserId(userInfoVO.getUserId()+"");

			item.setUserId(userInfoVO.getUserId()+"");
			item.setNeedScore(userInfoVO.getLoveIntegral());
			item.setNeedScore(loginUserInfoVOR.getData().getLoveIntegral());
			return vceService.insertData(item);
			}

			@@ -343,6 +343,7 @@
			if (nonNull(sysUserDO.getStreetId())){
			loginUserInfoVO.setStreetId(sysUserDO.getStreetId());
			}
			loginUserInfoVO.setLoveIntegral(sysUserDO.getLoveIntegral());
			loginUserInfoVO.setUserId(sysUserDO.getUserId());
			loginUserInfoVO.setName(sysUserDO.getName());
			loginUserInfoVO.setPassword(sysUserDO.getPassword());
			@@ -405,6 +406,7 @@
			}
			LoginUserInfoVO loginUserInfoVO = new LoginUserInfoVO();
			BeanUtils.copyProperties(sysUserDO, loginUserInfoVO);
			loginUserInfoVO.setLoveIntegral(sysUserDO.getLoveIntegral());
			List<SysRoleDO> roleDOList = roleDAO.selectByUserId(sysUserDO.getUserId());
			Set<String> set = new HashSet<>();
			if (!ObjectUtils.isEmpty(roleDOList)) {

	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/VolunteerIntegralMerchantApi.java	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史