refundPriceCharges

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/mongo/KylinOrderTicketVo.java

@@ -63,6 +63,8 @@ public class KylinOrderTicketVo implements Serializable, Cloneable {
     private BigDecimal priceExpress;
     @ApiModelProperty(position = 27, value = "退款价格")
     private BigDecimal priceRefund;
+    @ApiModelProperty(position = 27, value = "退款扣除的手续费金额")
+    private BigDecimal refundPriceCharges;
     @ApiModelProperty(position = 28, value = "退款张数")
     private Integer refundNumber;
     @ApiModelProperty(position = 29, value = "选择支付方式")

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinOrderTickets.java

@@ -123,6 +123,11 @@ public class KylinOrderTickets implements Serializable ,Cloneable {
      */
     private BigDecimal priceRefund;
 
+    /**
+     * 退款扣除的手续费金额
+     */
+    private BigDecimal refundPriceCharges;
+
     /**
      * 退款张数
      */

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/docu/db_kylin_structure.sql

@@ -517,6 +517,9 @@ CREATE TABLE `kylin_order_tickets`
 ) ENGINE = InnoDB
   DEFAULT CHARSET utf8mb4
   COLLATE utf8mb4_unicode_ci COMMENT '订单';
+
+alter table kylin_order_tickets add refund_price_charges decimal(10, 2) NOT NULL DEFAULT '0.00' COMMENT '退款扣除的手续费金额' after price_refund;
+
 -- 订单关系
 drop TABLE if exists `kylin_order_ticket_relations`;
 CREATE TABLE `kylin_order_ticket_relations`

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/refund/KylinRefundsStatusServiceImpl.java

@@ -100,7 +100,7 @@ public class KylinRefundsStatusServiceImpl {
         );
         KylinOrderTicketStatus orderStatusTable = new KylinOrderTicketStatus();
         int newStatus = 0;
-        if (refundCallbackParam.getRefundPrice().add(orderInfo.getPriceRefund()).compareTo(orderInfo.getPriceActual()) == 0) {
+        if (refundCallbackParam.getRefundPrice().add(refundInfo.getPriceCharges()).add(orderInfo.getPriceRefund()).add(orderInfo.getRefundPriceCharges()).compareTo(orderInfo.getPriceActual()) == 0) {
             newStatus = KylinTableStatusConst.ORDER_STATUS4;
         } else {
             newStatus = KylinTableStatusConst.ORDER_STATUS6;
@@ -173,6 +173,7 @@ public class KylinRefundsStatusServiceImpl {
         update.setRefundNumber(num);
         update.setPriceRefund(price);
         update.setUpdatedAt(LocalDateTime.now());
+        update.setRefundPriceCharges(orderInfo.getRefundPriceCharges().add(refundInfo.getPriceCharges()));
         kylinOrderTicketsMapper.update(
                 update, new UpdateWrapper<KylinOrderTickets>()
                         .eq("order_tickets_id", orderTicketsId)
@@ -181,6 +182,7 @@ public class KylinRefundsStatusServiceImpl {
         HashMap<String, Object> orderVo = new HashMap<>();
         orderVo.put("updatedAt", DateUtil.getNowTime());
         orderVo.put("priceRefund", price);
+        orderVo.put("refundPriceCharges", orderInfo.getRefundPriceCharges().add(refundInfo.getPriceCharges()));
         orderVo.put("status", newStatus);
         orderVo.put("refundNumber", num);
         BasicDBObject orderVov = new BasicDBObject("$set", mongoConverter.convertToMongoType(orderVo));