Merge remote-tracking branch 'origin/master'

hx-jushuitan/src/main/java/com/fjhx/jushuitan/service/api/JstApiService.java

@@ -1,6 +1,7 @@
 package com.fjhx.jushuitan.service.api;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.thread.ThreadUtil;
@@ -164,7 +165,7 @@ public class JstApiService {
             //如果订单已存在，
             Long oid = order.getOid();
             List<JstOrderInfo> list = jstOrderInfoService.lambdaQuery().eq(JstOrderInfo::getOid, oid).list();
-            if (ObjectUtil.isNotEmpty(list)) {
+            if (CollectionUtil.isNotEmpty(list)) {
                 jstOrderInfoService.lambdaUpdate().eq(JstOrderInfo::getOid, oid).remove();
                 jstOrderDetailService.lambdaUpdate().eq(JstOrderDetail::getOrderId, oid).remove();
                 jstOrderPayInfoService.lambdaUpdate().eq(JstOrderPayInfo::getOrderId, oid).remove();