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

Merge branch 'adapay' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into adapay

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-08-30 11:18:58 +08:00
parent 7b468d11fe 39087d9b10
commit e76e1109f6
4 changed files with 1885 additions and 1757 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because it is too large Load Diff

5
jsowell-pile/src/main/java/com/jsowell/pile/dto/GenerateOrderDTO.java
View File

@@ -78,4 +78,9 @@ public class GenerateOrderDTO extends BasicPileDTO{
* 车牌号码 * 车牌号码
*/ */
private String plateNumber; private String plateNumber;
/**
* 站点id
*/
private String stationId;
} }

5
jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderBasicInfoService.java
View File

@@ -58,6 +58,8 @@ public interface IOrderBasicInfoService {
*/ */
List<OrderListVO> selectChargingOrder(String pileSn); List<OrderListVO> selectChargingOrder(String pileSn);
public OrderBasicInfo saveOrder2Database(GenerateOrderDTO dto) throws ParseException;
/** /**
* 修改订单 * 修改订单
* *
@@ -337,4 +339,7 @@ public interface IOrderBasicInfoService {
*/ */
void retryRefundOrder(String orderCode) throws BaseAdaPayException; void retryRefundOrder(String orderCode) throws BaseAdaPayException;
void returnUpdateOrderBasicInfo(OrderBasicInfo orderBasicInfo, TransactionRecordsData data);
OrderDetail returnUpdateOrderDetail(OrderBasicInfo orderBasicInfo, TransactionRecordsData data);
} }

6
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
View File

@@ -889,7 +889,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
* 返回更新后的OrderBasicInfo对象 * 返回更新后的OrderBasicInfo对象
* 专用方法，其他地方如果要用请仔细检查 * 专用方法，其他地方如果要用请仔细检查
*/ */
private void returnUpdateOrderBasicInfo(OrderBasicInfo orderBasicInfo, TransactionRecordsData data) { public void returnUpdateOrderBasicInfo(OrderBasicInfo orderBasicInfo, TransactionRecordsData data) {
// 订单编号 // 订单编号
String orderCode = orderBasicInfo.getOrderCode(); String orderCode = orderBasicInfo.getOrderCode();
// 消费金额就是订单总金额/交易记录传过来的消费金额 // 消费金额就是订单总金额/交易记录传过来的消费金额
@@ -929,7 +929,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
* *
* @return 查询并更新过数据的orderDetail * @return 查询并更新过数据的orderDetail
*/ */
private OrderDetail returnUpdateOrderDetail(OrderBasicInfo orderBasicInfo, TransactionRecordsData data) { public OrderDetail returnUpdateOrderDetail(OrderBasicInfo orderBasicInfo, TransactionRecordsData data) {
String orderCode = orderBasicInfo.getOrderCode(); String orderCode = orderBasicInfo.getOrderCode();
BigDecimal orderAmount = orderBasicInfo.getOrderAmount(); BigDecimal orderAmount = orderBasicInfo.getOrderAmount();
// 更新订单详情 查询订单详情 修改订单数据 // 更新订单详情 查询订单详情 修改订单数据
@@ -3250,7 +3250,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
* @param dto * @param dto
* @return * @return
*/ */
private OrderBasicInfo saveOrder2Database(GenerateOrderDTO dto) throws ParseException { public OrderBasicInfo saveOrder2Database(GenerateOrderDTO dto) throws ParseException {
String orderCode = generateNewOrderCode(); String orderCode = generateNewOrderCode();
String transactionCode = IdUtils.generateTransactionCode(dto.getPileSn(), dto.getConnectorCode()); String transactionCode = IdUtils.generateTransactionCode(dto.getPileSn(), dto.getConnectorCode());