update 设置实收金额字段

jsowell-admin/src/main/java/com/jsowell/service/TempService.java

@@ -881,6 +881,7 @@ public class TempService {
             newSettleAmount = BigDecimal.ZERO;
         }
         orderBasicInfo.setSettleAmount(newSettleAmount);
+        orderBasicInfo.setActualReceivedAmount(newSettleAmount);
 
         // 优惠后总消费金额 = 折扣后电费 + 折扣后服务费
         BigDecimal totalConsumeAmount = afterDiscountServiceAmount.add(afterDiscountElectricityAmount);

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

@@ -989,6 +989,7 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
         // 把交易记录中的用电量，金额等信息 更新到orderBasicInfo和orderDetail
         orderBasicInfo.setVirtualAmount(virtualAmount); // 虚拟金额
         orderBasicInfo.setSettleAmount(orderAmount.subtract(virtualAmount)); // 结算金额
+        orderBasicInfo.setActualReceivedAmount(orderAmount.subtract(virtualAmount)); // 实收金额
         orderBasicInfo.setOrderStatus(OrderStatusEnum.ORDER_COMPLETE.getValue());
         orderBasicInfo.setReason(data.getStopReasonMsg()); // 充电停止原因
         orderBasicInfo.setSettlementTime(DateUtils.getNowDate()); // 结算时间
@@ -2601,6 +2602,8 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
         orderBasicInfo.setVirtualAmount(new BigDecimal(data.getConsumptionAmount()));
         // 结算金额
         orderBasicInfo.setSettleAmount(BigDecimal.ZERO);
+        // 实收金额
+        orderBasicInfo.setActualReceivedAmount(BigDecimal.ZERO);
         // 充电开始时间
         orderBasicInfo.setChargeStartTime(DateUtils.parseDate(data.getStartTime()));
         // 充电结束时间

jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java

@@ -243,6 +243,7 @@ public abstract class AbstractProgramLogic implements InitializingBean {
         // 把交易记录中的用电量，金额等信息 更新到orderBasicInfo和orderDetail
         orderBasicInfo.setVirtualAmount(virtualAmount); // 虚拟金额
         orderBasicInfo.setSettleAmount(settleAmount); // 结算金额
+        orderBasicInfo.setActualReceivedAmount(settleAmount); // 实收金额
         orderBasicInfo.setOrderStatus(OrderStatusEnum.ORDER_COMPLETE.getValue());
         orderBasicInfo.setReason(data.getStopReasonMsg()); // 充电停止原因
         if (Objects.isNull(orderBasicInfo.getSettlementTime())) {
@@ -633,6 +634,7 @@ public abstract class AbstractProgramLogic implements InitializingBean {
         orderBasicInfo.setRefundAmount(refundAmount); // 订单退款金额
         orderBasicInfo.setVirtualAmount(virtualAmount); // 虚拟金额
         orderBasicInfo.setSettleAmount(dataOrderAmount.subtract(virtualAmount)); // 结算金额 = 消费金额 - 虚拟金额
+        orderBasicInfo.setActualReceivedAmount(dataOrderAmount.subtract(virtualAmount)); // 实收金额（先与结算金额保持一致）
         orderBasicInfo.setReason(data.getStopReasonMsg()); // 充电停止原因
         if (Objects.isNull(orderBasicInfo.getSettlementTime())) {
             // 如果结算时间为空，设置当前时间为结算时间
@@ -1095,6 +1097,7 @@ public abstract class AbstractProgramLogic implements InitializingBean {
             newSettleAmount = BigDecimal.ZERO;
         }
         orderBasicInfo.setSettleAmount(newSettleAmount);
+        orderBasicInfo.setActualReceivedAmount(newSettleAmount); // 实收金额
 
         // 优惠后总消费金额 = 折扣后电费 + 折扣后服务费
         BigDecimal totalConsumeAmount = afterDiscountServiceAmount.add(afterDiscountElectricityAmount);

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

@@ -646,6 +646,7 @@ public class DelayMerchantProgramLogic extends AbstractProgramLogic {
         orderBasicInfo.setOrderAmount(orderAmount);
         orderBasicInfo.setVirtualAmount(virtualAmount);
         orderBasicInfo.setSettleAmount(settleAmount);
+        orderBasicInfo.setActualReceivedAmount(settleAmount);
         orderBasicInfo.setDiscountAmount(BigDecimal.ZERO);
         orderBasicInfo.setSettlementTime(DateUtils.getNowDate());
 
@@ -703,6 +704,7 @@ public class DelayMerchantProgramLogic extends AbstractProgramLogic {
 
         orderBasicInfo.setRefundAmount(refundAmount);
         orderBasicInfo.setSettleAmount(settleAmount);
+        orderBasicInfo.setActualReceivedAmount(settleAmount);
     }
 
     /**