后台管理优化

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/dto/NoticeDTO.java

@@ -53,11 +53,11 @@ public class NoticeDTO  {
     /**
      * 创建人
      */
-    private Date creator;
+    private String creator;
     /**
      * 更新人
      */
-    private Date updater;
+    private String updater;
 
 
 }

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/param/CouponModifyParam.java

@@ -29,7 +29,7 @@ public class CouponModifyParam implements Serializable {
     /**
      * 商家ID
      */
-    @NotNull(message = "商家ID不能为空")
+//    @NotNull(message = "商家ID不能为空")
 	private Long merchantId;
 
     /**

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/param/GoodsModifyParam.java

@@ -6,6 +6,7 @@ import lombok.*;
 import lombok.experimental.SuperBuilder;
 
 import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import java.util.List;
 
@@ -25,21 +26,19 @@ public class GoodsModifyParam {
     /**
      * 分类类型
      */
-    @NotEmpty(message = "分类类型不能为空")
-    @Size(max = 100, message = "分类类型长度不能大于50")
+    @NotNull(message = "分类类型不能为空")
     private CategoryType type;
 
     /**
      * 分类ID
      */
-    @NotEmpty(message = "分类ID不能为空")
-    @Size(max = 100, message = "分类ID长度不能大于20")
+    @NotNull(message = "分类ID不能为空")
     private Long categoryId;
 
     /**
      * 商家ID
      */
-    @NotEmpty(message = "商家ID不能为空")
+    @NotNull(message = "商家ID不能为空")
     private Long merchantId;
 
     /**
@@ -64,21 +63,19 @@ public class GoodsModifyParam {
      * 商品描述
      */
     @NotEmpty(message = "商品描述不能为空")
-    @Size(max = 100, message = "商品描述长度不能大于500")
+    @Size(max = 500, message = "商品描述长度不能大于500")
     private String description;
 
     /**
      * 商品原价
      */
-    @NotEmpty(message = "商品原价不能为空")
-    @Size(max = 100, message = "商品原价长度不能大于10")
+    @NotNull(message = "商品原价不能为空")
     private Double originalPrice;
 
     /**
      * 优惠价格
      */
-    @NotEmpty(message = "优惠价格不能为空")
-    @Size(max = 100, message = "优惠价格长度不能大于10")
+    @NotNull(message = "优惠价格不能为空")
     private Double specialPrice;
 
     /**
@@ -89,6 +86,6 @@ public class GoodsModifyParam {
     /**
      * 商品状态
      */
-    @NotEmpty(message = "商品状态不能为空")
+    @NotNull(message = "商品状态不能为空")
     private GoodsStatus status;
 }

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/param/GoodsPagingParam.java

@@ -45,6 +45,5 @@ public class GoodsPagingParam implements Serializable {
     /**
      * 商家ID
      */
-    @NotNull(message = "商家ID不能为空")
     private Long merchantId;
 }

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/param/OrderPagingParam.java

@@ -24,7 +24,7 @@ public class OrderPagingParam implements Serializable {
     @NotNull(message = "分页不能为空")
     private Paging paging;
     /**
-     * 商品状态
+     * 订单状态
      */
     private Integer status;
 }

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/param/ReservationPagingParam.java

@@ -0,0 +1,34 @@
+package com.chelvc.cloud.vehicle.api.param;
+
+import com.chelvc.framework.common.model.Paging;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * 预约信息参数
+ *
+ * @author liude
+ * @date 2023/1/17
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ReservationPagingParam implements Serializable {
+
+    /**
+     * 分页信息
+     */
+    @NotNull(message = "分页不能为空")
+    private Paging paging;
+    /**
+     * 状态
+     */
+    private String status;
+
+}

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/service/CategoryService.java

@@ -60,4 +60,10 @@ public interface CategoryService {
      * @param id    分类主键
      */
     void deleteCategory(Long id);
+
+    /**
+     * 获取一级分类
+     * @return 分类信息
+     */
+    List<CategoryDTO> getRootCategories();
 }

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/service/IOmsOrderService.java

@@ -23,7 +23,7 @@ public interface IOmsOrderService
 
     /**
      * 根据用户购物车信息生成确认单信息
-     * @param cartIds
+     * @param orderParam
      */
     ConfirmOrderResultDTO generateConfirmOrder(OmsOrderModifyParam orderParam);
 

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/service/ReservationService.java

@@ -2,7 +2,9 @@ package com.chelvc.cloud.vehicle.api.service;
 
 import com.chelvc.cloud.vehicle.api.dto.ReservationDTO;
 import com.chelvc.cloud.vehicle.api.param.ReservationModifyParam;
+import com.chelvc.cloud.vehicle.api.param.ReservationPagingParam;
 import com.chelvc.cloud.vehicle.api.param.ReservationQueryParam;
+import com.chelvc.framework.common.model.Pagination;
 
 import java.util.List;
 
@@ -35,4 +37,11 @@ public interface ReservationService {
      * @param id    预约记录逐渐主键
      */
     void deleteReservation(Long id);
+    /**
+     * 查询预约
+     *
+     * @param param 查询参数
+     * @return 预约分页信息
+     */
+    Pagination<ReservationDTO> getReservationPaging(ReservationPagingParam param);
 }

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/copier/ReservationCopier.java

@@ -1,13 +1,18 @@
 package com.chelvc.cloud.vehicle.server.copier;
 
+import com.chelvc.cloud.vehicle.api.dto.CommissionConfigDTO;
 import com.chelvc.cloud.vehicle.api.dto.ReservationDTO;
 import com.chelvc.cloud.vehicle.api.param.ReservationModifyParam;
