环境评分

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

@@ -718,7 +718,10 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
         orderManage.setFinishTime(new Date());
 
         //订单已完成
+        //环境评分
+        orderManage.setEnvironmentStar(cmd.getEnvironmentStar());
         orderManageMapper.updateById(orderManage);
+
         Coupon coupon = couponService.getOne(new LambdaQueryWrapper<Coupon>().eq(Coupon::getName, "评价礼券"));
         if (coupon != null) {
             couponService.sendCoupon(coupon.getId(), orderManage.getOrderUser());

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

@@ -233,7 +233,6 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
     public List<IdleTimeDTO> queryIdleTime(IdleTimeProgramQuery qry) throws ParseException, ExecutionException, InterruptedException {
 
         IdleTimeQuery idleTimeQuery = new IdleTimeQuery();
-
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         //美甲师不可用日期列表
@@ -241,20 +240,20 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
 
         idleTimeQuery.setStoreTechnicianDTOList(storeTechnicianDTOList);
 
-        long start3Time = simpleDateFormat.parse(qry.getScheduleDate() + " 10:00:00").getTime();
-
-        long end3Time = simpleDateFormat.parse(qry.getScheduleDate() + " 22:00:00").getTime();
+        long workStartTime = simpleDateFormat.parse(qry.getScheduleDate() + " 10:00:00").getTime();
+        long workEndTime = simpleDateFormat.parse(qry.getScheduleDate() + " 22:00:00").getTime();
 
         List<Long> dateTimeList = new ArrayList<>();
+
         //是否只查询指定时间段
         if (ListUtil.isNotEmpty(qry.getDateTimeList())) {
             dateTimeList = qry.getDateTimeList();
         }
         //返回全部时间段
         else {
-            while (start3Time < end3Time) {
-                dateTimeList.add(start3Time);
-                start3Time = start3Time + 15 * 60000;
+            while (workStartTime < workEndTime) {
+                dateTimeList.add(workStartTime);
+                workStartTime = workStartTime + 15 * 60000;
             }
         }
 
@@ -265,6 +264,7 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
                 .map(scheduleServe -> {
                     ScheduleServeQuery scheduleServeQuery = new ScheduleServeQuery();
                     BeanUtils.copyProperties(scheduleServe, scheduleServeQuery);
+
                     //款式or服务时间
                     if (scheduleServe.getProduceId() == null) {
                         scheduleServeQuery.setLengthTimeForEndTime(baseServeMapper.selectById(scheduleServe.getServeId()).getServiceDuration());

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

@@ -277,6 +277,8 @@ public class OrderManage implements Serializable {
     @ApiModelProperty("是否发送评论服务通知 0-没有 1-是")
     private Integer isSendCommentMsg;
 
+    @ApiModelProperty("环境评分")
+    private Integer environmentStar;
 
     public void setIsFriendPayByPayUserAndOrderUser() {
         this.isFriendPay = payUser.equals(orderUser) ? 2 : 1;

src/main/java/com/gogirl/dto/IdleTimeProgramQuery.java

@@ -107,7 +107,6 @@ public class IdleTimeProgramQuery {
     @ApiModelProperty("token")
     private String token;
 
-
     @TableField(exist = false)
     @ApiModelProperty("预约时间")
     private String scheduleDate;

src/main/java/com/gogirl/shared/member/order/command/CreateCommentCommand.java

@@ -16,6 +16,9 @@ public class CreateCommentCommand {
 
     private Integer currentCustomerId;
 
+    @ApiModelProperty("环境评分")
+    private Integer environmentStar;
+
     @NotNull
     @ApiModelProperty("订单评论列表")
     private List<OrderCommentCommand> commentList;

src/main/java/com/gogirl/shared/order/serve/query/dto/ordermanage/OrderManageDTO.java

@@ -146,6 +146,9 @@ public class OrderManageDTO {
     @ApiModelProperty("支付用户信息")
     private Customer payCustomer;
 
+    @ApiModelProperty("环境评分")
+    private Integer environmentStar;
+
     public void setImages() {
         images = orderServeDTOList
                 .stream()