问卷调查

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

@@ -12,6 +12,7 @@ import com.gogirl.application.product.serve.BaseTypeService;
 import com.gogirl.application.store.store.StoreClassesTechnicianService;
 import com.gogirl.application.user.customer.CustomerService;
 import com.gogirl.domain.market.discount.LeisureDiscountConfig;
+import com.gogirl.domain.market.discount.LeisureDiscountConfigLimit;
 import com.gogirl.domain.order.serve.*;
 import com.gogirl.domain.product.purchase.PurchaseSku;
 import com.gogirl.domain.product.serve.*;
@@ -921,12 +922,30 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
     private void handleLesisureDiscountConfig(ScheduleManage scheduleManage) {
         List<ScheduleServe> oldScheduleServeList;
         if (scheduleManage.getId() != null) {
-            oldScheduleServeList = scheduleServeMapper.selectList(new LambdaQueryWrapper<ScheduleServe>()
-                    .eq(ScheduleServe::getSchId, scheduleManage.getId()));
+            oldScheduleServeList = scheduleServeMapper.selectList(new LambdaQueryWrapper<ScheduleServe>().eq(ScheduleServe::getSchId, scheduleManage.getId()));
         } else {
             oldScheduleServeList = Lists.newArrayList();
         }
-        String date = scheduleManage.getScheduleDate();
+        String date = new SimpleDateFormat("yyyy-MM-dd").format(scheduleManage.getScheduledTime());
+        oldScheduleServeList.forEach(scheduleServe -> {
+            if (scheduleServe.getLeisureDiscountConfigId() != null) {
+                LeisureDiscountConfigLimit leisureDiscountConfigLimit = leisureDiscountConfigLimitMapper.selectConfigLimit(date, scheduleServe.getLeisureDiscountConfigId());
+                if (leisureDiscountConfigLimit != null) {
+                    leisureDiscountConfigLimit.setLeftTimes(leisureDiscountConfigLimit.getLeftTimes() + 1);
+                    leisureDiscountConfigLimitMapper.updateById(leisureDiscountConfigLimit);
+                }
+            }
+        });
+
+        scheduleManage.getListScheduleServer().forEach(scheduleServe -> {
+            if (scheduleServe.getLeisureDiscountConfigId() != null) {
+                LeisureDiscountConfigLimit leisureDiscountConfigLimit = leisureDiscountConfigLimitMapper.selectConfigLimit(date, scheduleServe.getLeisureDiscountConfigId());
+                if (leisureDiscountConfigLimit != null) {
+                    leisureDiscountConfigLimit.setLeftTimes(leisureDiscountConfigLimit.getLeftTimes() - 1);
+                }
+                leisureDiscountConfigLimitMapper.updateById(leisureDiscountConfigLimit);
+            }
+        });
     }
 
     /**
@@ -1170,6 +1189,9 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
         scheduleManage.addScheduleServeList(scheduleServeList);
         Set<ScheduleServe> scheduleServes = scheduleManage.getListScheduleServer();
         scheduleManage.setTotalPrice(scheduleServes.stream().map(ScheduleServe::getPrice).reduce(BigDecimal.ZERO, BigDecimal::add));
+
+        //处理闲时折扣次数
+        this.handleLesisureDiscountConfig(scheduleManage);
         return scheduleManage;
     }
 

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

@@ -163,7 +163,7 @@ public class CareerCmdServiceImpl implements CareerCmdService {
     @Override
     public IPage<TrainingStartClass> queryPageClass(TrainingStartClassQuery qry) {
         IPage<TrainingStartClass> page = new Page<>(qry.getPageNum(), qry.getPageSize());
-        page = trainingStartClassMapper.selectPage(page, new LambdaQueryWrapper<>());
+        page = trainingStartClassMapper.selectPage(page, new LambdaQueryWrapper<TrainingStartClass>().eq(TrainingStartClass::getStatus, 1));
         if (ListUtil.isEmpty(page.getRecords())) {
             return page;
         }

src/main/java/com/gogirl/application/store/training/ITrainingFeedbackDetailService.java

+package com.gogirl.application.store.training;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.gogirl.domain.store.training.TrainingFeedbackDetail;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020-07-07
+ */
+public interface ITrainingFeedbackDetailService extends IService<TrainingFeedbackDetail> {
+
+}

