mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-04-21 03:25:12 +08:00
Merge branch 'dev-new' into dev-new-rabbitmq
# Conflicts: # jsowell-admin/src/test/java/SpringBootTestController.java
This commit is contained in:
@@ -277,41 +277,17 @@ public class SpringBootTestController {
|
||||
@Qualifier("zhongDianLianPlatformServiceImpl")
|
||||
private ThirdPartyPlatformService platformLogic;
|
||||
|
||||
@Test
|
||||
public void sendRabbitMqTest() {
|
||||
OrderBasicInfo orderBasicInfo = OrderBasicInfo.builder()
|
||||
.orderCode("C123456789")
|
||||
.merchantId("1")
|
||||
.stationId("2")
|
||||
.payAmount(new BigDecimal(100))
|
||||
.orderAmount(new BigDecimal(100))
|
||||
.settleAmount(new BigDecimal(100))
|
||||
.refundAmount(new BigDecimal(0))
|
||||
.build();
|
||||
OrderDetail orderDetail = OrderDetail.builder()
|
||||
.totalElectricityAmount(new BigDecimal(50))
|
||||
.discountElectricityAmount(new BigDecimal(0))
|
||||
.totalServiceAmount(new BigDecimal(50))
|
||||
.discountElectricityAmount(new BigDecimal(0))
|
||||
.build();
|
||||
|
||||
AfterSettleOrderDTO afterSettleOrderDTO = AfterSettleOrderDTO.builder()
|
||||
.orderCode(orderBasicInfo.getOrderCode())
|
||||
.merchantId(orderBasicInfo.getMerchantId())
|
||||
.stationId(orderBasicInfo.getStationId())
|
||||
.orderPayAmount(orderBasicInfo.getPayAmount())
|
||||
.orderConsumeAmount(orderBasicInfo.getOrderAmount())
|
||||
.orderSettleAmount(orderBasicInfo.getSettleAmount())
|
||||
.orderElectricityAmount(orderDetail.getTotalElectricityAmount())
|
||||
.orderElectricityDiscountAmount(orderDetail.getDiscountElectricityAmount())
|
||||
.orderServiceAmount(orderDetail.getTotalServiceAmount())
|
||||
.orderServiceDiscountAmount(orderDetail.getDiscountServiceAmount())
|
||||
.orderRefundAmount(orderBasicInfo.getRefundAmount())
|
||||
.build();
|
||||
|
||||
for (int i = 0; i < 10; i++) {
|
||||
rabbitTemplate.convertAndSend(RabbitConstants.YKC_EXCHANGE_NAME, RabbitConstants.QUEUE_CHARGE_ORDER_DATA, afterSettleOrderDTO);
|
||||
}
|
||||
public void saveSOCTest() {
|
||||
String transactionCode = "12345";
|
||||
YKCUtils.saveSOC(transactionCode, "4");
|
||||
YKCUtils.saveSOC(transactionCode, "1");
|
||||
YKCUtils.saveSOC(transactionCode, "3");
|
||||
YKCUtils.saveSOC(transactionCode, "5");
|
||||
YKCUtils.saveSOC(transactionCode, "10");
|
||||
YKCUtils.saveSOC(transactionCode, "20");
|
||||
YKCUtils.saveSOC(transactionCode, "19.9");
|
||||
YKCUtils.saveSOC(transactionCode, "29.9");
|
||||
System.out.println(redisCache.getCacheMap(CacheConstants.GET_THE_SOC + transactionCode));
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -351,6 +327,43 @@ public class SpringBootTestController {
|
||||
Map<String, String> pileStatusV2 = pileConnectorInfoService.getPileStatusV2(pileSnList);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void sendRabbitMqTest() {
|
||||
OrderBasicInfo orderBasicInfo = OrderBasicInfo.builder()
|
||||
.orderCode("C123456789")
|
||||
.merchantId("1")
|
||||
.stationId("2")
|
||||
.payAmount(new BigDecimal(100))
|
||||
.orderAmount(new BigDecimal(100))
|
||||
.settleAmount(new BigDecimal(100))
|
||||
.refundAmount(new BigDecimal(0))
|
||||
.build();
|
||||
OrderDetail orderDetail = OrderDetail.builder()
|
||||
.totalElectricityAmount(new BigDecimal(50))
|
||||
.discountElectricityAmount(new BigDecimal(0))
|
||||
.totalServiceAmount(new BigDecimal(50))
|
||||
.discountElectricityAmount(new BigDecimal(0))
|
||||
.build();
|
||||
|
||||
AfterSettleOrderDTO afterSettleOrderDTO = AfterSettleOrderDTO.builder()
|
||||
.orderCode(orderBasicInfo.getOrderCode())
|
||||
.merchantId(orderBasicInfo.getMerchantId())
|
||||
.stationId(orderBasicInfo.getStationId())
|
||||
.orderPayAmount(orderBasicInfo.getPayAmount())
|
||||
.orderConsumeAmount(orderBasicInfo.getOrderAmount())
|
||||
.orderSettleAmount(orderBasicInfo.getSettleAmount())
|
||||
.orderElectricityAmount(orderDetail.getTotalElectricityAmount())
|
||||
.orderElectricityDiscountAmount(orderDetail.getDiscountElectricityAmount())
|
||||
.orderServiceAmount(orderDetail.getTotalServiceAmount())
|
||||
.orderServiceDiscountAmount(orderDetail.getDiscountServiceAmount())
|
||||
.orderRefundAmount(orderBasicInfo.getRefundAmount())
|
||||
.build();
|
||||
|
||||
for (int i = 0; i < 10; i++) {
|
||||
rabbitTemplate.convertAndSend(RabbitConstants.YKC_EXCHANGE_NAME, RabbitConstants.QUEUE_CHARGE_ORDER_DATA, afterSettleOrderDTO);
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getEBikePileSnTest() {
|
||||
List<String> strings = pileSnGenerateService.generateEBikeSN(8);
|
||||
|
||||
Reference in New Issue
Block a user