java/PlayPai.git

			@@ -284,8 +284,9 @@
			classInfoVo.setHeight(tStudent.getHeight());
			classInfoVo.setWeight(tStudent.getWeight());
			classInfoVo.setBmi(tStudent.getBmi());
			classInfoVo.setBodyStatus(BMIBodyUtil.getBodyStatus(tStudent.getBmi()));

			if (tStudent.getBmi()!=null) {
			classInfoVo.setBodyStatus(BMIBodyUtil.getBodyStatus(tStudent.getBmi()));
			}
			List<RegisteredCourse> courseList = new ArrayList<>();
			List<StuCourseResp> stuCoursePayment = paymentClient.getStuCoursePayment(tStudent.getId());
			List<Integer> coursePackIds = new ArrayList<>();
			@@ -302,7 +303,6 @@
			course.setPeriodOfValidity(tCoursePackagePayment.getPeriodOfValidity());
			courseList.add(course);
			}

			}
			classInfoVo.setCourseList(courseList);
			// List<ExerciseVideo> stuCourseOfVideoList = voclClient.getStuCourseOfVideoList(coursePackIds);
			@@ -799,6 +799,13 @@
			details.add(consumeDetail);
			}
			}

			//8.积分商场

			List<ConsumeDetail> consumeDetails = mcClient.getConsumeDetails(requestVo);
			details.addAll(consumeDetails);


			if (details.size() > 0 ){
			Collections.sort(details, new Comparator<ConsumeDetail>() {
			@Override
			@@ -1142,6 +1149,11 @@
			}

			@Override
			public List<QueryAppUserVO> listAll1(QueryAppUser query) {
			return appUserMapper.listAll1(query);
			}

			@Override
			public StuAndStoreResponse queryAppUserDefaultStuAndStore(Integer userIdFormRedis,Integer pointsMerId, String lat, String lon,Integer isCourse) {
			StuAndStoreResponse response = new StuAndStoreResponse();
			if (isCourse == 1){
			@@ -1321,7 +1333,10 @@
			switch (exchangeType.getExchangeType()){
			// 积分
			case 1:
			boolean b = dealAppUserIntegral(userIdFormRedis,tAppUser,merchandise.getIntegral());
			boolean b =true;
			for (int i = 0; i < goodsNums; i++) {
			b = dealAppUserIntegral(userIdFormRedis,tAppUser,merchandise.getIntegral());
			}
			if (b){
			switch (exchangeType.getGoodsType()){
			case 2:
			@@ -1375,7 +1390,11 @@
			break;
			case 2:
			// 积分+现金
			boolean dealt = dealAppUserIntegral(userIdFormRedis,tAppUser,merchandise.getIntegral());
			boolean dealt =true;
			for (int i = 0; i < goodsNums; i++) {
			dealt = dealAppUserIntegral(userIdFormRedis,tAppUser,merchandise.getIntegral());
			}

			switch (exchangeType.getPayType()) {
			case 1:
			try {
			@@ -1389,9 +1408,9 @@
			}
			case 2:
			if (merchandise.getType() == 2) {
			return AlipayPayment(merchandise.getCash().multiply(new BigDecimal(exchangeType.getStuIds().size())), code);
			return AlipayPayment(merchandise.getCash().multiply(new BigDecimal(exchangeType.getStuIds().size())), code,returnId);
			} else {
			return AlipayPayment(merchandise.getCash().multiply(new BigDecimal(goodsNums)), code);
			return AlipayPayment(merchandise.getCash().multiply(new BigDecimal(goodsNums)), code,returnId);
			}
			default:
			break;
			@@ -1411,9 +1430,9 @@
			}
			case 2:
			if (merchandise.getType() == 2) {
			return AlipayPayment(merchandise.getCash().multiply(new BigDecimal(exchangeType.getStuIds().size())), code);
			return AlipayPayment(merchandise.getCash().multiply(new BigDecimal(exchangeType.getStuIds().size())), code,returnId);
			} else {
			return AlipayPayment(merchandise.getCash().multiply(new BigDecimal(goodsNums)), code);
			return AlipayPayment(merchandise.getCash().multiply(new BigDecimal(goodsNums)), code,returnId);
			}
			default:
			break;
			@@ -1455,9 +1474,9 @@
			}
			}

			private ResultUtil AlipayPayment(BigDecimal cash, String code) {
			private ResultUtil AlipayPayment(BigDecimal cash, String code,Long returnId) {
			System.out.println("金额："+cash);
			ResultUtil alipay = payMoneyUtil.alipay("课包续费", "课包续费", "", code, cash.toString(),
			ResultUtil alipay = payMoneyUtil.alipay("课包续费", "课包续费", String.valueOf(returnId), code, cash.toString(),
			"/base/pointMer/exchangeGoodPaymentAliCallback");
			if(alipay.getCode() == 200){
			new Thread(new Runnable() {