src/main/java/com/gogirl/application/store/training/ITrainingFeedbackService.java

+package com.gogirl.application.store.training;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.gogirl.domain.store.training.TrainingFeedback;
+
+/**
+ * <p>
+ * 服务类
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020-07-07
+ */
+public interface ITrainingFeedbackService extends IService<TrainingFeedback> {
+
+    /**
+     * 提交问卷
+     *
+     * @param trainingFeedback
+     */
+    void submitTrainingFeedBack(TrainingFeedback trainingFeedback);
+}

src/main/java/com/gogirl/application/store/training/ITrainingQuestionOptionService.java

+package com.gogirl.application.store.training;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.gogirl.domain.store.training.TrainingQuestionOption;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020-07-07
+ */
+public interface ITrainingQuestionOptionService extends IService<TrainingQuestionOption> {
+
+}

src/main/java/com/gogirl/application/store/training/ITrainingQuestionService.java

+package com.gogirl.application.store.training;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.gogirl.domain.store.training.TrainingQuestion;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 服务类
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020-07-07
+ */
+public interface ITrainingQuestionService extends IService<TrainingQuestion> {
+
+    /**
+     * 查询培训反馈问题
+     *
+     * @return
+     */
+    List<TrainingQuestion> trainingFeedbackQuestions();
+}

src/main/java/com/gogirl/application/store/training/ITrainingStartClassLogTechnicianService.java

+package com.gogirl.application.store.training;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.gogirl.domain.store.training.TrainingStartClassLogTechnician;
+import com.gogirl.shared.store.training.QueryPageStartClassLogRequest;
+
+/**
+ * <p>
+ * 每次开课，参与的美甲师 服务类
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020-07-07
+ */
+public interface ITrainingStartClassLogTechnicianService extends IService<TrainingStartClassLogTechnician> {
+
+    /**
+     * 查询美甲师培训报名
+     *
+     * @param request
+     * @return
+     */
+    IPage<TrainingStartClassLogTechnician> queryPageStartClassLog(QueryPageStartClassLogRequest request);
+}

src/main/java/com/gogirl/application/store/training/ITrainingStartClassService.java

+package com.gogirl.application.store.training;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.gogirl.domain.store.training.TrainingStartClass;
+
+/**
+ * <p>
+ * 开课 服务类
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020-07-07
+ */
+public interface ITrainingStartClassService extends IService<TrainingStartClass> {
+
+}

src/main/java/com/gogirl/application/store/training/impl/TrainingFeedbackDetailServiceImpl.java

+package com.gogirl.application.store.training.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gogirl.application.store.training.ITrainingFeedbackDetailService;
+import com.gogirl.domain.store.training.TrainingFeedbackDetail;
+import com.gogirl.infrastructure.mapper.store.training.TrainingFeedbackDetailMapper;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020-07-07
+ */
+@Service
+public class TrainingFeedbackDetailServiceImpl extends ServiceImpl<TrainingFeedbackDetailMapper, TrainingFeedbackDetail> implements ITrainingFeedbackDetailService {
+
+}

src/main/java/com/gogirl/application/store/training/impl/TrainingFeedbackServiceImpl.java

+package com.gogirl.application.store.training.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gogirl.application.store.training.ITrainingFeedbackDetailService;
+import com.gogirl.application.store.training.ITrainingFeedbackService;
+import com.gogirl.domain.store.training.TrainingFeedback;
+import com.gogirl.infrastructure.mapper.store.training.TrainingFeedbackMapper;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020-07-07
+ */
+@Service
+public class TrainingFeedbackServiceImpl extends ServiceImpl<TrainingFeedbackMapper, TrainingFeedback> implements ITrainingFeedbackService {
+
+    @Resource
+    private ITrainingFeedbackDetailService trainingFeedbackDetailService;
+
+    @Override
+    public void submitTrainingFeedBack(TrainingFeedback trainingFeedback) {
+        this.save(trainingFeedback);
+
+        trainingFeedback.getTrainingFeedbackDetailList().forEach(trainingFeedbackDetail -> {
+            trainingFeedbackDetail.setTrainingFeedbackId(trainingFeedback.getId());
+        });
+        trainingFeedbackDetailService.saveBatch(trainingFeedback.getTrainingFeedbackDetailList());
+    }
+}

