update

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

@@ -816,22 +816,22 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
                 throw new RRException("预约时间不可用");
             }
 
-            /*3、如果是指定美甲师、判断美甲师是否仍然可用*/
-            //构造路径
-            List<TreeProgram> treeProgramList = new ArrayList<>();
-            TreeProgram treeProgram = new TreeProgram();
-            List<ScheduleServe> scheduleServeList = scheduleManage.getListScheduleServer()
-                    .stream()
-                    .filter(scheduleServe -> scheduleServe.getServeId() == null)
-                    .collect(Collectors.toList());
-
-            //方案树
-            TreeProgram targetTree = idleTimeDTO.getTreeProgram();
-
-            boolean isPath = treeProgram.isSubTree(targetTree);
-            if (!isPath) {
-                throw new RRException("请重新选择美甲师");
-            }
+//            /*3、如果是指定美甲师、判断美甲师是否仍然可用*/
+//            //构造路径
+//            List<TreeProgram> treeProgramList = new ArrayList<>();
+//            TreeProgram treeProgram = new TreeProgram();
+//            List<ScheduleServe> scheduleServeList = scheduleManage.getListScheduleServer()
+//                    .stream()
+//                    .filter(scheduleServe -> scheduleServe.getServeId() == null)
+//                    .collect(Collectors.toList());
+//
+//            //方案树
+//            TreeProgram targetTree = idleTimeDTO.getTreeProgram();
+//
+//            boolean isPath = treeProgram.isSubTree(targetTree);
+//            if (!isPath) {
+//                throw new RRException("请重新选择美甲师");
+//            }
         }
     }
 
@@ -906,10 +906,10 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
             scheduleServe.setCreateTime(new Date());
             scheduleServe.setSchId(scheduleManage.getId());
         });
-        /*2、保存预约详情*/
+        /*3、保存预约详情*/
         scheduleManage.getScheduleServeList().forEach(scheduleServeMapper::insert);
 
-        /*3、发送美甲师通知*/
+        /*4、发送美甲师通知*/
         technicianPushService.scheduledMsg(scheduleManage.getId());
     }
 

src/main/java/com/gogirl/application/xcx/impl/QRCodeServiceImpl.java

@@ -22,6 +22,7 @@ public class QRCodeServiceImpl implements QRCodeService {
 
     @Resource
     private GogirlProperties gogirlProperties;
+
     @Resource
     FileService fileService;
 

src/main/java/com/gogirl/domain/order/serve/ScheduleManage.java

@@ -46,44 +46,56 @@ public class ScheduleManage implements Serializable {
     public static final Integer TYPE_CUSTOMER = 1;
     //店铺段预约
     public static final Integer TYPE_STORE = 2;
+
     @TableId(type = IdType.AUTO)
     @ApiModelProperty("选时间的时候就新建的id(删除状态),在确定预约按钮改为已预约状态")
     private Integer id;
+
     @ApiModelProperty("预约订单号")
     private String scheduledNo;
+
     @ApiModelProperty("下单人id")
     private Integer scheduledUser;
+
     @ApiModelProperty("店铺端预约手机号码")
     private String telephone;
+
     @ApiModelProperty("店铺端预约用户名")
     private String storeScheduleUsername;
+
     @ApiModelProperty("总价")
     private BigDecimal totalPrice;
+
     @ApiModelProperty("创建人")
     private String createUser;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty("预约时间")
     private Date scheduledTime;
+
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty("最近修改时间")
     private Date lastUpdateTime;
+
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty("预约到达时间")
     private Date arriveTime;
+
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty("上次服务时间")
     private Date lastServiceTime;
+
     @ApiModelProperty("到店人")
     private String arriveUser;
+
     @ApiModelProperty("下单店铺id")
     private Integer departmentId;
 
     //
     @ApiModelProperty("下单店铺名称")
     private String departmentName;
-    @ApiModelProperty("备注")
 
+    @ApiModelProperty("备注")
     private String remark;
 
     @ApiModelProperty("删除备注")
@@ -92,39 +104,55 @@ public class ScheduleManage implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty("开单时间")
     private Date openbillTime;
+
     @ApiModelProperty("预约类型")
     private Integer scheduledType;
+
     @ApiModelProperty("已预约#1 守约#2 失约#3  已取消#4 已删除#5 8服务中")
     private Integer status;
+
+    @ApiModelProperty("预约关联的的订单")
     private Integer orderId;
+
+    @Deprecated
     @TableField(exist = false)
     @ApiModelProperty("删除备注")
     private String delRemaerk;
+
     @TableField(exist = false)
     @ApiModelProperty("删除服务字段")
     private String deleteServe;
+
     @TableField(exist = false)
     @ApiModelProperty("提醒类型")
     private Integer remindStatus;
+
     @TableField(exist = false)
     @ApiModelProperty("已读状态")
     private Integer isRead;
+
     @TableField(exist = false)
     @ApiModelProperty("统计开始时间")
     private String startTime;
+
     @TableField(exist = false)
     @ApiModelProperty("统计结束时间")
     private String endTime;
+
     @TableField(exist = false)
     @ApiModelProperty("分页查询当天预约")
     private String sameDayTime;
+
     @TableField(exist = false)
     @ApiModelProperty("发送服务通知需要的formId")
     private String formId;
+
     @ApiModelProperty("是否发送过预约提醒 1是 2否")
     private Integer isSend;
+
     @ApiModelProperty("是否发送过预约提醒 1是 2否")
     private Integer isSendOverTime;
+
     /**
      * 非数据库字段
      */

src/main/resources/application-dev.yml

@@ -85,7 +85,7 @@ gogirl:
   notify-balance-wx-pay: "http://t.begogirls.com/customer/pay/notifyBalanceWxPay"
 
   #服务器图片临时地址
-  picture-path: /upload/grouppic/
+  picture-path: /Users/huluobin/upload/grouppic/
 
   #门店下班时间
   end-time: "22:00:00"

src/main/resources/application-pre.yml

@@ -84,7 +84,7 @@ gogirl:
   notify-balance-wx-pay: "http://t.begogirls.com/customer/pay/notifyBalanceWxPay"
 
   #服务器图片临时地址
-  picture-path: /upload/grouppic/
+  picture-path: /Users/huluobin/upload/grouppic/
 
   #门店下班时间
   end-time: "22:00:00"

src/main/resources/application-test.yml

@@ -84,7 +84,7 @@ gogirl:
   notify-balance-wx-pay: "http://t.begogirls.com/customer/pay/notifyBalanceWxPay"
 
   #服务器图片临时地址
-  picture-path: /upload/grouppic/
+  picture-path: /Users/huluobin/upload/grouppic/
 
   #门店下班时间
   end-time: "22:00:00"