Merge branch 'hjc_阶段退票' into 阶梯退票_羊毛券_合并分支

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

@@ -104,7 +104,7 @@ public class KylinRefundsStatusServiceImpl {
             kylinOrderRefunds.setOrderTicketsId(orderInfo.getOrderTicketsId());
             String orderRefundCode = orderInfo.getOrderCode();
             String codeNum = StringUtils.leftPad(String.valueOf(refundCount), 3, "0");
-            kylinOrderRefunds.setOrderRefundCode(orderRefundCode.concat(codeNum));
+            kylinOrderRefunds.setOrderRefundCode(orderRefundCode.concat(codeNum).concat(RandomUtil.getRandomInt(1,9)+""));
             kylinOrderRefunds.setPrice(refundPrice);
             kylinOrderRefunds.setPriceExpress(priceExpress);
             kylinOrderRefunds.setPriceCharges(priceCharges);
@@ -262,7 +262,7 @@ public class KylinRefundsStatusServiceImpl {
             kylinOrderRefunds.setOrderTicketsId(orderInfo.getOrderTicketsId());
             String orderRefundCode = orderInfo.getOrderCode();
             String codeNum = StringUtils.leftPad(String.valueOf(refundCount), 3, "0");
-            kylinOrderRefunds.setOrderRefundCode(orderRefundCode.concat(codeNum));
+            kylinOrderRefunds.setOrderRefundCode(orderRefundCode.concat(codeNum)+RandomUtil.getRandomInt(1,9));
             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

 package com.liquidnet.service.order.service.impl;
 
 import com.alibaba.fastjson.JSON;
-import com.liquidnet.commons.lang.util.CollectionUtil;
-import com.liquidnet.commons.lang.util.DateUtil;
-import com.liquidnet.commons.lang.util.IDGenerator;
-import com.liquidnet.commons.lang.util.JsonUtils;
+import com.liquidnet.commons.lang.util.*;
 import com.liquidnet.service.base.SqlMapping;
 import com.liquidnet.service.base.constant.MQConst;
 import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
@@ -125,7 +122,7 @@ public class KylinRefundsStatusServiceImpl {
         kylinOrderRefunds.setOrderTicketsId(orderTicketsId);
         String orderRefundCode = orderInfo.getOrderCode();
         String codeNum = StringUtils.leftPad(String.valueOf(5), 3, "0");
-        kylinOrderRefunds.setOrderRefundCode(orderRefundCode.concat(codeNum));
+        kylinOrderRefunds.setOrderRefundCode(orderRefundCode.concat(codeNum)+ RandomUtil.getRandomInt(1,9));
         kylinOrderRefunds.setPrice(entitiesPriceSum);
         kylinOrderRefunds.setPriceExpress(RefundPriceExpress);
         kylinOrderRefunds.setStatus(KylinTableStatusConst.ORDER_REFUND_STATUS_APPLY);