src/main/java/com/gogirl/application/store/training/impl/TrainingQuestionOptionServiceImpl.java

+package com.gogirl.application.store.training.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gogirl.application.store.training.ITrainingQuestionOptionService;
+import com.gogirl.domain.store.training.TrainingQuestionOption;
+import com.gogirl.infrastructure.mapper.store.training.TrainingQuestionOptionMapper;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020-07-07
+ */
+@Service
+public class TrainingQuestionOptionServiceImpl extends ServiceImpl<TrainingQuestionOptionMapper, TrainingQuestionOption> implements ITrainingQuestionOptionService {
+
+}

src/main/java/com/gogirl/application/store/training/impl/TrainingQuestionServiceImpl.java

+package com.gogirl.application.store.training.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gogirl.application.store.training.ITrainingQuestionService;
+import com.gogirl.domain.store.training.TrainingQuestion;
+import com.gogirl.domain.store.training.TrainingQuestionOption;
+import com.gogirl.infrastructure.common.util.ListUtil;
+import com.gogirl.infrastructure.mapper.store.training.TrainingQuestionMapper;
+import com.gogirl.infrastructure.mapper.store.training.TrainingQuestionOptionMapper;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020-07-07
+ */
+@Service
+public class TrainingQuestionServiceImpl extends ServiceImpl<TrainingQuestionMapper, TrainingQuestion> implements ITrainingQuestionService {
+
+    @Resource
+    private TrainingQuestionOptionMapper trainingQuestionOptionMapper;
+
+    @Override
+    public List<TrainingQuestion> trainingFeedbackQuestions() {
+
+        List<TrainingQuestion> trainingQuestionList = baseMapper.selectList(new LambdaQueryWrapper<TrainingQuestion>().eq(TrainingQuestion::getEnable, 1));
+        List<Integer> trainingQuestionIds = trainingQuestionList.stream().map(TrainingQuestion::getId).collect(Collectors.toList());
+
+        if (ListUtil.isNotEmpty(trainingQuestionIds)) {
+            Map<Integer, List<TrainingQuestionOption>> optionsMap = trainingQuestionOptionMapper.selectList(new LambdaQueryWrapper<TrainingQuestionOption>()
+                    .in(TrainingQuestionOption::getTrainingQuestionId, trainingQuestionIds))
+                    .stream()
+                    .collect(Collectors.groupingBy(TrainingQuestionOption::getTrainingQuestionId));
+            trainingQuestionList.forEach(trainingQuestion -> trainingQuestion.setTrainingQuestionOptionList(optionsMap.get(trainingQuestion.getId())));
+
+        }
+        return trainingQuestionList;
+    }
+}

src/main/java/com/gogirl/application/store/training/impl/TrainingStartClassLogTechnicianServiceImpl.java

