java/PlayPai.git

			@@ -15,6 +15,7 @@
			import com.dsh.account.feignclient.course.CoursePackageClient;
			import com.dsh.account.feignclient.course.CoursePackageConfigClient;
			import com.dsh.account.feignclient.course.CoursePaymentClient;
			import com.dsh.account.feignclient.course.VideoOfCourseListClient;
			import com.dsh.account.feignclient.course.model.*;
			import com.dsh.account.feignclient.other.ImgConfigClient;
			import com.dsh.account.feignclient.other.RechargeConfigClient;
			@@ -98,6 +99,10 @@
			@Resource
			private ImgConfigClient icfgClient;


			@Resource
			private VideoOfCourseListClient voclClient;

			@Resource
			private VipPaymentMapper vipPaymentMapper;

			@@ -155,7 +160,9 @@

			List<RegisteredCourse> courseList = new ArrayList<>();
			List<StuCourseResp> stuCoursePayment = paymentClient.getStuCoursePayment(tStudent.getId());
			List<Integer> coursePackIds = new ArrayList<>();
			if (stuCoursePayment.size() > 0){
			coursePackIds = stuCoursePayment.stream().map(StuCourseResp::getCourseId).collect(Collectors.toList());
			for (StuCourseResp tCoursePackagePayment : stuCoursePayment) {
			RegisteredCourse course = new RegisteredCourse();
			course.setCourseId(tCoursePackagePayment.getCourseId());
			@@ -168,10 +175,9 @@
			}
			}
			classInfoVo.setCourseList(courseList);

			List<ExerciseVideo> videos = new ArrayList<>();

			classInfoVo.setExerciseVideoList(videos);
			List<ExerciseVideo> stuCourseOfVideoList = voclClient.getStuCourseOfVideoList(coursePackIds);
			System.out.println(stuCourseOfVideoList);
			classInfoVo.setExerciseVideoList(stuCourseOfVideoList);
			}else {
			classInfoVo.setIsThere(2);
			List<TImgConfig> tImgConfigs = configClient.getNoneStuImgs();
			@@ -199,9 +205,12 @@
			CourseVenue courseVenue = new CourseVenue();
			courseVenue.setStoreId(storeId);
			courseVenue.setAreaName(value.get(0).getCourseName());
			courseVenue.setSiteDistance(LonlatUtils.distance(Double.parseDouble(longitude), Double.parseDouble(latitude),
			Double.parseDouble(value.get(0).getLon()), Double.parseDouble(value.get(0).getLat())) + "");

			if (ToolUtil.isEmpty(longitude) && ToolUtil.isEmpty(latitude)){
			courseVenue.setSiteDistance(0+"");
			}else {
			courseVenue.setSiteDistance(LonlatUtils.distance(Double.parseDouble(longitude), Double.parseDouble(latitude),
			Double.parseDouble(value.get(0).getLon()), Double.parseDouble(value.get(0).getLat())) + "");
			}
			List<CourseVenue.CouList> courses = new ArrayList<>();
			for (CourseOfStoreVo courseOfStoreVo : value) {
			CourseVenue.CouList couList = new CourseVenue.CouList();
			@@ -479,6 +488,8 @@
			TAppUser appUser = this.getById(appUserId);
			benefirVo.setUserHeadImg(appUser.getHeadImg());
			benefirVo.setUserName(appUser.getName());
			benefirVo.setWpCoin(ToolUtil.isEmpty(appUser.getPlayPaiCoins()) ? 0 : appUser.getPlayPaiCoins());
			benefirVo.setUserIntegral(ToolUtil.isEmpty(appUser.getIntegral()) ? 0 : appUser.getIntegral());
			if (appUser.getIsVip() == 1){
			benefirVo.setIsMember("年度会员");
			}else {
			@@ -637,15 +648,16 @@
			List<RechargeCentVo> centVos = new ArrayList<>();
			TAppUser tAppUser = this.baseMapper.selectById(appUserId);
			List<Map<String, Object>> rechargeConfig = reconMapper.getRechargeConfig();
			System.out.println(rechargeConfig);
			if (rechargeConfig.size() > 0 ){
			for (Map<String, Object> stringObjectMap : rechargeConfig) {
			RechargeCentVo vo = new RechargeCentVo();
			vo.setChargeId((Integer) stringObjectMap.get("money"));
			vo.setAmount(""+stringObjectMap.get("money"));
			Double money = (Double) stringObjectMap.get("money");
			vo.setAmount(BigDecimal.valueOf(money) );
			if (tAppUser.getIsVip() == 1){
			vo.setWpGold(stringObjectMap.get("MemberCoins")+"");
			vo.setWpGold((Integer) stringObjectMap.get("MemberCoins"));
			}else {
			vo.setWpGold(stringObjectMap.get("usersCoins")+"");
			vo.setWpGold((Integer) stringObjectMap.get("usersCoins"));
			}
			centVos.add(vo);
			}
			@@ -738,26 +750,34 @@
			}
			}
			if (StringUtils.hasText(request.getSearch())){
			goods = goods.stream()
			.filter(merchandise -> merchandise.getGoodName().contains(request.getSearch()))
			.collect(Collectors.toList());
			if (goods.size() > 0 ){
			goods = goods.stream()
			.filter(merchandise -> merchandise.getGoodName().contains(request.getSearch()))
			.collect(Collectors.toList());
			}
			}
			if (null != request.getRank()){
			switch (request.getRank()){
			case 1:
			goods = goods.stream()
			.sorted(Comparator.comparing(Goods::getIntegral).reversed())
			.collect(Collectors.toList());
			if (goods.size() > 0 ){
			goods = goods.stream()
			.sorted(Comparator.comparing(Goods::getIntegral).reversed())
			.collect(Collectors.toList());
			}
			break;
			case 2:
			goods = goods.stream()
			.sorted(Comparator.comparing(Goods::getIntegral))
			.collect(Collectors.toList());
			if (goods.size() > 0 ){
			goods = goods.stream()
			.sorted(Comparator.comparing(Goods::getIntegral))
			.collect(Collectors.toList());
			}
			break;
			case 3:
			goods = goods.stream()
			.sorted(Comparator.comparing(Goods::getNums).reversed())
			.collect(Collectors.toList());
			if (goods.size() > 0 ){
			goods = goods.stream()
			.sorted(Comparator.comparing(Goods::getNums).reversed())
			.collect(Collectors.toList());
			}
			break;
			default:
			break;
			@@ -765,9 +785,11 @@

			}
			if (null != request.getGoodsType()){
			goods = goods.stream()
			.filter(merchandise -> merchandise.getGoodsType().equals(request.getGoodsType()))
			.collect(Collectors.toList());
			if (goods.size() > 0 ){
			goods = goods.stream()
			.filter(merchandise -> merchandise.getGoodsType().equals(request.getGoodsType()))
			.collect(Collectors.toList());
			}
			}
			Pageable pageable = PageRequest.of(request.getPageNum() - 1, request.getPageSize());
			Page<Goods> page = getPage(goods, pageable);
			@@ -1165,6 +1187,7 @@
			weeksOfCourseRest.setStuId(stuId);
			weeksOfCourseRest.setAppUserId(appUserId);
			List<CourseOfStoreVo> storeOfCourses = paymentClient.getStoreOfCourses(weeksOfCourseRest);
			System.out.println(storeOfCourses);
			if (storeOfCourses.size() > 0 ){
			courseVenues = dealDatas(storeOfCourses,longitude,latitude);
			}