update

src/main/java/com/gogirl/application/product/serve/impl/BaseServeServiceImpl.java

 package com.gogirl.application.product.serve.impl;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gogirl.application.product.serve.BaseServeService;
 import com.gogirl.domain.market.discount.LeisureDiscountConfig;
+import com.gogirl.domain.product.serve.BaseProduce;
 import com.gogirl.domain.product.serve.BaseServe;
 import com.gogirl.infrastructure.mapper.market.discount.LeisureDiscountConfigMapper;
+import com.gogirl.infrastructure.mapper.product.serve.BaseProduceMapper;
 import com.gogirl.infrastructure.mapper.product.serve.BaseServeMapper;
 import com.gogirl.infrastructure.mapper.product.serve.ProducePromotionTimeMapper;
 import lombok.AllArgsConstructor;
@@ -21,6 +24,7 @@ public class BaseServeServiceImpl extends ServiceImpl<BaseServeMapper, BaseServe
 
     private final BaseServeMapper baseServeMapper;
     private final LeisureDiscountConfigMapper leisureDiscountConfigMapper;
+    private final BaseProduceMapper baseProduceMapper;
 
 
     @Override
@@ -32,7 +36,12 @@ public class BaseServeServiceImpl extends ServiceImpl<BaseServeMapper, BaseServe
 
     @Override
     public BaseServe getAggregate(Integer id, LocalDateTime date, Integer departmentId) {
-        BaseServe baseServe = baseServeMapper.getAggregate(id);
+        BaseServe baseServe = baseServeMapper.selectById(id);
+
+        List<BaseProduce> baseProduceList = baseProduceMapper.selectList(new LambdaQueryWrapper<BaseProduce>()
+                .eq(BaseProduce::getServiceId, baseServe.getId()));
+
+        baseServe.setListProduce(baseProduceList);
         if (date != null) {
             LeisureDiscountConfig leisureDiscountConfig = leisureDiscountConfigMapper.selectLeisureDiscount(id,
                     date.toLocalTime().toString(),

src/main/java/com/gogirl/infrastructure/mapper/product/serve/BaseServeMapper.java

@@ -21,5 +21,4 @@ public interface BaseServeMapper extends BaseMapper<BaseServe> {
     IPage<BaseServe> listLeisureServeForPage(@Param("page") IPage<BaseServe> page, @Param("baseServe") BaseServe baseServe, @Param("serveIdList") List<Integer> serveIdList, @Param("time") String time, @Param("week") Integer week);
 
 
-    BaseServe getAggregate(Integer id);
 }