瀏覽代碼

首页统计

guomengjiao 3 月之前
父節點
當前提交
b283051ff4

+ 1 - 1
ruoyi-admin/src/main/resources/application-dev.yml

@@ -119,7 +119,7 @@ spring:
     # 端口,默认为6379
     port: 6379
     # 数据库索引
-    database: 5
+    database: 2
     # 密码
     password: songlanyun
     # 连接超时时间

+ 1 - 0
ruoyi-info/src/main/java/com/ruoyi/info/order/service/impl/OrderServiceImpl.java

@@ -101,6 +101,7 @@ public class OrderServiceImpl implements IOrderService {
         lqw.eq(bo.getOrderNum() != null, Order::getOrderNum, bo.getOrderNum());
         lqw.eq(bo.getSellingPrice() != null, Order::getSellingPrice, bo.getSellingPrice());
         lqw.eq(bo.getTotalPrice() != null, Order::getTotalPrice, bo.getTotalPrice());
+        lqw.orderByDesc(Order::getCreateTime);
         return lqw;
     }
 

+ 3 - 1
ruoyi-info/src/main/java/com/ruoyi/info/service/exception/ServiceCategorizeExceptionEnum.java

@@ -12,7 +12,9 @@ public enum ServiceCategorizeExceptionEnum implements IIntegerEnum {
     // TODO 注意检查错误码,保证系统内唯一
     ServiceCategorize_IS_NOT_EXISTS(150001, "服务分类不存在"),
     ServiceCategorize_NAME_EXISTS(150002, "服务分类名称已经存在"),
-    ServiceCategorize_EXISTS_ON_SALE(150003, "服务分类状态为已上架,不可删除");
+    ServiceCategorize_EXISTS_ON_SALE(150003, "服务分类状态为已上架,不可删除"),
+    ServiceCategorize_EXISTS_ON_PRODUCT(150004, "服务分类已被服务引用,不可删除"),
+    ;
 
     private Integer code;
 

+ 2 - 0
ruoyi-info/src/main/java/com/ruoyi/info/service/service/IServiceProductService.java

@@ -80,4 +80,6 @@ public interface IServiceProductService {
     ServiceProductVo queryDelById(Long id);
 
     List<ServiceCategorizeStatisticsVo> queryServiceCategorizeStatistics();
+
+    Long countByCategorizeId(Collection<Long> ids);
 }

+ 8 - 0
ruoyi-info/src/main/java/com/ruoyi/info/service/service/impl/ServiceCategorizeServiceImpl.java

@@ -18,9 +18,11 @@ import com.ruoyi.info.service.domain.vo.ServiceCategorizeVo;
 import com.ruoyi.info.service.exception.ServiceCategorizeExceptionEnum;
 import com.ruoyi.info.service.mapper.ServiceCategorizeMapper;
 import com.ruoyi.info.service.service.IServiceCategorizeService;
+import com.ruoyi.info.service.service.IServiceProductService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -36,6 +38,8 @@ import java.util.Map;
 public class ServiceCategorizeServiceImpl implements IServiceCategorizeService {
 
     private final ServiceCategorizeMapper baseMapper;
+    @Resource
+    private IServiceProductService serviceProductService;
 
     /**
      * 查询服务分类分页
@@ -162,6 +166,10 @@ public class ServiceCategorizeServiceImpl implements IServiceCategorizeService {
             if(count > 0){
                 throw new ServiceException(ServiceCategorizeExceptionEnum.ServiceCategorize_EXISTS_ON_SALE);
             }
+            count = serviceProductService.countByCategorizeId(ids);
+            if(count > 0){
+                throw new ServiceException(ServiceCategorizeExceptionEnum.ServiceCategorize_EXISTS_ON_PRODUCT);
+            }
         }
         return baseMapper.deleteBatchIds(ids) > 0;
     }

+ 5 - 0
ruoyi-info/src/main/java/com/ruoyi/info/service/service/impl/ServiceProductServiceImpl.java

@@ -214,4 +214,9 @@ public class ServiceProductServiceImpl implements IServiceProductService {
         }).collect(Collectors.toList());
     }
 
+    @Override
+    public Long countByCategorizeId(Collection<Long> ids) {
+        return baseMapper.selectCount(new LambdaQueryWrapper<ServiceProduct>().in(ServiceProduct::getServiceCategorizeId, ids));
+    }
+
 }