From 619eda5fec50898f555a8c2693a9c4c959d96568 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期二, 24 十月 2023 15:53:57 +0800
Subject: [PATCH] bug
---
cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 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 7d66d74..540e8e6 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
@@ -175,11 +175,11 @@
Double cashPayment1 = coursePackagePaymentConfig.getCashPayment();
Integer playPaiCoin = coursePackagePaymentConfig.getPlayPaiCoin();
- if(ToolUtil.isNotEmpty(cashPayment1) && ToolUtil.isNotEmpty(playPaiCoin)){
+ if(ToolUtil.isNotEmpty(cashPayment1) && cashPayment1>0 && ToolUtil.isNotEmpty(playPaiCoin) && playPaiCoin>0){
coursePackageListVo.setPayType(3);
- }else if(ToolUtil.isNotEmpty(cashPayment1)){
+ }else if(ToolUtil.isNotEmpty(cashPayment1) && cashPayment1>0){
coursePackageListVo.setPayType(1);
- }else if(ToolUtil.isNotEmpty(playPaiCoin)){
+ }else if(ToolUtil.isNotEmpty(playPaiCoin) && playPaiCoin>0){
coursePackageListVo.setPayType(2);
}
@@ -564,8 +564,19 @@
CoursePackagePaymentConfigVo coursePackagePaymentConfigVo = new CoursePackagePaymentConfigVo();
coursePackagePaymentConfigVo.setId(coursePackagePaymentConfig.getId());
coursePackagePaymentConfigVo.setClassHours(coursePackagePaymentConfig.getClassHours());
- coursePackagePaymentConfigVo.setPayType(coursePackage.getPayType());
+
+
coursePackagePaymentConfigVo.setPlayPaiCoin(coursePackagePaymentConfig.getPlayPaiCoin());
+
+ if(ToolUtil.isNotEmpty(coursePackagePaymentConfig.getCashPayment()) && coursePackagePaymentConfig.getCashPayment()>0 && ToolUtil.isNotEmpty(coursePackagePaymentConfig.getPlayPaiCoin()) && coursePackagePaymentConfig.getPlayPaiCoin()>0 ){
+ coursePackagePaymentConfigVo.setPayType(3);
+ }else if(ToolUtil.isNotEmpty(coursePackagePaymentConfig.getCashPayment()) && coursePackagePaymentConfig.getCashPayment()>0){
+ coursePackagePaymentConfigVo.setPayType(1);
+ }else if( ToolUtil.isNotEmpty(coursePackagePaymentConfig.getPlayPaiCoin()) && coursePackagePaymentConfig.getPlayPaiCoin()>0 ){
+ coursePackagePaymentConfigVo.setPayType(2);
+ }
+
+// coursePackagePaymentConfigVo.setPayType(coursePackage.getPayType());
//会员显示原价和支付价（会员价）。非会员显示会员价和支付价（最低）
if(appUser.getIsVip() == 0){//非会员
List<TCoursePackageDiscount> list2 = coursePackageDiscountService.list(new QueryWrapper<TCoursePackageDiscount>().eq("coursePackagePaymentConfigId", coursePackagePaymentConfig.getId())
--
Gitblit v1.7.1