autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-06-12 03:09:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 电单车

Browse Source
This commit is contained in:
Guoqs
2024-10-08 09:59:40 +08:00
parent 8e261dd277
commit aa63cecb63
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
jsowell-pile/src/main/java/com/jsowell/pile/domain/ebike/deviceupload/EBikeMessageCmd03.java
View File

@@ -9,6 +9,9 @@ import lombok.ToString;
import java.math.BigDecimal; import java.math.BigDecimal;
/**
* 结算消费信息上传（03指令）
*/
@Getter @Getter
@Setter @Setter
@ToString(callSuper = true) @ToString(callSuper = true)

8
jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java
View File

@@ -527,6 +527,13 @@ public class DelayMerchantProgramLogic extends AbstractProgramLogic {
refundOrder(orderBasicInfo); refundOrder(orderBasicInfo);
} }
// 退款金额
BigDecimal refundAmount = orderBasicInfo.getRefundAmount() == null ? BigDecimal.ZERO : orderBasicInfo.getRefundAmount();
// 结算金额 = 支付金额 - 退款金额
BigDecimal settleAmount = orderBasicInfo.getPayAmount().subtract(refundAmount).setScale(2, RoundingMode.DOWN);
orderBasicInfo.setSettleAmount(settleAmount);
// 更新数据库 // 更新数据库
OrderTransactionDTO dto = new OrderTransactionDTO(); OrderTransactionDTO dto = new OrderTransactionDTO();
dto.setOrderBasicInfo(orderBasicInfo); dto.setOrderBasicInfo(orderBasicInfo);
@@ -557,6 +564,7 @@ public class DelayMerchantProgramLogic extends AbstractProgramLogic {
// 更新退款金额 = 支付金额 - 优惠后总消费金额 // 更新退款金额 = 支付金额 - 优惠后总消费金额
BigDecimal refundAmount = orderBasicInfo.getPayAmount().subtract(consumeAmount).setScale(2, RoundingMode.DOWN); BigDecimal refundAmount = orderBasicInfo.getPayAmount().subtract(consumeAmount).setScale(2, RoundingMode.DOWN);
orderBasicInfo.setRefundAmount(refundAmount); orderBasicInfo.setRefundAmount(refundAmount);
} }
/** /**