+package com.gogirl.application.store.training.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gogirl.application.store.training.ITrainingStartClassLogTechnicianService;
+import com.gogirl.domain.store.training.TrainingStartClass;
+import com.gogirl.domain.store.training.TrainingStartClassLogTechnician;
+import com.gogirl.infrastructure.common.util.ListUtil;
+import com.gogirl.infrastructure.mapper.store.training.TrainingStartClassLogTechnicianMapper;
+import com.gogirl.infrastructure.mapper.store.training.TrainingStartClassMapper;
+import com.gogirl.infrastructure.util.SessionUtils;
+import com.gogirl.shared.store.training.QueryPageStartClassLogRequest;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 每次开课，参与的美甲师 服务实现类
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020-07-07
+ */
+@Service
+public class TrainingStartClassLogTechnicianServiceImpl extends ServiceImpl<TrainingStartClassLogTechnicianMapper, TrainingStartClassLogTechnician> implements ITrainingStartClassLogTechnicianService {
+
+    @Resource
+    TrainingStartClassMapper trainingStartClassMapper;
+
+    @Override
+    public IPage<TrainingStartClassLogTechnician> queryPageStartClassLog(QueryPageStartClassLogRequest request) {
+
+        Integer technicianId = SessionUtils.getTechnicianId();
+        request.setTechnicianId(technicianId);
+        IPage<TrainingStartClassLogTechnician> pageRequest = new Page<>(request.getPageNum(), request.getPageSize());
+        IPage<TrainingStartClassLogTechnician> page = baseMapper.queryPageStartClassLog(pageRequest, request);
+
+        List<Integer> ids = page.getRecords().stream().map(TrainingStartClassLogTechnician::getTrainingStartClassId).collect(Collectors.toList());
+        if (ListUtil.isNotEmpty(ids)) {
+            Map<Integer, TrainingStartClass> trainingStartClassesMap = trainingStartClassMapper.selectBatchIds(ids).stream().collect(Collectors.toMap(TrainingStartClass::getId, trainingStartClass -> trainingStartClass, (k1, k2) -> k1));
+            page.getRecords().forEach(trainingStartClassLogTechnician -> {
+                trainingStartClassLogTechnician.setTrainingStartClass(trainingStartClassesMap.get(trainingStartClassLogTechnician.getTrainingStartClassId()));
+            });
+        }
+
+        return page;
+    }
+}

src/main/java/com/gogirl/application/store/training/impl/TrainingStartClassServiceImpl.java

+package com.gogirl.application.store.training.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gogirl.application.store.training.ITrainingStartClassService;
+import com.gogirl.domain.store.training.TrainingStartClass;
+import com.gogirl.infrastructure.mapper.store.training.TrainingStartClassMapper;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 开课 服务实现类
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020-07-07
+ */
+@Service
+public class TrainingStartClassServiceImpl extends ServiceImpl<TrainingStartClassMapper, TrainingStartClass> implements ITrainingStartClassService {
+
+}

src/main/java/com/gogirl/domain/store/training/TrainingFeedback.java

+package com.gogirl.domain.store.training;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020-07-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TrainingFeedback对象", description = "")
+public class TrainingFeedback implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty(value = "美甲师参加开课记录id")
+    private Integer trainingStartClassLogTechnicianId;
+
+    @TableField(exist = false)
+    private List<TrainingFeedbackDetail> trainingFeedbackDetailList;
+
+
+}

src/main/java/com/gogirl/domain/store/training/TrainingFeedbackDetail.java

+package com.gogirl.domain.store.training;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020-07-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TrainingFeedbackDetail对象", description="")
+public class TrainingFeedbackDetail implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+    private Integer trainingFeedbackId;
+
+    @ApiModelProperty(value = "选项id")
+    private Integer trainingQuestionOptionId;
+
+    @ApiModelProperty(value = "问题id")
+    private Integer question;
+
+    @ApiModelProperty(value = "问题内容")
+    private String trainingQuestion;
+
+    @ApiModelProperty(value = "选项内容或者天空内容")
+    private String questionAnswer;
+
+
+}

src/main/java/com/gogirl/domain/store/training/TrainingQuestion.java

+package com.gogirl.domain.store.training;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020-07-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TrainingQuestion对象", description="")
+public class TrainingQuestion implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty(value = "问题")
+    private String question;
+
+    @ApiModelProperty(value = "排序")
+    private Integer sort;
+
+    @ApiModelProperty(value = "问题类型 1-选择题 2-填空题")
+    private Integer type;
+
+    @ApiModelProperty(value = "是否启用 1-是 2-否")
+    private Integer enable;
+
+    private LocalDateTime createTime;
+
+    private LocalDateTime lastUpdateTime;
+
+    @TableField(exist = false)
+    private List<TrainingQuestionOption> trainingQuestionOptionList;
+
+
+}

src/main/java/com/gogirl/domain/store/training/TrainingQuestionOption.java

