java/PlayPai.git

			@@ -12,6 +12,7 @@
			import com.dsh.activity.feignclient.other.StoreClient;
			import com.dsh.activity.feignclient.other.model.StoreDetailOfCourse;
			import com.dsh.activity.model.PointMerchandiseVo;
			import com.dsh.activity.model.request.AppUserGoodResp;
			import com.dsh.activity.model.request.CommodityRequest;
			import com.dsh.activity.service.*;
			import com.dsh.activity.util.GDMapGeocodingUtil;
			@@ -160,7 +161,7 @@
			int coursePackageNums = upmseService.count(new QueryWrapper<UserPointsMerchandise>()
			.eq("pointsMerchandiseId",merchandise.getId() ));
			detailsVo.setRedeemedNum(coursePackageNums);
			detailsVo.setResidueNum(merchandise.getQuantityIssued() - coursePackageNums);
			detailsVo.setResidueNum(Math.max(merchandise.getQuantityIssued() - coursePackageNums, 0));
			detailsVo.setPerLimit(merchandise.getPickUpQuantity());
			if (merchandise.getRedemptionMethod() == 1){
			detailsVo.setExchangeType(1);
			@@ -224,7 +225,7 @@
			int count = upmseService.count(new QueryWrapper<UserPointsMerchandise>()
			.eq("pointsMerchandiseId",merchandise.getId() ));
			detailsVo.setRedeemedNum(count);
			detailsVo.setResidueNum(merchandise.getQuantityIssued()-count);
			detailsVo.setResidueNum(Math.max(merchandise.getQuantityIssued() - count, 0));
			detailsVo.setPerLimit(merchandise.getPickUpQuantity());
			detailsVo.setExchangeType(merchandise.getRedemptionMethod());
			if (merchandise.getRedemptionMethod() == 1){
			@@ -276,10 +277,10 @@
			});
			detailsVo.setGoodName(coupon.getName());
			detailsVo.setBelongsScope(coupon.getUserPopulation());
			int couponNums = uconService.count(new QueryWrapper<UserCoupon>()
			.eq("couponId",coupon.getId() ));
			int couponNums = upmseService.count(new QueryWrapper<UserPointsMerchandise>()
			.eq("pointsMerchandiseId",merchandise.getId() ));
			detailsVo.setRedeemedNum(couponNums);
			detailsVo.setResidueNum(coupon.getQuantityIssued()-couponNums);
			detailsVo.setResidueNum(Math.max(coupon.getQuantityIssued() - couponNums, 0));
			detailsVo.setPerLimit(coupon.getPickUpQuantity());
			detailsVo.setExchangeType(coupon.getRedemptionMethod());
			if (coupon.getRedemptionMethod() == 1){
			@@ -489,4 +490,19 @@
			return storeIds;
			}

			/**
			* 获取用户已兑换商品的数量
			* @param goodResp
			* @return 数量
			*/
			@ResponseBody
			@PostMapping("/base/pointMerchars/queryUserHasGoodsNums")
			public int queryUserHasGoodsNums(@RequestBody AppUserGoodResp goodResp){
			int count = upmseService.count(new LambdaQueryWrapper<UserPointsMerchandise>()
			.eq(UserPointsMerchandise::getUserId,goodResp.getGoodId())
			.eq(UserPointsMerchandise::getPointsMerchandiseId,goodResp.getGoodId()));
			System.out.println(count);
			return count;
			}

			}