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

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

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

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

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