java/PlayPai.git

			@@ -639,7 +639,7 @@
			detailsVo.setGoodName(coursePackage.getName());
			detailsVo.setBelongsScope(merchandise.getUserPopulation());
			int coursePackageNums = upmseService.count(new QueryWrapper<UserPointsMerchandise>()
			.eq("pointsMerchandiseId", merchandise.getId()));
			.eq("pointsMerchandiseId", merchandise.getId()).eq("payStatus", 2).eq("state", 1));
			detailsVo.setRedeemedNum(coursePackageNums);
			detailsVo.setResidueNum(Math.max(merchandise.getQuantityIssued() - coursePackageNums, 0));
			detailsVo.setPerLimit(merchandise.getPickUpQuantity());

			@@ -34,7 +34,7 @@
			consumeAmount
			FROM t_user_points_merchandise pm
			LEFT JOIN t_points_merchandise tm ON tm.id = pm.pointsMerchandiseId
			WHERE pm.pointsMerchandiseId IN(
			WHERE pm.payStatus = 2 and pm.state = 1 and pm.pointsMerchandiseId IN(
			SELECT id
			FROM t_points_merchandise WHERE redemptionMethod IN (2,3)

	cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	cloud-server-activity/src/main/resources/mapper/UserPointsMerchandiseMapper.xml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史