款式

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.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.util.SessionUtils;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
@@ -34,13 +31,6 @@ public class BaseServeServiceImpl extends ServiceImpl<BaseServeMapper, BaseServe
 
     @Override
     public BaseServe getAggregate(Integer id, LocalDateTime date, Integer departmentId) {
-
-
-        BaseServe baseServe = baseServeMapper.selectById(id);
-        if (SessionUtils.getSourceFrom().equals(SessionUtils.technician)) {
-            List<BaseProduce> baseProduceList = baseProduceMapper.selectList(new LambdaQueryWrapper<BaseProduce>().eq(BaseProduce::getServiceId, id));
-            baseServe.setListProduce(baseProduceList);
-        }
-        return baseServe;
+        return baseServeMapper.selectById(id);
     }
 }

src/main/java/com/gogirl/infrastructure/schedule/Schedule.java

@@ -76,6 +76,7 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
 @EnableScheduling
@@ -408,8 +409,7 @@ public class Schedule {
         List<StoreTechnician> storeTechnicianList = storeTechnicianMapper.selectList(new LambdaQueryWrapper<StoreTechnician>()
                 .eq(StoreTechnician::getStatus, 1)
                 .eq(StoreTechnician::getIsAdmin, false));
-
-        storeTechnicianList.forEach(storeTechnician -> {
+        Consumer<StoreTechnician> consumer = storeTechnician -> {
 
             ParameterizedTypeReference<AdminResult<AdminPage<AdminTechnicianScore>>> responseBodyType = new ParameterizedTypeReference<AdminResult<AdminPage<AdminTechnicianScore>>>() {
             };
@@ -548,6 +548,14 @@ public class Schedule {
             } else {
                 careerMapper.insert(career);
             }
+        };
+
+        storeTechnicianList.forEach(storeTechnician -> {
+            try {
+                consumer.accept(storeTechnician);
+            } catch (Exception e) {
+                log.error("同步美甲师成长任务失败,id:{},name:{}", storeTechnician.getId(), storeTechnician.getName());
+            }
         });
 
         log.info("定时同步美甲师成长历程** 任务结束");

src/main/java/com/gogirl/interfaces/product/serve/ProduceController.java

@@ -28,6 +28,14 @@ public class ProduceController {
     }
 
 
+    @GetMapping("/technician/serve/no_queryProducePage")
+    @ApiOperation(value = "美甲师款式列表")
+    public JsonResult<IPage<BaseProduce>> techQueryProducePage(QueryProducePageRequest request) {
+        IPage<BaseProduce> page = baseProduceService.queryProducePage(request);
+        return JsonResult.success(page);
+    }
+
+
     @ApiOperation(value = "查询款式详情", notes = "查询款式详情")
     @GetMapping("/customer/produce/queryProduceDetail")
     public JsonResult<BaseProduce> queryProduceDetail(Integer id) {
@@ -39,13 +47,9 @@ public class ProduceController {
     @GetMapping("/customer/produce/queryProduceDetail2")
     public JsonResult<QueryProduceDetailResp> queryProduceDetail2(@RequestParam Integer id) {
 
-
         BaseProduce produce = baseProduceService.getProduceForDetail(id);
         QueryProduceDetailResp data = new QueryProduceDetailResp();
-
-        //款式
         data.setProduce(produce);
-        //服务
         data.setServe(produce.getServe());
         return JsonResult.success(data);
     }