+package com.gogirl.domain.store.training;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020-07-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TrainingQuestionOption对象", description = "")
+public class TrainingQuestionOption implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty(value = "培训问卷问题选项")
+    private Integer trainingQuestionId;
+
+    @ApiModelProperty(value = "选项内容")
+    private String option;
+
+
+}

src/main/java/com/gogirl/domain/store/training/TrainingStartClassLog.java

-package com.gogirl.domain.store.training;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.Date;
-
-@Data
-@AllArgsConstructor
-@Builder
-@NoArgsConstructor
-@TableName("training_start_class_log")
-public class TrainingStartClassLog {
-
-    private Integer id;
-
-    private Integer trainingStartClassId;
-
-    private String picturePath;
-
-    private String content;
-
-    private String feedback;
-
-    private Date createTime;
-
-    private Date updateTime;
-
-    private Date openTIme;
-}

src/main/java/com/gogirl/infrastructure/common/base/PageRequest.java

@@ -19,15 +19,4 @@ public class PageRequest {
      */
     protected int pageSize = 10;
 
-    /**
-     * 开始记录
-     */
-    protected int startSize = 0;
-
-    /**
-     * 结束记录
-     */
-    protected int endSize = 0;
-
-
 }

src/main/java/com/gogirl/infrastructure/mapper/market/discount/LeisureDiscountConfigLimitMapper.java

@@ -2,6 +2,7 @@ package com.gogirl.infrastructure.mapper.market.discount;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.gogirl.domain.market.discount.LeisureDiscountConfigLimit;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -14,4 +15,12 @@ import com.gogirl.domain.market.discount.LeisureDiscountConfigLimit;
 public interface LeisureDiscountConfigLimitMapper extends BaseMapper<LeisureDiscountConfigLimit> {
 
     void syncWeekConfigLimit();
+
+    /**
+     * 查询折扣具体天数字的配置
+     *  @param date
+     * @param leisureDiscountConfigId
+     * @return
+     */
+    LeisureDiscountConfigLimit selectConfigLimit(@Param("date") String date, @Param("leisureDiscountConfigId") Integer leisureDiscountConfigId);
 }

src/main/java/com/gogirl/infrastructure/mapper/store/training/TrainingFeedbackDetailMapper.java

+package com.gogirl.infrastructure.mapper.store.training;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gogirl.domain.store.training.TrainingFeedbackDetail;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020-07-07
+ */
+public interface TrainingFeedbackDetailMapper extends BaseMapper<TrainingFeedbackDetail> {
+
+}

src/main/java/com/gogirl/infrastructure/mapper/store/training/TrainingFeedbackMapper.java

+package com.gogirl.infrastructure.mapper.store.training;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gogirl.domain.store.training.TrainingFeedback;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020-07-07
+ */
+public interface TrainingFeedbackMapper extends BaseMapper<TrainingFeedback> {
+
+}

src/main/java/com/gogirl/infrastructure/mapper/store/training/TrainingQuestionMapper.java

+package com.gogirl.infrastructure.mapper.store.training;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gogirl.domain.store.training.TrainingQuestion;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020-07-07
+ */
+public interface TrainingQuestionMapper extends BaseMapper<TrainingQuestion> {
+
+}

src/main/java/com/gogirl/infrastructure/mapper/store/training/TrainingQuestionOptionMapper.java

+package com.gogirl.infrastructure.mapper.store.training;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gogirl.domain.store.training.TrainingQuestionOption;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020-07-07
+ */
+public interface TrainingQuestionOptionMapper extends BaseMapper<TrainingQuestionOption> {
+
+}

src/main/java/com/gogirl/infrastructure/mapper/store/training/TrainingStartClassLogMapper.java

-package com.gogirl.infrastructure.mapper.store.training;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.gogirl.domain.store.training.TrainingStartClassLog;
-import org.apache.ibatis.annotations.Mapper;
-
-
-
-public interface TrainingStartClassLogMapper extends BaseMapper<TrainingStartClassLog> {
-}

