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

update

Browse Source
This commit is contained in:
Lemon
2025-04-16 09:16:18 +08:00
parent a0209c71d7
commit 91c08e4b0a
4 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/OrderController.java
View File

@@ -403,7 +403,7 @@ public class OrderController extends BaseController {
RestApiResponse<?> response = null; RestApiResponse<?> response = null;
try { try {
ChargeAlgorithmRecord record = chargeAlgorithmRecordService.queryRecordByOrderCode(orderCode); ChargeAlgorithmRecord record = chargeAlgorithmRecordService.queryRecordByOrderCode(orderCode);
response = new RestApiResponse<>(record); response = new RestApiResponse<>(ImmutableMap.of("ChargeAlgorithmRecord", record));
} catch (Exception e) { } catch (Exception e) {
logger.error("查询电池充电报告 error, ", e); logger.error("查询电池充电报告 error, ", e);
response = new RestApiResponse<>(e); response = new RestApiResponse<>(e);

4
jsowell-pile/src/main/java/com/jsowell/pile/domain/ChargeAlgorithmRecord.java
View File

@@ -122,13 +122,13 @@ public class ChargeAlgorithmRecord extends BaseEntity {
/** /**
* $column.columnComment * $column.columnComment
*/ */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") @Excel(name = "最大允许电压告警", readConverterExp = "最大允许电压告警")
private String maxAllowableVoltageAlarm; private String maxAllowableVoltageAlarm;
/** /**
* $column.columnComment * $column.columnComment
*/ */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") @Excel(name = "最大允许电流告警", readConverterExp = "最大允许电流告警")
private String maxAllowableElectricityAlarm; private String maxAllowableElectricityAlarm;
/** /**

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

@@ -319,6 +319,12 @@ public class OrderSplitRecordServiceImpl implements OrderSplitRecordService {
.merchantName(orderSplitRecordVO.getMerchantName()) .merchantName(orderSplitRecordVO.getMerchantName())
.build(); .build();
// 收入金额
BigDecimal subtract = orderSplitRecordVO.getElectricitySplitAmount()
.add(orderSplitRecordVO.getServiceSplitAmount())
.subtract(new BigDecimal(orderSplitRecordVO.getFeeAmount()));
orderSplit.setRevenueAmount(String.valueOf(subtract));
orderSplitList.add(orderSplit); orderSplitList.add(orderSplit);
} }
// 对 orderSplitList 进行排序，将当前登录用户的分账记录放在第一条 // 对 orderSplitList 进行排序，将当前登录用户的分账记录放在第一条

5
jsowell-pile/src/main/java/com/jsowell/pile/vo/web/SplitRecordInfoVO.java
View File

@@ -77,6 +77,11 @@ public class SplitRecordInfoVO {
*/ */
private String serviceSplitAmount; private String serviceSplitAmount;
/**
* 收入金额
*/
private String revenueAmount;
/** /**
* 手续费 * 手续费
*/ */