组装after参数

This commit is contained in:
Guoqs
2024-10-30 13:56:27 +08:00
parent 86bb41b1a8
commit 0ff1896a44
2 changed files with 87 additions and 0 deletions

View File

@@ -0,0 +1,72 @@
package com.jsowell.pile.dto;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.math.BigDecimal;
/**
* 结算订单后DTO
*/
@Data
@NoArgsConstructor
@AllArgsConstructor
@Builder
public class AfterSettleOrderDTO {
/**
* 订单编号
*/
private String orderCode;
/**
* 运营商id
*/
private String merchantId;
/**
* 站点id
*/
private String stationId;
/**
* 订单支付金额
*/
private BigDecimal orderPayAmount;
/**
* 订单消费金额
*/
private BigDecimal orderConsumeAmount;
/**
* 订单结算金额
*/
private BigDecimal orderSettleAmount;
/**
* 订单总电费金额
*/
private BigDecimal orderElectricityAmount;
/**
* 订单电费折扣金额
*/
private BigDecimal orderElectricityDiscountAmount;
/**
* 订单总服务费金额
*/
private BigDecimal orderServiceAmount;
/**
* 订单服务费折扣金额
*/
private BigDecimal orderServiceDiscountAmount;
/**
* 订单退款金额
*/
private BigDecimal orderRefundAmount;
}

View File

@@ -480,6 +480,21 @@ public class DelayMerchantProgramLogic extends AbstractProgramLogic {
// 订单退款
refundOrder(orderBasicInfo);
// 组装after参数
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();
// 将卡/vin状态解锁
if (!StringUtils.equals("0000000000000000", data.getLogicCard())) {
cardStatusUnlocked(orderBasicInfo.getLogicCard());