src/main/java/com/gogirl/infrastructure/mapper/store/training/TrainingStartClassLogTechnicianMapper.java

@@ -2,11 +2,20 @@ package com.gogirl.infrastructure.mapper.store.training;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.gogirl.domain.store.training.TrainingStartClassLogTechnician;
-import org.apache.ibatis.annotations.Mapper;
-
+import com.gogirl.shared.store.training.QueryPageStartClassLogRequest;
+import org.apache.ibatis.annotations.Param;
 
 
 public interface TrainingStartClassLogTechnicianMapper extends BaseMapper<TrainingStartClassLogTechnician> {
 
+    /**
+     * 查询参与开课的美甲师
+     *
+     * @param pageRequest
+     * @param request
+     * @return
+     */
+    IPage<TrainingStartClassLogTechnician> queryPageStartClassLog(@Param("page") IPage<TrainingStartClassLogTechnician> pageRequest,@Param("request") QueryPageStartClassLogRequest request);
 }

src/main/java/com/gogirl/infrastructure/mapper/store/training/TrainingStartClassMapper.java

@@ -2,8 +2,9 @@ package com.gogirl.infrastructure.mapper.store.training;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.gogirl.domain.store.training.TrainingStartClass;
-import org.apache.ibatis.annotations.Mapper;
 
 
 public interface TrainingStartClassMapper extends BaseMapper<TrainingStartClass> {
+
+    void syncTrainingStartClass();
 }

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

@@ -44,6 +44,7 @@ import com.gogirl.infrastructure.mapper.store.career.CareerMapper;
 import com.gogirl.infrastructure.mapper.store.store.StoreDataMapper;
 import com.gogirl.infrastructure.mapper.store.store.StoreManageMapper;
 import com.gogirl.infrastructure.mapper.store.store.StoreTechnicianMapper;
+import com.gogirl.infrastructure.mapper.store.training.TrainingStartClassMapper;
 import com.gogirl.infrastructure.mapper.user.customer.CustomerBalanceRecordMapper;
 import com.gogirl.infrastructure.mapper.xcx.WeekConfigMapper;
 import com.gogirl.infrastructure.service.push.PushMsgService;
@@ -124,6 +125,7 @@ public class Schedule {
     private final TimesCardCustomerRelevanceMapper timesCardCustomerRelevanceMapper;
 
     private final RestTemplate restTemplate;
+    private final TrainingStartClassMapper trainingStartClassMapper;
 
     /**
      * 每天3点判断优惠券是否过期。
@@ -692,4 +694,17 @@ public class Schedule {
         baseProduceMapper.syncProduceServeTypeId();
         log.info("同步款式的服务类型id结束");
     }
+
+
+    /**
+     * 每30分钟同步一次开课状态
+     */
+    @Scheduled(cron = "0 0/30 * * * *")
+    public void syncTrainingStartClass() {
+
+        log.info("同步开课状态开始");
+        trainingStartClassMapper.syncTrainingStartClass();
+        log.info("同步开课状态结束  ");
+
+    }
 }

src/main/java/com/gogirl/interfaces/store/career/CareerController.java

@@ -16,7 +16,6 @@ import com.gogirl.domain.store.store.TechnicianAchieve;
 import com.gogirl.domain.store.training.SkillSku;
 import com.gogirl.domain.store.training.TechnicianScore;
 import com.gogirl.domain.store.training.TrainingStartClass;
-import com.gogirl.domain.store.training.TrainingStartClassLogTechnician;
 import com.gogirl.domain.user.customer.CustomerBalanceRecord;
 import com.gogirl.infrastructure.common.base.JsonResult;
 import com.gogirl.infrastructure.common.util.ListUtil;
@@ -121,31 +120,11 @@ public class CareerController {
         return JsonResult.success((Page<TrainingStartClassDTO>) page.convert(trainingStartClassDTOAssembler));
     }
 
