java/DolphinEnglish.git

			@@ -244,6 +244,10 @@
			@GetMapping("/exchangeRecord")
			@ApiOperation(value = "学习端-兑换记录", tags = {"学习端-商城"})
			public R<List<ExchangeRecordVO>> exchangeRecord() {
			LoginUserParent loginUserStudy = tokenService.getLoginUserStudy();
			if (null == loginUserStudy) {
			return R.tokenError("登录失效！");
			}
			List<ExchangeRecordVO> exchangeRecord = orderService.exchangeRecord(tokenService.getLoginUserStudy().getUserid());
			for (ExchangeRecordVO record : exchangeRecord) {
			TGoods goods = goodsService.getById(record.getGoodsId());

			@@ -176,12 +176,14 @@
			.stream().mapToInt(Integer::intValue).sum();
			}
			Integer userCount = good.getUserCount();
			if (good.getUserCount() > totalNumber) {
			if (userCount > totalNumber) {
			int i = userCount - totalNumber;
			if (number > i) {
			return R.exchangeError("兑换失败，当前兑换数量已超过最大兑换数量，剩余兑换数量为: " +
			i + "！");
			}
			} else {
			return R.exchangeError("兑换失败，当前兑换数量已超过最大兑换数量！");
			}
			}
			boolean result = exchangeGood(goodExchange, recipient, number, goodId, needIntegral);
			@@ -320,6 +322,8 @@
			return R.exchangeError("兑换失败，当前兑换数量已超过最大兑换数量，剩余兑换数量为: " +
			i + "！");
			}
			} else {
			return R.exchangeError("兑换失败，当前兑换数量已超过最大兑换数量！");
			}
			}
			boolean result = exchangeGoodParent(goodExchange, recipient, number, goodId, needIntegral);

	ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/TGoodsController.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/TGoodsServiceImpl.java	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史