From 05100bf0452bea899f74e1b837e714f70362db63 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期二, 26 九月 2023 19:06:18 +0800
Subject: [PATCH] app接口修改
---
cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java | 46 +++++++++++++++++++++++++++++++++++-----------
1 files changed, 35 insertions(+), 11 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java
index cf2a792..5323555 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java
@@ -143,9 +143,11 @@
ArrayList<String> classTime = new ArrayList<>();
String[] split = classStartTime.split(",");
String[] split3 = classEndTime.split(",");
- for (int i = 0; i < split.length; i++) {
- String s = split[i] + "-" + split3[i];
- classTime.add(s);
+ if(ToolUtil.isNotEmpty(classStartTime)) {
+ for (int i = 0; i < split.length; i++) {
+ String s = split[i].substring(0,5) + "-" + split3[i].substring(0,5);
+ classTime.add(s);
+ }
}
coursePackageListVo.setClassStartTime(classTime);
coursePackageListVo.setType(coursePackage.getType());
@@ -283,6 +285,7 @@
}
return listVos;
}
+
@Override
@@ -484,7 +487,11 @@
TCoursePackage coursePackage = this.getById(id);
CoursePackageInfo coursePackageInfo = new CoursePackageInfo();
coursePackageInfo.setId(id);
- coursePackageInfo.setTime(coursePackage.getStartTime()+"-"+coursePackage.getEndTime());
+ SimpleDateFormat format = new SimpleDateFormat("yyyy.MM.dd");
+ if(coursePackage.getType()==2){
+
+ coursePackageInfo.setTime(format.format(coursePackage.getStartTime())+"-"+format.format(coursePackage.getEndTime()));
+ }
coursePackageInfo.setCoverDrawing(coursePackage.getCoverDrawing());
coursePackageInfo.setName(coursePackage.getName());
Store store = storeClient.queryStoreById(coursePackage.getStoreId());
@@ -508,10 +515,13 @@
ArrayList<String> classTime = new ArrayList<>();
String[] split4 = classStartTime.split(",");
String[] split3 = classEndTime.split(",");
- for (int i = 0; i < split4.length; i++) {
- String s = split4[i] + "-" + split3[i];
- classTime.add(s);
+ if(ToolUtil.isNotEmpty(classStartTime)){
+ for (int i = 0; i < split4.length; i++) {
+ String s = split4[i].substring(0,5) + "-" + split3[i].substring(0,5);
+ classTime.add(s);
+ }
}
+
coursePackageInfo.setTimes(classTime);
coursePackageInfo.setType(coursePackage.getType());
@@ -662,13 +672,27 @@
String[] students = paymentCourseVo.getStudentIds().split(";");
for (CoursePackagePaymentConfigVo coursePackagePaymentConfigVo : list) {
if(paymentCourseVo.getCoursePackagePaymentConfigId().compareTo(coursePackagePaymentConfigVo.getId()) == 0){
+ CoursePackagePaymentConfig byId = coursePackagePaymentConfigService.getById(paymentCourseVo.getCoursePackagePaymentConfigId());
+ Double cashPayment = byId.getCashPayment();
Integer payType = coursePackagePaymentConfigVo.getPayType();
- if(payType == 1 && paymentCourseVo.getPayType() == 3){//现金支付
- return ResultUtil.error("支付方式错误，请刷新后重试");
+ Integer playPaiCoin1 = byId.getPlayPaiCoin();
+ if(cashPayment!=null || cashPayment>0){
+ payType=1;
}
- if(payType == 2 && paymentCourseVo.getPayType() != 3){//玩湃币支付
- return ResultUtil.error("支付方式错误，请刷新后重试");
+ if(playPaiCoin1!=null || playPaiCoin1>0){
+ payType=2;
}
+
+ if(cashPayment!=null && cashPayment>0 && playPaiCoin1 !=null && playPaiCoin1>0){
+ }else {
+ if(payType == 1 && paymentCourseVo.getPayType() == 3){//现金支付
+ return ResultUtil.error("支付方式错误，请刷新后重试");
+ }
+ if(payType == 2 && paymentCourseVo.getPayType() != 3){//玩湃币支付
+ return ResultUtil.error("支付方式错误，请刷新后重试");
+ }
+ }
+
Double paymentPrice = coursePackagePaymentConfigVo.getPaymentPrice();//支付价
paymentPrice = new BigDecimal(students.length).multiply(new BigDecimal(paymentPrice)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
Double playPaiCoin = coursePackagePaymentConfigVo.getPlayPaiCoin().doubleValue();//支付币
--
Gitblit v1.7.1