Merge remote-tracking branch 'origin/dev' into dev

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/returns/KylinOrderRefundsVo.java

@@ -53,9 +53,12 @@ public class KylinOrderRefundsVo implements Serializable,Cloneable {
     @ApiModelProperty(value = "退款失败原因")
     private String refundError;
 
-    @ApiModelProperty(value = "退款总金额")
+    @ApiModelProperty(value = "退款票总金额")
     private BigDecimal price;
 
+    @ApiModelProperty(value = "退款快递总金额")
+    private BigDecimal priceExpress;
+
     @ApiModelProperty(value = "退款状态: 0请求退款 2取消退款 1审核通过 5驳回退款 7等待退款 3正在退款 4完成退款 6退款失败")
     private Integer status;
 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/refund/details.html

@@ -21,8 +21,10 @@
             <div class="form-control-static" th:text="${KylinOrderRefundsVo.RefundId}"></div>
         </div>
         <div class="form-group">
-            <label class="col-sm-2 control-label">退款总金额：</label>
+            <label class="col-sm-2 control-label">退款票总金额：</label>
             <div class="form-control-static" th:text="${KylinOrderRefundsVo.price}"></div>
+            <label class="col-sm-2 control-label">退款快递费总金额：</label>
+            <div class="form-control-static" th:text="${KylinOrderRefundsVo.priceExpress}"></div>
             <label class="col-sm-2 control-label">退款状态：</label>
             <div class="form-control-static" th:text="${KylinOrderRefundsVo.statusName}"></div>
             <label class="col-sm-2 control-label">成功退款时间：</label>

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/refund/refund.html

@@ -237,7 +237,11 @@
                 },
                 {
                     field: 'price',
-                    title: '退款总金额'
+                    title: '退票金额'
+                },
+                {
+                    field: 'priceExpress',
+                    title: '退快递费金额'
                 },
                 {
                     field: 'statusName',

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinOrderRefundsServiceImpl.java

@@ -406,6 +406,7 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
         KylinOrderTickets kylinOrderTickets = kylinOrderTicketsMapper.selectOne(
                 new QueryWrapper<KylinOrderTickets>().eq("order_code", orderCode)
         );
+        BigDecimal oldPriceExpress = kylinOrderTickets.getPriceExpress();
         // 传的快递费不能大于实际的快递费=（支付的快递费-已退的快递费）
         BigDecimal refundPriceExpressSum = kylinOrderRefundsMapper.RefundPriceExpressSum(// 已退快递费
                 kylinOrderTickets.getOrderTicketsId(),
@@ -437,7 +438,7 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
                             .eq("order_id", kylinOrderTickets.getOrderTicketsId())
                             .ne("is_payment", KylinTableStatusConst.ENTITIES_IS_PAYMENT0)
             );
-            BigDecimal onePrice = (priceActual.subtract(priceExpress)).divide(BigDecimal.valueOf(allEntitiesCount));//单价
+            BigDecimal onePrice = (priceActual.subtract(oldPriceExpress)).divide(BigDecimal.valueOf(allEntitiesCount));//单价
             for (KylinOrderTicketEntitiesDao entities : entitiesListTemp) {
                 BigDecimal refundedPrice = kylinOrderTicketEntitiesMapper.getRefundEntitiesPrice(//已退 包含退款中
                         kylinOrderTickets.getOrderTicketsId(),

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/OrderRefundDao.java

@@ -26,6 +26,7 @@ public class OrderRefundDao implements Serializable {
     private String refundError;
 
     private BigDecimal price;
+    private BigDecimal priceExpress;
 
     private Integer status;