销售业绩

src/main/java/com/gogirl/application/order/mall/impl/MallOrderTechnicianServiceImpl.java

 package com.gogirl.application.order.mall.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gogirl.application.order.mall.IMallOrderTechnicianService;
 import com.gogirl.domain.order.mall.MallOrder;
+import com.gogirl.domain.order.mall.MallOrderDetail;
 import com.gogirl.domain.order.mall.MallOrderTechnician;
 import com.gogirl.infrastructure.common.util.ListUtil;
+import com.gogirl.infrastructure.mapper.order.mall.MallOrderDetailMapper;
 import com.gogirl.infrastructure.mapper.order.mall.MallOrderMapper;
 import com.gogirl.infrastructure.mapper.order.mall.MallOrderTechnicianMapper;
 import com.gogirl.shared.order.mall.QueryMallOrderAchievementRequest;
@@ -31,6 +34,8 @@ public class MallOrderTechnicianServiceImpl extends ServiceImpl<MallOrderTechnic
 
     @Resource
     MallOrderMapper mallOrderMapper;
+    @Resource
+    MallOrderDetailMapper mallOrderDetailMapper;
 
     @Override
     public Page<MallOrderTechnician> queryMallOrderAchievement(QueryMallOrderAchievementRequest request) {
@@ -42,9 +47,16 @@ public class MallOrderTechnicianServiceImpl extends ServiceImpl<MallOrderTechnic
             Map<Long, MallOrder> mallOrderMap = mallOrderMapper.selectBatchIds(mallOrderIdList)
                     .stream()
                     .collect(Collectors.toMap(MallOrder::getId, mallOrder -> mallOrder, (k1, k2) -> k1));
-            mallOrderTechnicianList.getRecords().forEach(mallOrderTechnician -> {
-                mallOrderTechnician.setMallOrder(mallOrderMap.get(mallOrderTechnician.getMallOrderId()));
+
+            Map<Long, List<MallOrderDetail>> mallOrderDetailMap = mallOrderDetailMapper.selectList(new LambdaQueryWrapper<MallOrderDetail>().in(MallOrderDetail::getOrderId, mallOrderIdList))
+                    .stream()
+                    .collect(Collectors.groupingBy(MallOrderDetail::getOrderId));
+
+            mallOrderMap.forEach((mallOrderId, mallOrder) -> {
+                mallOrder.setMallOrderDetailList(mallOrderDetailMap.get(mallOrderId));
             });
+
+            mallOrderTechnicianList.getRecords().forEach(mallOrderTechnician -> mallOrderTechnician.setMallOrder(mallOrderMap.get(mallOrderTechnician.getMallOrderId())));
         }
 
         return mallOrderTechnicianList;

src/main/java/com/gogirl/application/order/serve/ScheduleManageService.java

@@ -72,12 +72,6 @@ public interface ScheduleManageService extends IService<ScheduleManage> {
      */
     void updateSchedule(SubmitScheduleCommand cmd) throws ParseException, ExecutionException, InterruptedException;
 
-    /**
-     * 更新预约前检查
-     *
-     * @param cmd
-     */
-    void checkBeforeUpdate(UpdateScheduleCommand cmd);
 
     /**
      * 店员获取时间列表

src/main/java/com/gogirl/application/order/serve/impl/ScheduleManageServiceImpl.java

@@ -25,6 +25,7 @@ import com.gogirl.infrastructure.common.util.CloneUtil;
 import com.gogirl.infrastructure.common.util.ListUtil;
 import com.gogirl.infrastructure.common.util.StringUtils;
 import com.gogirl.infrastructure.config.property.GogirlProperties;
+import com.gogirl.infrastructure.mapper.market.discount.LeisureDiscountConfigLimitMapper;
 import com.gogirl.infrastructure.mapper.market.discount.LeisureDiscountConfigMapper;
 import com.gogirl.infrastructure.mapper.order.serve.OrderManageMapper;
 import com.gogirl.infrastructure.mapper.order.serve.OwnProduceMapper;
@@ -80,6 +81,7 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
     private final BaseScheduledTypeMapper baseScheduledTypeMapper;
     private final ProducePromotionTimeMapper producePromotionTimeMapper;
     private final StoreClassesTechnicianMapper storeClassesTechnicianMapper;
+    private final LeisureDiscountConfigLimitMapper leisureDiscountConfigLimitMapper;
 
 
     private final StoreClassesTechnicianService storeClassesTechnicianService;
@@ -683,10 +685,6 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
         }
     }
 
-    @Override
-    public void checkBeforeUpdate(UpdateScheduleCommand cmd) {
-
-    }
 
     @Override
     public List<Map<String, Object>> queryReservableTime(String startDate, Integer lengthTime, Integer departmentId, Integer orderId, Boolean needRemoveOldServe) {
@@ -1043,6 +1041,7 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
                     scheduleServe.setStartTime(scheduleServeCommand.getStartTime());
                     //预约结束时间
                     scheduleServe.setEndTime(scheduleServeCommand.getEndTime());
+
                     //闲时折扣
                     if (scheduleServeCommand.getLeisureDiscountConfigId() != null) {
                         scheduleServe.setLeisureDiscountConfigId(scheduleServeCommand.getLeisureDiscountConfigId());

src/main/java/com/gogirl/interfaces/order/serve/ScheduleManageController.java

@@ -228,8 +228,6 @@ public class ScheduleManageController {
     @ApiOperation("更新前检查预约")
     @PostMapping("/technician/schedule/checkBeforeUpdate")
     public JsonResult<Void> checkBeforeUpdate(@RequestBody UpdateScheduleCommand cmd) {
-
-        scheduleManageService.checkBeforeUpdate(cmd);
         return JsonResult.success();
     }
 

src/main/resources/mapper/order/ScheduleManageMapper.xml

@@ -245,10 +245,13 @@
         LEFT JOIN base_serve t6 on t3.service_id =t6.id
         LEFT JOIN week_config t7 on t2.`week` =t7.`week`
         LEFT JOIN store_manage t8 on t1.department_id =t8.id
+    	LEFT JOIN leisure_discount_config_limit t9 on t1.id =t9.leisure_discount_config_id and t9.left_times > 0
 
         where t1.is_enabled =1
         and t2.id is not null
         and t3.id is not null
+    	and t9.id is not null
+
         order by distance,week_date,time_node
     </select>