java/PlayPai.git

			@@ -38,6 +38,10 @@
			import com.dsh.account.util.*;
			import com.dsh.account.util.akeylogin.Md5Util;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.data.domain.Page;
			import org.springframework.data.domain.PageImpl;
			import org.springframework.data.domain.PageRequest;
			import org.springframework.data.domain.Pageable;
			import org.springframework.stereotype.Service;
			import org.springframework.util.StringUtils;
			import org.springframework.web.multipart.MultipartFile;
			@@ -158,6 +162,7 @@
			course.setTotalNums(ToolUtil.isEmpty(tCoursePackagePayment.getTotalCourseNums()) ? 0 : tCoursePackagePayment.getTotalCourseNums());
			course.setDeductedNums(ToolUtil.isEmpty(tCoursePackagePayment.getDeductionNums()) ? 0 : tCoursePackagePayment.getDeductionNums());
			course.setRemainingNums(ToolUtil.isEmpty(tCoursePackagePayment.getResidueNums())? 0 : tCoursePackagePayment.getResidueNums());
			course.setPeriodOfValidity(tCoursePackagePayment.getPeriodOfValidity());
			courseList.add(course);
			}
			}
			@@ -629,14 +634,8 @@
			}

			@Override
			public PointMallDetailsResponse queryAppUserIntegral(MallRequest request, Integer userIdFormRedis) {
			PointMallDetailsResponse detailsResponse = new PointMallDetailsResponse();
			List<PointMallDetailsResponse.Goods> goods = new ArrayList<>();

			TAppUser tAppUser = this.baseMapper.selectById(userIdFormRedis);
			detailsResponse.setName(tAppUser.getName());
			detailsResponse.setIntegral(tAppUser.getIntegral());
			detailsResponse.setHeadImg(tAppUser.getHeadImg());
			public List<Goods> queryAppUserIntegral(MallRequest request ) {
			List<Goods> goods = new ArrayList<>();

			CommodityRequest commodityRequest = new CommodityRequest();
			commodityRequest.setLon(request.getLon());
			@@ -644,7 +643,7 @@
			List<PointsMerchandise> vicinityGoods = mcClient.getVicinityGoods(commodityRequest);
			if (vicinityGoods.size() > 0) {
			for (PointsMerchandise vicinityGood : vicinityGoods) {
			PointMallDetailsResponse.Goods commodity = new PointMallDetailsResponse.Goods();
			Goods commodity = new Goods();
			switch (vicinityGood.getType()) {
			case 1:
			commodity.setGoodId(vicinityGood.getId());
			@@ -701,7 +700,7 @@
			List<Coupon> allCoupons = ucponClient.getAllCoupons(commodityRequest);
			if (allCoupons.size() > 0) {
			for (Coupon allCoupon : allCoupons) {
			PointMallDetailsResponse.Goods commodity = new PointMallDetailsResponse.Goods();
			Goods commodity = new Goods();
			commodity.setGoodId(allCoupon.getId());
			commodity.setGoodName(allCoupon.getName());
			commodity.setCondition(allCoupon.getRedemptionMethod());
			@@ -727,17 +726,17 @@
			switch (request.getRank()){
			case 1:
			goods = goods.stream()
			.sorted(Comparator.comparing(PointMallDetailsResponse.Goods::getIntegral).reversed())
			.sorted(Comparator.comparing(Goods::getIntegral).reversed())
			.collect(Collectors.toList());
			break;
			case 2:
			goods = goods.stream()
			.sorted(Comparator.comparing(PointMallDetailsResponse.Goods::getIntegral))
			.sorted(Comparator.comparing(Goods::getIntegral))
			.collect(Collectors.toList());
			break;
			case 3:
			goods = goods.stream()
			.sorted(Comparator.comparing(PointMallDetailsResponse.Goods::getNums).reversed())
			.sorted(Comparator.comparing(Goods::getNums).reversed())
			.collect(Collectors.toList());
			break;
			default:
			@@ -750,8 +749,16 @@
			.filter(merchandise -> merchandise.getGoodsType().equals(request.getGoodsType()))
			.collect(Collectors.toList());
			}
			detailsResponse.setGoods(goods);
			return detailsResponse;
			Pageable pageable = PageRequest.of(request.getPageNum() - 1, request.getPageSize());
			Page<Goods> page = getPage(goods, pageable);
			return page.getContent();
			}

			// 对数据进行分页处理的方法
			private static Page<Goods> getPage(List<Goods> dataList, Pageable pageable) {
			int start = (int) pageable.getOffset();
			int end = Math.min((start + pageable.getPageSize()), dataList.size());
			return new PageImpl<>(dataList.subList(start, end), pageable, dataList.size());
			}

			@Override