java/qijisheng.git

			@@ -94,7 +94,7 @@
			if (UserStatus.DISABLE.getCode().equals(user.getStatus())) {
			recordLogService.recordLogininfor(request, user.getUserId().intValue(), username, Constants.LOGIN_FAIL_STATUS, "用户已停用，请联系管理员");
			// throw new ServiceException("对不起，您的账号：" + username + " 已停用");
			throw new ServiceException("您的账号已被禁用，请联系平台");
			throw new ServiceException("您所属门店已被冻结，请联系平台");
			}
			if (user.getRoleType()==2){
			Shop data = shopClient.getShopById(user.getObjectId()).getData();
			@@ -102,7 +102,7 @@
			throw new ServiceException("门店不存在");
			}else{
			if (data.getStatus()==2){
			throw new ServiceException("您的账号已被禁用，请联系平台");
			throw new ServiceException("您所属门店已被冻结，请联系平台");
			}
			}
			}

			@@ -31,6 +31,7 @@
			import com.ruoyi.system.api.feignClient.SysUserClient;
			import org.springframework.data.redis.core.RedisTemplate;
			import org.springframework.stereotype.Service;
			import org.springframework.util.CollectionUtils;

			import javax.annotation.Resource;
			import java.time.LocalDateTime;
			@@ -130,23 +131,30 @@
			shopId = sysUser.getObjectId();
			}
			List<Long> appUserIds = new ArrayList<>();
			//搜索条件，用户姓名
			if(StringUtils.isNotEmpty(refundPassListVo.getUserName())){
			//搜索条件，用户姓名和电话
			if(StringUtils.isNotEmpty(refundPassListVo.getUserName()) \|\| StringUtils.isNotEmpty(refundPassListVo.getPhone())){
			List<AppUser> data = appUserClient.getAppUserByName(refundPassListVo.getUserName()).getData();
			List<Long> collect = data.stream().map(AppUser::getId).collect(Collectors.toList());
			if (collect.isEmpty()){
			appUserIds.add(-1L);
			}
			appUserIds.addAll(collect);
			}
			//搜索条件，用户电话
			if(StringUtils.isNotEmpty(refundPassListVo.getPhone())){
			List<AppUser> data = appUserClient.getAppUserByPhone(refundPassListVo.getPhone()).getData();
			List<Long> collect = data.stream().map(AppUser::getId).collect(Collectors.toList());
			if (collect.isEmpty()){

			List<AppUser> data2 = appUserClient.getAppUserByPhone(refundPassListVo.getPhone()).getData();
			List<Long> collect2 = data2.stream().map(AppUser::getId).collect(Collectors.toList());
			if (!CollectionUtils.isEmpty(data)){
			for (AppUser datum : data) {
			for (AppUser appUser : data2) {
			if (!datum.getId().equals(appUser.getId())){
			collect2.remove(appUser.getId());
			}
			}
			}
			}
			if (collect2.isEmpty()){
			appUserIds.add(-1L);
			}
			appUserIds.addAll(collect);
			appUserIds.addAll(collect2);
			}

			PageInfo<OrderRefundPassList> pageInfo = new PageInfo(refundPassListVo.getPageCurr(), refundPassListVo.getPageSize());

			@@ -371,7 +371,9 @@
			if(null != shoppingCart){

			Goods goods1 = goodsClient.getGoodsById(shoppingCart.getGoodsId()).getData();
			if(null != goods1.getPurchaseLimit() && -1 != goods1.getPurchaseLimit() && goods1.getPurchaseLimit() < setGoodsNumber.getNumber()){
			if(null != goods1.getPurchaseLimit() && -1 != goods1.getPurchaseLimit()
			&& goods1.getPurchaseLimit() < setGoodsNumber.getNumber()
			&& setGoodsNumber.getNumber() >= shoppingCart.getNumber()){
			return R.fail("修改数量不能大于限购数量");
			}

	ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/RefundPassServiceImpl.java	26 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史