Merge remote-tracking branch 'origin/dev' into dev

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/mapper/KylinCheckUserMapper.java

@@ -20,5 +20,5 @@ public interface KylinCheckUserMapper extends BaseMapper<KylinCheckUser> {
 
     List<ChildListDao> childSimpleList(@Param("merchantId") String merchantId, @Param("mobile") String mobile);
 
-    ChildDetailsDao childDetails(@Param("merchantId")String merchantId, @Param("merchantId")String checkUserId);
+    ChildDetailsDao childDetails(@Param("merchantId")String merchantId, @Param("checkUserId")String checkUserId);
 }

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

@@ -85,6 +85,7 @@ public class KylinRefundsStatusServiceImpl {
                 orderObject
         );
         dataUtils.delOrderTicketRedis(orderTicketsId);
+        log.info("orderInfo.getUserId() = "+ orderInfo.getUserId());
         orderUtils.resetOrderListVo(orderInfo.getUserId(), 2, orderTicketsId, null);
 
 
@@ -223,6 +224,7 @@ public class KylinRefundsStatusServiceImpl {
                     orderObject
             );
             dataUtils.delOrderTicketRedis(orderInfo.getOrderTicketsId());
+            log.info("orderInfo.getUserId() = "+ orderInfo.getUserId());
             orderUtils.resetOrderListVo(orderInfo.getUserId(), 2, orderInfo.getOrderTicketsId(), null);