分类增加商家ID与类型

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/CategoryServiceImpl.java

@@ -21,9 +21,6 @@ import com.chelvc.framework.common.util.StringUtils;
 import com.chelvc.framework.database.context.DatabaseContextHolder;
 import lombok.NonNull;
 import org.apache.dubbo.config.annotation.DubboService;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import javax.validation.Valid;
 
 /**
  * 分类业务操作实现
@@ -62,8 +59,8 @@ public class CategoryServiceImpl extends ServiceImpl<CategoryMapper, Category> i
     @Override
     public List<CategoryDTO> listActiveCategories(CategoryListParam param) {
         List<Category> categories = this.lambdaQuery().eq(Category::getEnabled, true)
-                .eq(StringUtils.nonEmpty(param.getType()),Category::getType,param.getType())
-                .eq(StringUtils.nonEmpty(param.getMerchantId()),Category::getMerchantId,param.getMerchantId())
+                .eq(StringUtils.notEmpty(param.getType()),Category::getType,param.getType())
+                .eq(StringUtils.notEmpty(param.getMerchantId()),Category::getMerchantId,param.getMerchantId())
                 .orderByAsc(Category::getSort).list();
         categories.sort(Comparator.comparing(Category::getType).thenComparing(Category::getSort));
         List<CategoryDTO> categoryDTOS = CategoryCopier.INSTANCE.copying(categories);
@@ -100,8 +97,8 @@ public class CategoryServiceImpl extends ServiceImpl<CategoryMapper, Category> i
         List<Category> categories = this.lambdaQuery()
                 .eq(Category::getEnabled, true)
                 .eq(Category::getParentId,0)
-                .eq(StringUtils.nonEmpty(param.getType()),Category::getType,param.getType())
-                .eq(StringUtils.nonEmpty(param.getMerchantId()),Category::getMerchantId,param.getMerchantId())
+                .eq(StringUtils.notEmpty(param.getType()),Category::getType,param.getType())
+                .eq(StringUtils.notEmpty(param.getMerchantId()),Category::getMerchantId,param.getMerchantId())
                 .orderByAsc(Category::getSort).list();
         categories.sort(Comparator.comparing(Category::getType).thenComparing(Category::getSort));
         return CategoryCopier.INSTANCE.copying(categories);

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/ReservationServiceImpl.java

@@ -128,7 +128,7 @@ public class ReservationServiceImpl extends ServiceImpl<ReservationMapper, Reser
             return null;
         }
         List<Reservation> list = this.lambdaQuery()
-                .eq(StringUtils.nonEmpty(param.getStatus()), Reservation::getStatus, param.getStatus())
+                .eq(StringUtils.notEmpty(param.getStatus()), Reservation::getStatus, param.getStatus())
                 .in(Reservation::getMerchantId, param.getMerchantId())
                 .orderByDesc(Reservation::getAppointTime)
                 .list();