From e18cd482faf6af1441991c1f41ae35266f6f07b9 Mon Sep 17 00:00:00 2001
From: Guoqs <123@jsowell.com>
Date: Fri, 14 Feb 2025 15:40:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=B1=E5=9C=B3=E5=81=9C=E8=BD=A6=E5=B9=B3?=
 =?UTF-8?q?=E5=8F=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/test/java/SpringBootTestController.java    |  4 ----
 .../parking/service/impl/QcyunsServiceImpl.java    | 14 ++++++++------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/jsowell-admin/src/test/java/SpringBootTestController.java b/jsowell-admin/src/test/java/SpringBootTestController.java
index eb7063584..8e17a496a 100644
--- a/jsowell-admin/src/test/java/SpringBootTestController.java
+++ b/jsowell-admin/src/test/java/SpringBootTestController.java
@@ -305,10 +305,6 @@ public class SpringBootTestController {
     public void issuanceOfParkingTicketsTest() {
         QcyunParkCouponDTO dto = QcyunParkCouponDTO.builder()
                 .plateNumber("粤B99614")
-                .stationId("")
-                .stationName("测试站点")
-                .orgId("BTTEST01")
-                .parkId("61578")
                 .build();
         qcyunsService.issuanceOfParkingTickets(dto);
     }
diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/service/impl/QcyunsServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/service/impl/QcyunsServiceImpl.java
index 4cc16ddc2..0d00ee7f0 100644
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/service/impl/QcyunsServiceImpl.java
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/service/impl/QcyunsServiceImpl.java
@@ -36,7 +36,7 @@ public class QcyunsServiceImpl implements QcyunsService {
     @Value("${parking.qcyuns.parkId}")
     private String parkId;
 
-    @Value("${parking.qcyuns.parkId}")
+    @Value("${parking.qcyuns.orgId}")
     private String orgId;
 
     /**
@@ -61,6 +61,8 @@ public class QcyunsServiceImpl implements QcyunsService {
         dto.setParkingSerial(String.valueOf(tempCarInfo.getRecordId()));
         // 2. 创建停车券
         boolean discountCoupon = createDiscountCoupon(dto);
+        // 3. 查询优惠抵扣金额
+        // queryCarInfoDiscountDestory(dto);
         return discountCoupon;
     }
 
@@ -87,7 +89,7 @@ public class QcyunsServiceImpl implements QcyunsService {
         // 发送请求
         String result = HttpUtil.post(URL, JSON.toJSONString(param));
         DataResponse dataResponse = JSONUtil.toBean(result, DataResponse.class);
-        log.info("获取车辆信息接口成功, response:{}", JSON.toJSONString(dataResponse));
+        log.info("获取车辆信息接口成功, param:{}, response:{}", JSON.toJSONString(param), JSON.toJSONString(dataResponse));
         if (dataResponse.getRetCode() == 0) {
             return dataResponse.getRetData().toString();
         }
@@ -120,8 +122,8 @@ public class QcyunsServiceImpl implements QcyunsService {
         // 发送请求
         String result = HttpUtil.post(URL, JSON.toJSONString(param));
         DataResponse dataResponse = JSONUtil.toBean(result, DataResponse.class);
-        log.info("创建优惠券成功, response:{}", JSON.toJSONString(dataResponse));
-        queryCarInfoDiscountDestory(dto);
+        log.info("创建优惠券成功, param:{}, response:{}", JSON.toJSONString(param), JSON.toJSONString(dataResponse));
+
         if (dataResponse.getRetCode() == 0 && StringUtils.equals("减免成功", dataResponse.getRetData().toString())) {
             return true;
         }
@@ -146,14 +148,14 @@ public class QcyunsServiceImpl implements QcyunsService {
         param.setService(ServiceApiCmd.CarInfoDiscountDestory);
         param.setVersion("01");
         param.setMsgId(UUID.randomUUID().toString());
-        param.setOrgId(dto.getOrgId());
+        param.setOrgId(orgId);
         param.setData(data);
         // 生成sign
         ParkingUtil.generateAndSetSign(param, secretKey);
         // 发送请求
         String result = HttpUtil.post(URL, JSON.toJSONString(param));
         DataResponse dataResponse = JSONUtil.toBean(result, DataResponse.class);
-        log.info("查询优惠抵扣金额, response:{}", JSON.toJSONString(dataResponse));
+        log.info("查询优惠抵扣金额, param:{}, response:{}", JSON.toJSONString(param), JSON.toJSONString(dataResponse));
     }
 
 }