-    @ApiOperation("培训记录")
-    @GetMapping("/technician/career/queryPageStartClassLog")
-    public JsonResult<IPage<TrainingStartClassLogTechnician>> queryPageStartClassLog(@RequestParam Integer pageNum,
-                                                                                     @RequestParam Integer pageSize,
-                                                                                     @RequestHeader String token) {
 
 
-        Integer technicianId = SessionUtils.getTechnicianId();
-        IPage<TrainingStartClassLogTechnician> pageRequest = new Page<>(pageNum, pageSize);
-        IPage<TrainingStartClassLogTechnician> page = trainingStartClassLogTechnicianMapper.selectPage(pageRequest, new LambdaQueryWrapper<TrainingStartClassLogTechnician>().eq(TrainingStartClassLogTechnician::getTechnicianId, technicianId));
-
-        List<Integer> ids = page.getRecords().stream().map(TrainingStartClassLogTechnician::getTrainingStartClassId).collect(Collectors.toList());
-        if (ListUtil.isNotEmpty(ids)) {
-            List<TrainingStartClass> trainingStartClassesList = trainingStartClassMapper.selectBatchIds(ids);
-            page.getRecords().forEach(trainingStartClassLogTechnician -> {
-                trainingStartClassLogTechnician.setTrainingStartClass(
-                        trainingStartClassesList.stream().filter(trainingStartClass -> trainingStartClass.getId().equals(trainingStartClassLogTechnician.getTrainingStartClassId())).findAny().orElse(null));
-            });
-        }
-        return JsonResult.success(page);
-    }
-
     @ApiOperation("成长历程")
     @GetMapping("/technician/career/career")
