排班合并 预约更新合并

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

@@ -45,9 +45,6 @@ import com.gogirl.shared.order.serve.command.schedule.*;
 import com.gogirl.shared.order.serve.query.dto.IdleTimeDTO;
 import com.gogirl.shared.order.serve.query.qry.*;
 import com.gogirl.shared.order.serve.query.qry.schedule.ScheduleManagePageQuery;
-import com.gogirl.shared.product.query.dto.BaseProduceDTO;
-import com.gogirl.shared.product.query.dto.PurchaseSkuDTO;
-import com.gogirl.shared.store.query.dto.StoreTechnicianDTO;
 import com.google.common.collect.Lists;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -1076,7 +1073,7 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
                     //服务款式设置
                     if (scheduleServeCmd.getProduceId() != null) {
 
-                        BaseProduce baseProduce=baseProduceMapper.selectById(scheduleServeCmd.getProduceId());
+                        BaseProduce baseProduce = baseProduceMapper.selectById(scheduleServeCmd.getProduceId());
 
                         scheduleServeCmd.setProduceName(baseProduce.getName());
                         scheduleServeCmd.setProducePicturePath(baseProduce.getPicturePath());
@@ -1489,7 +1486,7 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
 
         LeisureDiscountConfig leisureDiscountConfig = leisureDiscountConfigMapper.selectById(scheduleServe.getLeisureDiscountConfigId());
         if (leisureDiscountConfig == null) {
-            return 2;
+            return 3;
         }
         //
         else {

src/main/java/com/gogirl/application/store/store/StoreClassesTechnicianService.java

 package com.gogirl.application.store.store;
 
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.gogirl.domain.store.store.StoreClassesTechnician;
 
 import java.util.List;
 
 
-public interface StoreClassesTechnicianService {
+public interface StoreClassesTechnicianService extends IService<StoreClassesTechnician> {
 
     /**
      * 查询美甲师排班表

src/main/java/com/gogirl/application/store/store/impl/StoreClassesTechnicianServiceImpl.java

 package com.gogirl.application.store.store.impl;
 
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gogirl.application.store.store.StoreClassesTechnicianService;
 import com.gogirl.domain.store.store.StoreClassesTechnician;
 import com.gogirl.infrastructure.mapper.store.StoreClassesTechnicianMapper;
@@ -15,7 +16,7 @@ import java.util.List;
  */
 @Service
 @AllArgsConstructor
-public class StoreClassesTechnicianServiceImpl implements StoreClassesTechnicianService {
+public class StoreClassesTechnicianServiceImpl extends ServiceImpl<StoreClassesTechnicianMapper, StoreClassesTechnician> implements StoreClassesTechnicianService {
 
     private final StoreClassesTechnicianMapper storeClassesTechnicianMapper;
 

src/main/java/com/gogirl/domain/store/store/StoreClassesTechnician.java

 package com.gogirl.domain.store.store;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.gogirl.domain.order.serve.ScheduleServe;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Builder;
 import lombok.Data;
 
 import java.util.Date;
@@ -16,10 +19,11 @@ import java.util.List;
  */
 @ApiModel("每天排班记录")
 @TableName("store_classes_technician")
-
+@Builder
 @Data
 public class StoreClassesTechnician {
 
+    @TableId(type = IdType.AUTO)
     private Integer id;
 
     @ApiModelProperty("美甲师id 这里是technician_id")

src/main/java/com/gogirl/infrastructure/mapper/store/StoreClassesTechnicianMapper.java

 package com.gogirl.infrastructure.mapper.store;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.gogirl.domain.store.store.StoreClassesTechnician;
-import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -12,7 +13,7 @@ import java.util.List;
  */
 
 @Repository
-public interface StoreClassesTechnicianMapper {
+public interface StoreClassesTechnicianMapper extends BaseMapper<StoreClassesTechnician> {
 
 
     List<StoreClassesTechnician> listClassesTechnician(@Param("scheduleId") Integer scheduleId, @Param("departmentId") Integer departmentId, @Param("days") String days);
@@ -29,4 +30,7 @@ public interface StoreClassesTechnicianMapper {
 
     List<StoreClassesTechnician> listByDepartmentIdAndDays(@Param("departmentId") Integer departmentId, @Param("days") String days);
 
+    StoreClassesTechnician selectOneClassTech(@Param("departmentId") Integer departmentId, @Param("day") Date day, @Param("technicianId") Integer technicianId);
+
+    List<Integer> deleteDayClassesIds(@Param("departmentId") Integer departmentId, @Param("day") Date day);
 }

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

@@ -142,6 +142,7 @@ public class ScheduleManageController {
         qry.setServeId(serveId);
         qry.setVipLevel(customerBalanceService.getCustomerBalance(currentCustomerId).getLevel());
 
+        //todo 会员预约服务
 //        JsonResult<VipServeDTO> result = vipControllerFeign.query(qry);
 //        if (result.getData() == null) {
 //            throw new RRException(1002, "会员才能享受服务");
@@ -217,8 +218,8 @@ public class ScheduleManageController {
     @GetMapping("/technician/schedule/getScheduledServeLeisure")
     public JsonResult<Integer> getScheduledServeLeisure(@RequestHeader String token,
                                                         @RequestParam Integer scheduleServeId) {
-        scheduleManageService.getScheduledServeLeisure(scheduleServeId);
-        return JsonResult.success();
+        Integer result = scheduleManageService.getScheduledServeLeisure(scheduleServeId);
+        return JsonResult.success(result);
     }
 
 }

src/main/resources/mapper/store/StoreClassesTechnicianMapper.xml

@@ -139,6 +139,24 @@
           and t2.department_id = #{departmentId}
     </select>
 
+    <select id="selectOneClassTech" resultType="com.gogirl.domain.store.store.StoreClassesTechnician">
+        SELECT *
+        from store_classes_technician t1
+                 LEFT JOIN store_classes t2 on t1.classes = t2.id
+        where (t1.days = #{day} and t2.department_id = #{departmentId} and t1.user_id = #{technicianId})
+           or (t1.classes = 0 and t1.user_id = #{technicianId} and t1.days = #{day})
+        order by classes desc
+        limit 1
+    </select>
+
+
+    <select id="deleteDayClassesIds" resultType="java.lang.Integer">
+        SELECT t1.id
+        FROM store_classes_technician t1
+                 LEFT JOIN store_classes t2 ON t1.classes = t2.id
+        WHERE (t1.days = #{day} AND t2.department_id = #{departmentId})
+           OR (t1.classes = 0 AND t1.days = #{day})
+    </select>
 
     <update id="updateClassesTechnician" parameterType="com.gogirl.domain.store.store.StoreClassesTechnician">
         update store_classes_technician