Merge remote-tracking branch 'origin/阶梯退票_羊毛券_合并分支' into 阶梯退票_羊毛券_合并分支

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

@@ -104,8 +104,8 @@ public class KylinRefundsStatusServiceImpl {
             kylinOrderRefunds.setOrderTicketsId(orderInfo.getOrderTicketsId());
             String orderRefundCode = orderInfo.getOrderCode();
             String codeNum = StringUtils.leftPad(String.valueOf(refundCount), 3, "0");
-//            long currentTime = System.currentTimeMillis()% 100;
-            kylinOrderRefunds.setOrderRefundCode(IDGenerator.nextSnowId());
+            long currentTime = System.currentTimeMillis()% 100;
+            kylinOrderRefunds.setOrderRefundCode(orderRefundCode.concat(codeNum)+currentTime);
             kylinOrderRefunds.setPrice(refundPrice);
             kylinOrderRefunds.setPriceExpress(priceExpress);
             kylinOrderRefunds.setPriceCharges(priceCharges);
@@ -263,8 +263,8 @@ public class KylinRefundsStatusServiceImpl {
             kylinOrderRefunds.setOrderTicketsId(orderInfo.getOrderTicketsId());
             String orderRefundCode = orderInfo.getOrderCode();
             String codeNum = StringUtils.leftPad(String.valueOf(refundCount), 3, "0");
-//            long currentTime = System.currentTimeMillis()% 100;
-            kylinOrderRefunds.setOrderRefundCode(IDGenerator.nextSnowId());
+            long currentTime = System.currentTimeMillis()% 100;
+            kylinOrderRefunds.setOrderRefundCode(orderRefundCode.concat(codeNum)+currentTime);
             kylinOrderRefunds.setPrice(BigDecimal.valueOf(refundPrice));
             kylinOrderRefunds.setPriceExpress(orderInfo.getPriceExpress());
             kylinOrderRefunds.setStatus(KylinTableStatusConst.ORDER_REFUND_STATUS_APPLY);

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

@@ -121,9 +121,9 @@ public class KylinRefundsStatusServiceImpl {
         kylinOrderRefunds.setOrderRefundsId(orderRefundsId);
         kylinOrderRefunds.setOrderTicketsId(orderTicketsId);
         String orderRefundCode = orderInfo.getOrderCode();
-//        long currentTime = System.currentTimeMillis()% 100;
+        long currentTime = System.currentTimeMillis()% 100;
         String codeNum = StringUtils.leftPad(String.valueOf(5), 3, "0");
-        kylinOrderRefunds.setOrderRefundCode(IDGenerator.nextSnowId());
+        kylinOrderRefunds.setOrderRefundCode(orderRefundCode.concat(codeNum)+ currentTime);
         kylinOrderRefunds.setPrice(entitiesPriceSum);
         kylinOrderRefunds.setPriceExpress(RefundPriceExpress);
         kylinOrderRefunds.setStatus(KylinTableStatusConst.ORDER_REFUND_STATUS_APPLY);