Merge branch '3.7-fix' into 3.7.1

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

@@ -142,7 +142,7 @@ public interface ScheduleManageService extends IService<ScheduleManage> {
     IPage<LeisureScheduleServeResp> queryPageLeisureScheduleServe(LeisureScheduleServeQuery query);
 
     /**
-     * 查询美甲师不可用时间段
+     * 查询美甲师信息和美甲师不可用时间段
      *
      * @param scheduledId  是否必传 否
      * @param departmentId 店铺id

src/main/java/com/gogirl/application/user/customer/impl/CustomerServiceImpl.java

@@ -24,7 +24,6 @@ import com.gogirl.infrastructure.common.util.StringUtils;
 import com.gogirl.infrastructure.mapper.order.serve.OrderManageMapper;
 import com.gogirl.infrastructure.mapper.order.serve.OrderRecordMapper;
 import com.gogirl.infrastructure.mapper.order.serve.OrderServeMapper;
-import com.gogirl.infrastructure.mapper.order.serve.ScheduleManageMapper;
 import com.gogirl.infrastructure.mapper.product.serve.BaseServeMapper;
 import com.gogirl.infrastructure.mapper.store.store.StoreManageMapper;
 import com.gogirl.infrastructure.mapper.user.customer.CustomerBalanceMapper;
@@ -52,36 +51,40 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> i
 
     @Resource
     private CustomerMapper customerMapper;
+
     @Resource
     private WechatService wechatService;
+
     @Resource
     private GogirlTokenService gogirlTokenService;
-    @Resource
-    private ScheduleManageMapper scheduleManageMapper;
 
     @Resource
     private CustomerDetailMapper customerDetailMapper;
+
     @Resource
     private CustomerBalanceMapper customerBalanceMapper;
 
     @Resource
     private QRCodeService qrCodeService;
 
-
     @Resource
     private StoreManageMapper storeManageMapper;
+
     @Resource
     private OrderManageMapper orderManageMapper;
 
     @Resource
     private OrderServeMapper orderServeMapper;
+
     @Resource
     private BaseServeMapper baseServeMapper;
+
     @Resource
     private OrderRecordMapper orderRecordMapper;
 
     @Resource
     private CustomerDetailService customerDetailService;
+
     @Resource
     private OrderManageService orderManageService;
 

src/main/java/com/gogirl/shared/order/StoreTechnicianPeriod.java

 package com.gogirl.shared.order;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.gogirl.domain.store.store.StoreTechnician;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -23,11 +24,27 @@ public class StoreTechnicianPeriod implements Serializable {
      */
     private Integer technicianId;
 
-    //美甲师姓名
+    /**
+     * 美甲师姓名
+     */
     private String name;
 
-
+    /**
+     * 美甲师头像
+     */
     private String picturePath;
 
+    /**
+     * 美甲师级别
+     */
     private String grade;
+
+
+    public StoreTechnicianPeriod(List<Period> periodList, StoreTechnician storeTechnician) {
+        this.periodList = periodList;
+        this.technicianId = storeTechnician.getId();
+        this.name = storeTechnician.getName();
+        this.picturePath = storeTechnician.getPicturePath();
+    }
+
 }