java/PlayPai.git

			@@ -577,6 +577,16 @@
			response.setIntroduceDrawing(coursePackage.getIntroduceDrawing());

			Integer payType = coursePackageOrder.getPayType();
			if(null == payType){
			CoursePackagePaymentConfig config = coursePackagePaymentConfigService.list(new QueryWrapper<CoursePackagePaymentConfig>().eq("coursePackageId", coursePackage.getId()).orderByAsc("classHours")).get(0);
			if (ToolUtil.isNotEmpty(config.getCashPayment()) && config.getCashPayment() > 0 && ToolUtil.isNotEmpty(config.getPlayPaiCoin()) && config.getPlayPaiCoin() > 0) {
			payType = 3;
			} else if (ToolUtil.isNotEmpty(config.getCashPayment()) && config.getCashPayment() > 0) {
			payType = 1;
			} else if (ToolUtil.isNotEmpty(config.getPlayPaiCoin()) && config.getPlayPaiCoin() > 0) {
			payType = 2;
			}
			}
			BigDecimal cashPayment = coursePackageOrder.getCashPayment();
			double cashPaymentValue = 0.0;
			if (cashPayment != null) {
			@@ -603,11 +613,11 @@

			switch (payType) {
			case 1:
			case 2:
			case 3:
			response.setAmount(cashPaymentValue);
			response.setVipAmount(discountMember);
			break;
			case 3:
			case 2:
			if (playPaiCoin!=null) {
			response.setWpGold(playPaiCoin);
			}
			@@ -1235,8 +1245,11 @@
			}else {
			list = this.baseMapper.queryRegistrationRecord1(page, coursePackageId, userIds, studentIds);
			}

			list.addAll(this.baseMapper.queryRegistrationRecord3(coursePackageId,userIds,studentIds));
			for (Map<String, Object> map : list) {


			Long id = Long.valueOf(map.get("id").toString());
			Integer appUserId = Integer.valueOf(map.get("appUserId").toString());
			Integer studentId = 0;