From d36bf25f7494870cbb77c256a04dd8c8b2d42f31 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期二, 28 十一月 2023 11:38:25 +0800
Subject: [PATCH] 11.11

---
 cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java |   24 +++++++++++++-----------
 1 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java
index e91b2dd..9e13e0d 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java
@@ -589,7 +589,9 @@
                     response.setVipAmount(discountMember);
                     break;
                 case 3:
-                    response.setWpGold(playPaiCoin);
+                    if (playPaiCoin!=null) {
+                        response.setWpGold(playPaiCoin);
+                    }
                     break;
             }
 
@@ -707,16 +709,16 @@
                     TCoursePackageDiscount discount = coursePackageDiscountService.getOne(new QueryWrapper<TCoursePackageDiscount>().eq("coursePackagePaymentConfigId", coursePackagePaymentConfig.getId())
                             .eq("type", 2).eq("auditStatus", 2));
 
-                    Double continuingMember = JSON.parseObject(discount.getContent()).getDouble("continuingUser");
-                    Double vipcontinuingMember = JSON.parseObject(discount.getContent()).getDouble("continuingMember");
-
-
-                    if (coursePackagePaymentConfigVo.getPaymentPrice() > continuingMember) {
-                        coursePackagePaymentConfigVo.setPaymentPrice(continuingMember);
-                    }
-                    if (coursePackagePaymentConfigVo.getVipPrice() > vipcontinuingMember) {
-                        coursePackagePaymentConfigVo.setVipPrice(vipcontinuingMember);
-                    }
+//                    Double continuingMember = JSON.parseObject(discount.getContent()).getDouble("continuingUser");
+//                    Double vipcontinuingMember = JSON.parseObject(discount.getContent()).getDouble("continuingMember");
+//
+//
+//                    if (coursePackagePaymentConfigVo.getPaymentPrice() > continuingMember) {
+//                        coursePackagePaymentConfigVo.setPaymentPrice(continuingMember);
+//                    }
+//                    if (coursePackagePaymentConfigVo.getVipPrice() > vipcontinuingMember) {
+//                        coursePackagePaymentConfigVo.setVipPrice(vipcontinuingMember);
+//                    }
 
 
                     if (coursePackagePaymentConfigVo.getPaymentPrice() < coursePackagePaymentConfigVo.getVipPrice()) {

--
Gitblit v1.7.1