-    public JsonResult<Career> career(@RequestHeader String token) {
+    public JsonResult<Career> career() {
         Career career = careerCmdService.career(SessionUtils.getTechnicianId());
         return JsonResult.success(career);
     }

src/main/java/com/gogirl/interfaces/store/training/TrainingFeedbackController.java

+package com.gogirl.interfaces.store.training;
+
+
+import com.gogirl.application.store.training.ITrainingFeedbackService;
+import com.gogirl.domain.store.training.TrainingFeedback;
+import com.gogirl.infrastructure.common.base.JsonResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * <p>
+ * 前端控制器
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020-07-07
+ */
+@RestController
+@RequestMapping("/technician/trainingFeedback")
+public class TrainingFeedbackController {
+
+    @Resource
+    private ITrainingFeedbackService trainingFeedbackService;
+
+    @PostMapping("/submitTrainingFeedBack")
+    public JsonResult<Void> submitTrainingFeedBack(@RequestBody TrainingFeedback trainingFeedback) {
+        trainingFeedbackService.submitTrainingFeedBack(trainingFeedback);
+        return JsonResult.success();
+    }
+}

src/main/java/com/gogirl/interfaces/store/training/TrainingFeedbackDetailController.java

+package com.gogirl.interfaces.store.training;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020-07-07
+ */
+@RestController
+@RequestMapping("/training-feedback-detail")
+public class TrainingFeedbackDetailController {
+
+}

src/main/java/com/gogirl/interfaces/store/training/TrainingQuestionController.java

+package com.gogirl.interfaces.store.training;
+
+
+import com.gogirl.application.store.training.ITrainingQuestionService;
+import com.gogirl.domain.store.training.TrainingQuestion;
+import com.gogirl.infrastructure.common.base.JsonResult;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * <p>
+ * 前端控制器
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020-07-07
+ */
+@RestController
+@RequestMapping("/technician/trainingQuestion")
+public class TrainingQuestionController {
+
+    @Resource
+    ITrainingQuestionService trainingQuestionService;
+
+
+    @GetMapping("/trainingFeedbackQuestions")
+    public JsonResult<List<TrainingQuestion>> trainingFeedbackQuestions() {
+        List<TrainingQuestion> trainingQuestionList = trainingQuestionService.trainingFeedbackQuestions();
+        return JsonResult.success();
+    }
+
+
+}

src/main/java/com/gogirl/interfaces/store/training/TrainingQuestionOptionController.java

+package com.gogirl.interfaces.store.training;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020-07-07
+ */
+@RestController
+@RequestMapping("/training-question-option")
+public class TrainingQuestionOptionController {
+
+}

src/main/java/com/gogirl/interfaces/store/training/TrainingStartClassController.java

+package com.gogirl.interfaces.store.training;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 开课 前端控制器
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020-07-07
+ */
+@RestController
+@RequestMapping("/training-start-class")
+public class TrainingStartClassController {
+
+}

src/main/java/com/gogirl/interfaces/store/training/TrainingStartClassLogTechnicianController.java

+package com.gogirl.interfaces.store.training;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gogirl.application.store.training.ITrainingStartClassLogTechnicianService;
+import com.gogirl.domain.store.training.TrainingStartClassLogTechnician;
+import com.gogirl.infrastructure.common.base.JsonResult;
+import com.gogirl.shared.store.training.QueryPageStartClassLogRequest;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * <p>
+ * 每次开课，参与的美甲师 前端控制器
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020-07-07
+ */
+@RestController
+public class TrainingStartClassLogTechnicianController {
+    @Resource
+    ITrainingStartClassLogTechnicianService trainingStartClassLogTechnicianService;
+
+    @ApiOperation("培训记录")
+    @GetMapping("/technician/career/queryPageStartClassLog")
+    public JsonResult<IPage<TrainingStartClassLogTechnician>> queryPageStartClassLog(QueryPageStartClassLogRequest request) {
+
+
+        IPage<TrainingStartClassLogTechnician> page = trainingStartClassLogTechnicianService.queryPageStartClassLog(request);
+        return JsonResult.success(page);
+    }
+
+}

src/main/java/com/gogirl/shared/store/training/QueryPageStartClassLogRequest.java

+package com.gogirl.shared.store.training;
+
+import com.gogirl.infrastructure.common.base.PageRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020/7/7 1:00 下午
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class QueryPageStartClassLogRequest extends PageRequest {
+
+    @ApiModelProperty("状态")
+    private Integer status;
+
+
+    @ApiModelProperty("美甲师id")
+    private Integer technicianId;
+}

src/main/resources/mapper/LeisureDiscountConfigLimitMapper.xml

@@ -10,4 +10,10 @@
                  LEFT JOIN leisure_discount_config t3 on t2.leisure_discount_config_id = t3.id
         where t3.id is not null
     </insert>
+    <select id="selectConfigLimit" resultType="com.gogirl.domain.market.discount.LeisureDiscountConfigLimit">
+        SELECT *
+        from leisure_discount_config_limit t1
+        where t1.date = #{date}
+          and t1.leisure_discount_config_id = #{leisureDiscountConfigId}
+    </select>
 </mapper>

src/main/resources/mapper/TrainingFeedbackDetailMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.gogirl.infrastructure.mapper.store.training.TrainingFeedbackDetailMapper">
+
+</mapper>

src/main/resources/mapper/TrainingFeedbackMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.gogirl.infrastructure.mapper.store.training.TrainingFeedbackMapper">
+
+</mapper>

src/main/resources/mapper/TrainingQuestionMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.gogirl.infrastructure.mapper.store.training.TrainingQuestionMapper">
+
+</mapper>

src/main/resources/mapper/TrainingQuestionOptionMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.gogirl.infrastructure.mapper.store.training.TrainingQuestionOptionMapper">
+
+</mapper>

src/main/resources/mapper/TrainingStartClassLogTechnicianMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.gogirl.infrastructure.mapper.store.training.TrainingStartClassLogTechnicianMapper">
+
+    <select id="queryPageStartClassLog"
+            resultType="com.gogirl.domain.store.training.TrainingStartClassLogTechnician">
+        select *
+        from training_start_class_log_technician t1
+                 left join training_start_class t2 on t1.training_start_class_id = t2.id
+        where t1.technician_id = #{request.technicianId}
+          and t2.status = #{request.status}
+    </select>
+</mapper>

src/main/resources/mapper/TrainingStartClassMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.gogirl.infrastructure.mapper.store.training.TrainingStartClassMapper">
+
+    <update id="syncTrainingStartClass">
+        update training_start_class
+        set `status` =2
+        where end_time &lt; NOW()
+          and `status` = 1
+    </update>
+</mapper>