Merge branch 'dev' into test

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

@@ -2,6 +2,7 @@ package com.liquidnet.service.kylin.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.github.pagehelper.PageInfo;
+import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.commons.lang.util.CurrentUtil;
 import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.commons.lang.util.JsonUtils;
@@ -406,10 +407,10 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
     @Override
     public ResponseDto<Boolean> orderRefundWithdraw(String orderRefundsId) {
 
-        LinkedList<String> sqls = new LinkedList<>();
-        LinkedList<Object[]> sqlsDataA = new LinkedList<>();
-        LinkedList<Object[]> sqlsDataB = new LinkedList<>();
-        LinkedList<Object[]> sqlsDataC = new LinkedList<>();
+        LinkedList<String> sqls = CollectionUtil.linkedListString();
+        LinkedList<Object[]> sqlsDataA = CollectionUtil.linkedListObjectArr();
+        LinkedList<Object[]> sqlsDataB = CollectionUtil.linkedListObjectArr();
+        LinkedList<Object[]> sqlsDataC = CollectionUtil.linkedListObjectArr();
 
         LocalDateTime time = LocalDateTime.now();
         String strTime = DateUtil.Formatter.yyyyMMddHHmmss.format(time);

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/refund/OrderRefundsCallbackServiceImpl.java

@@ -51,7 +51,7 @@ public class OrderRefundsCallbackServiceImpl extends ServiceImpl<KylinOrderRefun
     public String refundCallback(RefundCallbackParam refundCallbackParam) {
         KylinOrderRefunds refundInfo = kylinOrderRefundsMapper.selectOne(
                 new UpdateWrapper<KylinOrderRefunds>()
-                        .eq("order_refund_code", refundCallbackParam.getRefundCode())
+                        .eq("order_refund_code", refundCallbackParam.getOrderRefundCode())
         );
         if (refundInfo == null) {
             log.info("Failed:{}.RefundController refundCallback: 退款订单查询失败，编号{}", "KylinOrderRefundsServiceImplRefundCallback", refundCallbackParam.getOrderRefundCode());