Merge branch 'master' into 3.5

# Conflicts:
#	src/main/java/com/gogirl/infrastructure/schedule/Schedule.java

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

@@ -757,7 +757,8 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
                 List<ScheduleServe> typeConflictScheduleServe = scheduleServeMapper.selectConflictType(
                         scheduleManageDTO.getScheduledUser(),
                         scheduleManageDTO.getArriveTime(),
-                        baseServe.getSchTypeId());
+                        baseServe.getSchTypeId(),
+                        scheduleServeCommand.getId());
                 if (ListUtil.isNotEmpty(typeConflictScheduleServe)) {
                     throw new RRException("同类型服务一天只能预约一次");
                 }
@@ -765,10 +766,10 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
         });
     }
 
-    private String getScheduleNo(Integer deparmentId) {
+    private String getScheduleNo(Integer debarmentId) {
 
         //调用店铺服务根据id查询店铺
-        StoreManage storeManage = storeManageMapper.selectById(deparmentId);
+        StoreManage storeManage = storeManageMapper.selectById(debarmentId);
 
         //生成预约单号
         String shortCode = storeManage.getShortCode();

src/main/java/com/gogirl/infrastructure/mapper/order/serve/ScheduleServeMapper.java

@@ -11,5 +11,6 @@ public interface ScheduleServeMapper extends BaseMapper<ScheduleServe> {
 
     List<ScheduleServe> selectConflictType(@Param("scheduledUser") Integer scheduledUser,
                                            @Param("days") Date days,
-                                           @Param("schTypeId") Integer schTypeId);
+                                           @Param("schTypeId") Integer schTypeId,
+                                           @Param("scheduleServeId") Integer scheduleServeId);
 }

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

@@ -121,7 +121,6 @@ public class Schedule {
 
         //查出所有的技师,找到技师id和user_id
         for (StoreTechnician item : listTechnicianManage) {
-            //key 美甲师Id value 美甲师用户id
             mapTechnicianManage.put(String.valueOf(item.getTechnicianId()), String.valueOf(item.getUserId()));
         }
 
@@ -137,30 +136,31 @@ public class Schedule {
             StringBuilder referee_ids = new StringBuilder();
             //充值记录
             CustomerBalanceRecord cbrt = balanceRecordDao.selectByPrimaryKey(customerBalanceRecord.getId());
-            //如果推荐人不为空
-            if (customerBalanceRecord.getRefereeId() != null) {
             //每次都修改推荐人,且每晚都会设置推荐人
-                String[] refereeIdsArrays = customerBalanceRecord.getRefereeId().split(",");
-
-                for (String refereeId : refereeIdsArrays) {
-                    if (!map.containsKey(refereeId)) {
-                        map.put(refereeId, refereeId);
-                        referee_ids.append(",").append(mapTechnicianManage.get(refereeId));
+            if (customerBalanceRecord.getRefereeId() != null) {
+                String[] arr = customerBalanceRecord.getRefereeId().split(",");
+                //
+                for (String s : arr) {
+                    if (!map.containsKey(s)) {
+                        map.put(s, s);
+                        referee_ids.append(",").append(mapTechnicianManage.get(s));
                     }
                 }
+                //去掉首尾,
                 if (referee_ids.toString().startsWith(",")) {
                     referee_ids = new StringBuilder(referee_ids.substring(1));
                 }
                 customerBalanceRecord.setRefereeId(referee_ids.toString());
             }
+            //如果店铺id不为空
             if (cbrt != null && cbrt.getDepartmentId() != null) {
                 customerBalanceRecord.setDepartmentId(cbrt.getDepartmentId());
             }
-            if (customerBalanceRecord.getId() != null && (customerBalanceRecord.getRefereeId() != null || customerBalanceRecord.getDepartmentId() != null)) {
+            if (customerBalanceRecord.getId() != null
+                    && (customerBalanceRecord.getRefereeId() != null || customerBalanceRecord.getDepartmentId() != null)) {
                 balanceRecordDao.updateByPrimaryKeySelective(customerBalanceRecord);
             }
         }
-
         log.debug("每天晚上11:50定时设置当天服务的技师为推荐人** 任务结束");
     }
 

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

@@ -13,6 +13,9 @@
         and TO_DAYS(t1.start_time) = TO_DAYS(#{days})
         and t1.main_serve_id is null
         and t2.`status` = 1
+        <if test="scheduleServeId!=null">
+            and t1.id != #{scheduleServeId}
+        </if>
     </select>
 
 </mapper>