From 8889371c686cb0b202370f0786968ae03c4210cf Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 24 七月 2024 18:50:45 +0800
Subject: [PATCH] 玩湃门店数据权限修改 收入管理增加世界杯记录

---
 cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java |    9 +++++----
 1 files changed, 5 insertions(+), 4 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 80a884e..3a388c7 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
@@ -843,6 +843,7 @@
             newPayment.setPayType(request.getPayType());
             newPayment.setState(1);
             newPayment.setInsertTime(new Date());
+            newPayment.setOrderType(1);
             coursePackageOrderService.save(newPayment);
             code = newPayment.getCode();
         }
@@ -931,7 +932,7 @@
                                 Map<String, String> data1 = resultUtil.getData();
                                 String s = data1.get("trade_state");
                                 String transaction_id = data1.get("transaction_id");
-                                if ("REFUND".equals(s) || "NOTPAY".equals(s) || "CLOSED".equals(s) || "REVOKED".equals(s) || "PAYERROR".equals(s) || num == 10) {
+                                if ("REFUND".equals(s) || "CLOSED".equals(s) || "REVOKED".equals(s) || "PAYERROR".equals(s) || num == 10) {
                                     //有待支付的订单,这里不处理
 //                                    coursePackageOrder1.setState(3);
 //                                    coursePackageOrderService.updateById(coursePackageOrder1);
@@ -951,7 +952,7 @@
                                     coursePackageService.addCoursePackageOrderStudent(coursePackageOrder1.getId(), coursePackagePaymentConfig);
                                     break;
                                 }
-                                if ("USERPAYING".equals(s)) {
+                                if ("USERPAYING".equals(s) || "NOTPAY".equals(s)) {
                                     num++;
                                 }
                             }
@@ -1195,7 +1196,7 @@
     }
 
     public List<Integer> getIds(Integer siteId) {
-        HttpRequest httpRequest = HttpRequest.get("https://try.daowepark.com/v7/user_api/general/get_space_area?space_id=" + siteId);
+        HttpRequest httpRequest = HttpRequest.get("https://port.daowepark.com/v7/user_api/general/get_space_area?space_id=" + siteId);
         HttpResponse execute = httpRequest.execute();
         String body = execute.body();
         JSONObject jsonObject = JSONObject.parseObject(body);
@@ -1225,7 +1226,7 @@
         coursePackageOrderService.updateById(coursePackageOrder1);
 
         CoursePackagePaymentConfig coursePackagePaymentConfig = coursePackagePaymentConfigService.getOne(new QueryWrapper<CoursePackagePaymentConfig>()
-                .eq("coursePackageId", coursePackageOrder1.getId())
+                .eq("coursePackageId", coursePackageOrder1.getCoursePackageId())
                 .eq("classHours", coursePackageOrder1.getClassHours())
         );
         coursePackageService.addCoursePackageOrderStudent(coursePackageOrder1.getId(), coursePackagePaymentConfig);

--
Gitblit v1.7.1