提交订单查询可退快递费

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

@@ -364,6 +364,16 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
         KylinOrderTickets kylinOrderTickets = kylinOrderTicketsMapper.selectOne(
                 new QueryWrapper<KylinOrderTickets>().eq("order_code", orderCode)
         );
+        // 传的快递费不能大于实际的快递费=（支付的快递费-已退的快递费）
+        Double refundPriceExpressSum = kylinOrderRefundsMapper.RefundPriceExpressSum(// 已退快递费
+                kylinOrderTickets.getOrderTicketsId(),
+                KylinTableStatusConst.ORDER_REFUND_STATUS_CANCEL
+        );
+        if (null == refundPriceExpressSum) {
+            refundPriceExpressSum = 0.0;
+        }
+        Double RefundPriceExpress = kylinOrderTickets.getPriceExpress().doubleValue() - refundPriceExpressSum;
+        kylinOrderTickets.setPriceExpress(BigDecimal.valueOf(RefundPriceExpress));
 
         // 订单关联 获取演出id
         KylinOrderTicketRelations kylinOrderTicketRelations = kylinOrderTicketRelationsMapper.selectOne(
@@ -411,14 +421,6 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
         KylinPerformanceVo performanceVo = new KylinPerformanceVo();
         BeanUtil.copy(kylinPerformances, performanceVo);
 
-        /*List<KylinOrderTicketEntitiesDao> entitiesListDao = new ArrayList();
-        KylinOrderTicketEntitiesDao kylinOrderTicketEntitiesDao = new KylinOrderTicketEntitiesDao();
-        for (KylinOrderTicketEntitiesDao entities : entitiesList) {
-            BeanUtil.copy(entities, kylinOrderTicketEntitiesDao);
-            entitiesListDao.add(entities);
-        }
-        BeanUtil.copy(entitiesList,kylinOrderTicketEntitiesDao);*/
-
         RefundOrderDetailsVo refundOrderDetailsVo = new RefundOrderDetailsVo();
         refundOrderDetailsVo.setOrderTicketVo(kylinOrderTicketVo);
         refundOrderDetailsVo.setKylinPerformanceVo(performanceVo);

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

@@ -134,7 +134,7 @@ public class KylinRefundsStatusServiceImpl {
 
         // 退款明细
         KylinOrderRefunds kylinOrderRefunds = new KylinOrderRefunds();
-        String orderRefundsId = IDGenerator.nextSnowId().toString();
+        String orderRefundsId = IDGenerator.nextSnowId();
         kylinOrderRefunds.setOrderRefundsId(orderRefundsId);
         kylinOrderRefunds.setOrderTicketsId(orderTicketsId);
         kylinOrderRefunds.setOrderRefundBatchesId(orderRefundBatchesId);
@@ -169,7 +169,7 @@ public class KylinRefundsStatusServiceImpl {
         // 退款入场人表
         KylinOrderRefundEntities kylinOrderRefundEntities = new KylinOrderRefundEntities();
         for (int i = 0; i <= ticketEntityIds.size() - 1; i++) {
-            String orderRefundsEntitiesId = IDGenerator.nextSnowId().toString();
+            String orderRefundsEntitiesId = IDGenerator.nextSnowId();
             kylinOrderRefundEntities.setOrderRefundsEntitiesId(orderRefundsEntitiesId);
             kylinOrderRefundEntities.setOrderRefundsId(orderRefundsId);
             kylinOrderRefundEntities.setRefundPrice(BigDecimal.valueOf(entitiesPrice.get(i)));