+import com.chelvc.cloud.vehicle.server.entity.CommissionConfig;
 import com.chelvc.cloud.vehicle.server.entity.Reservation;
 import org.mapstruct.Builder;
 import org.mapstruct.Mapper;
 import org.mapstruct.Named;
 import org.mapstruct.factory.Mappers;
 
+import java.util.Collection;
+import java.util.List;
+
 /**
  * 预约信息拷贝接口
  *
@@ -37,4 +42,12 @@ public interface ReservationCopier {
      */
     @Named("entity2dto")
     ReservationDTO copying(Reservation reservation);
+
+    /**
+     * 预约信息拷贝
+     *
+     * @param reservations 预约信息集合
+     * @return 预约信息列表
+     */
+    List<ReservationDTO> copying(Collection<Reservation> reservations);
 }

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

@@ -91,4 +91,12 @@ public class CategoryServiceImpl extends ServiceImpl<CategoryMapper, Category> i
         ResourceUtils.required(this.getById(id), "该分类不存在");
         this.baseMapper.deleteById(id);
     }
+    @Override
+    public List<CategoryDTO> getRootCategories(){
+        List<Category> categories = this.lambdaQuery().eq(Category::getEnabled, true)
+                .eq(Category::getParentId,0)
+                .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/CommissionConfigServiceImpl.java

@@ -41,7 +41,7 @@ public class CommissionConfigServiceImpl extends ServiceImpl<CommissionConfigMap
 
     @Override
     public void updateCommissionConfig(@NonNull Long id, @NonNull CommissionConfigModifyParam param) {
-        CommissionConfig commissionConfig = ResourceUtils.required(this.getById(id), "该轮播图不存在");
+        CommissionConfig commissionConfig = ResourceUtils.required(this.getById(id), "该抽成配置不存在");
         CommissionConfigCopier.INSTANCE.copying(param, commissionConfig);
         Long userId = SessionContextHolder.getId();
         commissionConfig.setUpdateTime(new Date());

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

@@ -118,7 +118,7 @@ public class MerchantServiceImpl extends ServiceImpl<MerchantMapper, Merchant> i
     @Override
     public Pagination<MerchantDTO> getMerchantPaging(@NonNull MerchantPagingParam param) {
         Page<Merchant> page = this.lambdaQuery()
-                .eq(StringUtils.nonEmpty(param.getName()), Merchant::getName, param.getName())
+                .like(StringUtils.nonEmpty(param.getName()), Merchant::getName, param.getName())
                 .eq(Objects.nonNull(param.getRecommend()), Merchant::getRecommend, param.getRecommend())
                 .eq(Objects.nonNull(param.getStatus()), Merchant::getStatus, param.getStatus())
                 .orderByDesc(Merchant::getCreateTime).page(PagingUtils.convert(param.getPaging()));

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

@@ -38,6 +38,7 @@ import com.chelvc.cloud.vehicle.server.service.OmsCartItemService;
 import com.chelvc.cloud.vehicle.server.service.OmsOrderSettingService;
 import com.chelvc.framework.base.context.SessionContextHolder;
 import com.chelvc.framework.common.model.Pagination;
+import com.chelvc.framework.common.util.StringUtils;
 import com.chelvc.framework.database.util.PagingUtils;
 import lombok.RequiredArgsConstructor;
 import org.apache.dubbo.config.annotation.DubboService;
@@ -355,7 +356,7 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
     @Override
     public Pagination<OmsOrderDTO> getOmsOrderPaging(OrderPagingParam param){
         Page<OmsOrder> page = this.lambdaQuery()
-                .eq(OmsOrder :: getStatus,param.getStatus())
+                .eq(StringUtils.nonEmpty(param.getStatus()),OmsOrder :: getStatus,param.getStatus())
                 .orderByDesc(OmsOrder :: getCreateTime)
                 .page(PagingUtils.convert(param.getPaging()));
         return PagingUtils.convert(page, OrderCopier.INSTANCE::copying);

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

@@ -1,15 +1,20 @@
 package com.chelvc.cloud.vehicle.server.service.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.chelvc.cloud.vehicle.api.constant.ReserveStatus;
 import com.chelvc.cloud.vehicle.api.dto.ReservationDTO;
 import com.chelvc.cloud.vehicle.api.param.ReservationModifyParam;
+import com.chelvc.cloud.vehicle.api.param.ReservationPagingParam;
 import com.chelvc.cloud.vehicle.api.param.ReservationQueryParam;
 import com.chelvc.cloud.vehicle.server.copier.ReservationCopier;
 import com.chelvc.cloud.vehicle.server.dao.ReservationMapper;
 import com.chelvc.cloud.vehicle.server.entity.Reservation;
 import com.chelvc.cloud.vehicle.server.service.ReservationService;
 import com.chelvc.framework.base.context.SessionContextHolder;
+import com.chelvc.framework.common.model.Pagination;
+import com.chelvc.framework.common.util.StringUtils;
+import com.chelvc.framework.database.util.PagingUtils;
 import lombok.NonNull;
 import org.apache.dubbo.config.annotation.DubboService;
 import org.springframework.util.CollectionUtils;
@@ -57,4 +62,12 @@ public class ReservationServiceImpl extends ServiceImpl<ReservationMapper, Reser
     public void deleteReservation(Long id){
         this.baseMapper.deleteById(id);
     }
+    @Override
+    public Pagination<ReservationDTO> getReservationPaging(ReservationPagingParam param){
+        Page<Reservation> page = this.lambdaQuery()
+                .eq(StringUtils.nonEmpty(param.getStatus()),Reservation :: getStatus,param.getStatus())
+                .orderByDesc(Reservation :: getAppointTime)
+                .page(PagingUtils.convert(param.getPaging()));
+        return PagingUtils.convert(page, ReservationCopier.INSTANCE::copying);
+    }
 }