修改 refundCode 改为 雪花id

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/constant/KylinRedisConst.java

@@ -25,6 +25,7 @@ public class KylinRedisConst {
     public static final String TIMES = "kylin:times:id:";
     public static final String AGENT = "kylin:agent:info";
     public static final String ORDER_LIST = "kylin:order:list:userId:";
+    public static final String ORDER_REFUND_TEMP = "kylin:order:refund:";
     public static final String ORDER_REFUND_BY_ORDER_ID = "kylin:order:refund:orderId:";
     public static final String ORDER_REFUND = "kylin:order:refund:orderRefundsId:";
 

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

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

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

@@ -1451,4 +1451,8 @@ public class DataUtils {
     public void incrArCode() {
         redisUtil.incr(KylinRedisConst.ACTIVE_USE_AR_COUNT, 1);
     }
+
+    public int incrOrderRefundCode(String orderCode) {
+        return (int) redisUtil.incr(KylinRedisConst.ORDER_REFUND_TEMP + orderCode,1);
+    }
 }

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;
-        String codeNum = StringUtils.leftPad(String.valueOf(5), 3, "0");
-        kylinOrderRefunds.setOrderRefundCode(orderRefundCode.concat(codeNum)+ currentTime);
+//        long currentTime = System.currentTimeMillis()% 100;
+//        String codeNum = StringUtils.leftPad(String.valueOf(5), 3, "0");
+        kylinOrderRefunds.setOrderRefundCode(orderRefundCode.concat(dataUtils.incrOrderRefundCode(orderInfo.getOrderCode())+""));
         kylinOrderRefunds.setPrice(entitiesPriceSum);
         kylinOrderRefunds.setPriceExpress(RefundPriceExpress);
         kylinOrderRefunds.setStatus(KylinTableStatusConst.ORDER_REFUND_STATUS_APPLY);

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

@@ -73,6 +73,10 @@ public class DataUtils {
         redisUtil.set(KylinRedisConst.ORDER_LIST + userId, vo);
     }
 
+    public int incrOrderRefundCode(String orderCode) {
+       return (int) redisUtil.incr(KylinRedisConst.ORDER_REFUND_TEMP + orderCode,1);
+    }
+
     public List<KylinOrderListVo> getOrderList(String userId) {
         Object obj = redisUtil.get(KylinRedisConst.ORDER_LIST + userId);
         if (obj != null) {