autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-20 19:15:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev-new' into dev-new-rabbitmq

Browse Source 
# Conflicts:
#	jsowell-admin/src/test/java/SpringBootTestController.java
This commit is contained in:
Guoqs
2024-11-29 15:32:19 +08:00
parent 9c45a28d86 8bb6b3530b
commit 694f89795a
16 changed files with 350 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
View File

@@ -425,6 +425,7 @@ public class OrderService {
order.setStopReasonMsg(orderBasicInfo.getReason());
order.setStartSOC(orderBasicInfo.getStartSoc());
order.setEndSOC(orderBasicInfo.getEndSoc());
order.setOrderAmount(String.valueOf(orderBasicInfo.getOrderAmount()));
order.setDiscountAmount(String.valueOf(orderBasicInfo.getDiscountAmount()));
order.setSettleAmount(String.valueOf(orderBasicInfo.getSettleAmount()));
order.setSettlementTime(DateUtils.formatDateTime(orderBasicInfo.getSettlementTime()));

4
jsowell-admin/src/test/java/SpringBootTestController.java
View File

@@ -277,8 +277,7 @@ public class SpringBootTestController {
@Qualifier("zhongDianLianPlatformServiceImpl")
private ThirdPartyPlatformService platformLogic;
@Test
public void saveSOCTest() {
String transactionCode = "12345";
YKCUtils.saveSOC(transactionCode, "4");
@@ -3925,5 +3924,4 @@ public class SpringBootTestController {
// rabbitTemplate.convertAndSend(RabbitConstants.YKC_EXCHANGE_NAME, RabbitConstants.QUEUE_CHARGE_ORDER_DATA, afterSettleOrderDTO);
// }
}
}