From 42bc4fe8686d012db57d4e68591b516b785d62b3 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 15 七月 2025 17:36:34 +0800
Subject: [PATCH] 政务云数据上传、川易充bug修改
---
ruoyi-service/ruoyi-order/src/test/java/com/ruoyi/order/RuoYiOrderApplicationTests.java | 253 ++++++++++++++------------------------------------
1 files changed, 71 insertions(+), 182 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/test/java/com/ruoyi/order/RuoYiOrderApplicationTests.java b/ruoyi-service/ruoyi-order/src/test/java/com/ruoyi/order/RuoYiOrderApplicationTests.java
index 180b53b..a4b8a64 100644
--- a/ruoyi-service/ruoyi-order/src/test/java/com/ruoyi/order/RuoYiOrderApplicationTests.java
+++ b/ruoyi-service/ruoyi-order/src/test/java/com/ruoyi/order/RuoYiOrderApplicationTests.java
@@ -1,182 +1,71 @@
-package com.ruoyi.order;
-
-import com.alibaba.fastjson2.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.ruoyi.account.api.feignClient.*;
-import com.ruoyi.account.api.model.TAppUserCar;
-import com.ruoyi.chargingPile.api.feignClient.*;
-import com.ruoyi.chargingPile.api.model.Site;
-import com.ruoyi.chargingPile.api.model.TChargingGun;
-import com.ruoyi.chargingPile.api.model.TChargingPile;
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.common.redis.service.RedisService;
-import com.ruoyi.common.security.service.TokenService;
-import com.ruoyi.integration.api.feignClient.*;
-import com.ruoyi.integration.api.model.ChargingHandshake;
-import com.ruoyi.integration.api.model.UploadRealTimeMonitoringData;
-import com.ruoyi.order.api.feignClient.AccountingStrategyDetailOrderClient;
-import com.ruoyi.order.api.model.TChargingOrder;
-import com.ruoyi.order.api.model.TChargingOrderAccountingStrategy;
-import com.ruoyi.order.api.vo.AccountingStrategyDetailOrderVo;
-import com.ruoyi.order.api.vo.ChargingOrderInfoVO;
-import com.ruoyi.order.api.vo.TransactionRecordMessageVO;
-import com.ruoyi.order.dto.ChargingDetails;
-import com.ruoyi.order.dto.MyChargingOrderInfo;
-import com.ruoyi.order.mapper.TSettlementConfirmMapper;
-import com.ruoyi.order.service.*;
-import com.ruoyi.order.vo.EndOfChargePageInfo;
-import com.ruoyi.other.api.feignClient.IntegralRuleClient;
-import com.ruoyi.other.api.feignClient.UserTagClient;
-import com.ruoyi.other.api.feignClient.VipClient;
-import com.ruoyi.payment.api.feignClient.AliPaymentClient;
-import com.ruoyi.payment.api.feignClient.WxPaymentClient;
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-
-import javax.annotation.Resource;
-import java.io.PrintWriter;
-import java.math.BigDecimal;
-import java.util.*;
-
-@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = RuoYiOrderApplication.class)
-public class RuoYiOrderApplicationTests {
-
- @Resource
- private TChargingOrderService chargingOrderService;
-
- @Resource
- private ChargingGunClient chargingGunClient;
- @Resource
- private TSettlementConfirmMapper tSettlementConfirmMapper;
-
- @Resource
- private SiteClient siteClient;
-
- @Resource
- private AppUserCarClient appUserCarClient;
- @Resource
- private AppUserClient appUserClient;
-
- @Resource
- private ChargingPileClient chargingPileClient;
-
- @Resource
- private TChargingOrderAccountingStrategyService chargingOrderAccountingStrategyService;
-
- @Resource
- private TokenService tokenService;
-
- @Resource
- private WxPaymentClient wxPaymentClient;
-
- @Resource
- private AliPaymentClient aliPaymentClient;
-
- @Resource
- private AppCouponClient appCouponClient;
-
- @Resource
- private AppUserVipDetailClient appUserVipDetailClient;
-
- @Resource
- private RedisService redisService;
-
- @Resource
- private UploadRealTimeMonitoringDataClient uploadRealTimeMonitoringDataClient;
-
- @Resource
- private ChargingHandshakeClient chargingHandshakeClient;
-
- @Resource
- private SendMessageClient sendMessageClient;
-
- @Resource
- private TOrderEvaluateService orderEvaluateService;
-
- @Resource
- private AccountingStrategyDetailClient accountingStrategyDetailClient;
-
- @Resource
- private AccountingStrategyDetailOrderClient accountingStrategyDetailOrderClient;
-
- @Resource
- private AccountingStrategyClient accountingStrategyClient;
-
- @Resource
- private PlatformStartChargingReplyClient platformStartChargingReplyClient;
-
- @Resource
- private TChargingOrderRefundService chargingOrderRefundService;
-
- @Resource
- private PlatformStopChargingReplyClient platformStopChargingReplyClient;
-
- @Resource
- private AccountingStrategyOrderService accountingStrategyOrderService;
-
- @Resource
- private AccountingStrategyDetailOrderService accountingStrategyDetailOrderService;
-
- @Resource
- private InviteUserClient inviteUserClient;
-
- @Resource
- private AppUserIntegralChangeClient appUserIntegralChangeClient;
-
- @Resource
- private IntegralRuleClient integralRuleClient;
-
- @Resource
- private VipClient vipClient;
-
- @Resource
- private UserTagClient userTagClient;
-
- @Resource
- private AppUserTagClient appUserTagClient;
-
- @Resource
- private SecurityDetectionClient securityDetectionClient;
-
-
- @Test
- public void test(){
-// TransactionRecordMessageVO vo = JSON.parseObject("{\n" +
-// "\t\"charging_gun_code\": \"02\",\n" +
-// "\t\"charging_pile_code\": \"2024123100001003\",\n" +
-// "\t\"end_time\": \"2025-02-12 00:32:18.00\",\n" +
-// "\t\"flat_amount2\": 0.000000,\n" +
-// "\t\"flat_amount4\": 0.000000,\n" +
-// "\t\"flat_amount6\": 0.000000,\n" +
-// "\t\"flat_charge2\": 0.000000,\n" +
-// "\t\"flat_charge4\": 0.000000,\n" +
-// "\t\"flat_charge6\": 0.000000,\n" +
-// "\t\"loss_peak_charge3\": 0,\n" +
-// "\t\"loss_peak_charge5\": 0,\n" +
-// "\t\"loss_total_electricity\": 0,\n" +
-// "\t\"loss_valley_charge1\": 0,\n" +
-// "\t\"loss_valley_charge7\": 0,\n" +
-// "\t\"payment_amount\": 41.650000,\n" +
-// "\t\"peak_amount3\": 0.000000,\n" +
-// "\t\"peak_amount5\": 0.000000,\n" +
-// "\t\"peak_charge3\": 0.000000,\n" +
-// "\t\"peak_charge5\": 0.000000,\n" +
-// "\t\"physical_card_number\": \"1234567812345678\",\n" +
-// "\t\"result\": \"{\\\"service_id\\\":\\\"transaction_record\\\",\\\"transaction_serial_number\\\":\\\"CD69120250211231439794\\\",\\\"charging_pile_code\\\":\\\"2024123100001003\\\",\\\"charging_gun_code\\\":\\\"02\\\",\\\"start_time\\\":\\\"2025-02-11 23:14:46.00\\\",\\\"end_time\\\":\\\"2025-02-12 00:32:18.00\\\",\\\"valley_charge1\\\":\\\"16.516000\\\",\\\"loss_valley_charge1\\\":\\\"0\\\",\\\"valley_amount1\\\":\\\"12.380000\\\",\\\"flat_charge2\\\":\\\"0.000000\\\",\\\"loss_flat_charg2\\\":\\\"0\\\",\\\"flat_amount2\\\":\\\"0.000000\\\",\\\"peak_charge3\\\":\\\"0.000000\\\",\\\"loss_peak_charge3\\\":\\\"0\\\",\\\"peak_amount3\\\":\\\"0.000000\\\",\\\"flat_charge4\\\":\\\"0.000000\\\",\\\"loss_flat_charg4\\\":\\\"0\\\",\\\"flat_amount4\\\":\\\"0.000000\\\",\\\"peak_charge5\\\":\\\"0.000000\\\",\\\"loss_peak_charge5\\\":\\\"0\\\",\\\"peak_amount5\\\":\\\"0.000000\\\",\\\"flat_charge6\\\":\\\"0.000000\\\",\\\"loss_flat_charg6\\\":\\\"0\\\",\\\"flat_amount6\\\":\\\"0.000000\\\",\\\"valley_charge7\\\":\\\"39.045000\\\",\\\"loss_valley_charge7\\\":\\\"0\\\",\\\"valley_amount7\\\":\\\"29.270000\\\",\\\"total_electricity\\\":\\\"55.561001\\\",\\\"loss_total_electricity\\\":\\\"0\\\",\\\"payment_amount\\\":\\\"41.650000\\\",\\\"trade_date\\\":\\\"0\\\",\\\"stop_reason\\\":\\\"1\\\",\\\"physical_card_number\\\":\\\"1234567812345678\\\"}\",\n" +
-// "\t\"retryTimes\": 0,\n" +
-// "\t\"sendTime\": 1739291543546,\n" +
-// "\t\"serviceId\": \"transaction_record\",\n" +
-// "\t\"source\": \"\",\n" +
-// "\t\"start_time\": \"2025-02-11 23:14:46.00\",\n" +
-// "\t\"stop_reason\": 1,\n" +
-// "\t\"total_electricity\": 55.561001,\n" +
-// "\t\"trade_date\": \"0\",\n" +
-// "\t\"transaction_serial_number\": \"CD69120250211231439794\",\n" +
-// "\t\"valley_amount1\": 12.380000,\n" +
-// "\t\"valley_amount7\": 29.270000,\n" +
-// "\t\"valley_charge1\": 16.516000,\n" +
-// "\t\"valley_charge7\": 39.045000\n" +
-// "}", TransactionRecordMessageVO.class);
-// chargingOrderService.endChargeBillingCharge(vo);
- }
-}
+//package com.ruoyi.order;
+//
+//import com.alibaba.fastjson2.JSON;
+//import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+//import com.ruoyi.account.api.feignClient.*;
+//import com.ruoyi.account.api.model.TAppUserCar;
+//import com.ruoyi.chargingPile.api.feignClient.*;
+//import com.ruoyi.chargingPile.api.model.Site;
+//import com.ruoyi.chargingPile.api.model.TChargingGun;
+//import com.ruoyi.chargingPile.api.model.TChargingPile;
+//import com.ruoyi.common.core.domain.R;
+//import com.ruoyi.common.core.web.domain.AjaxResult;
+//import com.ruoyi.common.core.web.page.PageInfo;
+//import com.ruoyi.common.redis.service.RedisService;
+//import com.ruoyi.common.security.service.TokenService;
+//import com.ruoyi.integration.api.feignClient.*;
+//import com.ruoyi.integration.api.model.ChargingHandshake;
+//import com.ruoyi.integration.api.model.UploadRealTimeMonitoringData;
+//import com.ruoyi.order.api.feignClient.AccountingStrategyDetailOrderClient;
+//import com.ruoyi.order.api.model.TChargingOrder;
+//import com.ruoyi.order.api.model.TChargingOrderAccountingStrategy;
+//import com.ruoyi.order.api.vo.AccountingStrategyDetailOrderVo;
+//import com.ruoyi.order.api.vo.ChargingOrderInfoVO;
+//import com.ruoyi.order.api.vo.TransactionRecordMessageVO;
+//import com.ruoyi.order.dto.ChargingDetails;
+//import com.ruoyi.order.dto.MyChargingOrderInfo;
+//import com.ruoyi.order.dto.PayOrderDto;
+//import com.ruoyi.order.dto.PayOrderQueryDto;
+//import com.ruoyi.order.mapper.TSettlementConfirmMapper;
+//import com.ruoyi.order.service.*;
+//import com.ruoyi.order.vo.EndOfChargePageInfo;
+//import com.ruoyi.other.api.feignClient.IntegralRuleClient;
+//import com.ruoyi.other.api.feignClient.UserTagClient;
+//import com.ruoyi.other.api.feignClient.VipClient;
+//import com.ruoyi.payment.api.feignClient.AliPaymentClient;
+//import com.ruoyi.payment.api.feignClient.WxPaymentClient;
+//import org.junit.jupiter.api.Test;
+//import org.redisson.api.RLock;
+//import org.redisson.api.RedissonClient;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.boot.test.context.SpringBootTest;
+//
+//import javax.annotation.Resource;
+//import java.io.PrintWriter;
+//import java.math.BigDecimal;
+//import java.util.*;
+//import java.util.concurrent.TimeUnit;
+//
+//@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = RuoYiOrderApplication.class)
+//public class RuoYiOrderApplicationTests {
+//
+// @Autowired
+// private RedissonClient redissonClient;
+//
+//
+// @Test
+// public void test(){
+// RLock lock = redissonClient.getLock("endOrder:1234565");
+// boolean tryLock = false;
+// try {
+// tryLock = lock.tryLock(100, TimeUnit.SECONDS);
+// } catch (InterruptedException e) {
+// e.printStackTrace();
+// lock.unlock();
+// }
+// if(!tryLock){
+// System.out.println("获取锁失败");
+// }
+// System.out.println("获取锁成功");
+// }
+//}
--
Gitblit v1.7.1