upload

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

@@ -47,7 +47,6 @@ import com.gogirl.infrastructure.subscribe.SubscribeService;
 import com.gogirl.infrastructure.util.CheckUtil;
 import com.gogirl.infrastructure.util.SessionUtils;
 import com.gogirl.shared.member.order.command.CreateCommentCommand;
-import com.gogirl.shared.member.order.command.OrderCommentCommand;
 import com.gogirl.shared.order.serve.query.qry.ordermanage.ListOrderQuery;
 import com.gogirl.shared.user.command.ConsumerCommand;
 import com.google.common.collect.Lists;
@@ -644,44 +643,17 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
 
     @Override
     public List<OrderServe> addOrModifyOrderComment(CreateCommentCommand cmd) {
-        OrderManage orderManage = orderManageMapper.selectById(cmd.getOrderId());
+
+
+        OrderManage orderManage = this.queryOrderForComment(cmd.getOrderId());
 
         if (!orderManage.getStatus().equals(OrderManage.STATUS_UN_COMMENT)) {
             throw new RRException("订单状态异常");
         }
-        List<OrderServe> orderServeList = orderServeMapper.selectList(new LambdaQueryWrapper<OrderServe>().eq(OrderServe::getOrderId, orderManage.getId()));
-
-
-        ScheduleManage scheduleManage = scheduleManageMapper.selectById(orderManage.getScheduledId());
-        List<ScheduleServe> scheduleServeList = scheduleServeMapper.selectList(new LambdaQueryWrapper<ScheduleServe>()
-                .eq(ScheduleServe::getSchId, scheduleManage.getId())
-                .eq(ScheduleServe::getMainServeId, null));
-
-        //主服务id
-        List<Integer> scheduledServeServeIds = scheduleServeList.stream().map(ScheduleServe::getServeId).collect(Collectors.toList());
-
-        //待评论的主服务ID
-        List<Integer> orderServeIds = orderServeList.stream()
-                .filter(orderServe -> scheduledServeServeIds.contains(orderServe.getServeId()))
-                .map(OrderServe::getId)
-                .collect(Collectors.toList());
-
-        //发表评论的服务id
-        List<Integer> commandOrderServeIds = cmd.getCommentList().stream().map(OrderCommentCommand::getOrderServeId).collect(Collectors.toList());
 
-        //参数检查
 
-        //保存所有订单评论给
-        List<OrderCommentCommand> orderCommentCommandList = cmd.getCommentList()
-                .stream()
-                .collect(Collectors.groupingBy(orderCommentCommand -> orderCommentCommand.getOrderServeId() + "-" + orderCommentCommand.getOrderId()))
-                .values()
-                .stream()
-                .map(list -> list.stream().findAny().orElse(null))
-                .filter(Objects::nonNull)
-                .collect(Collectors.toList());
-
-        orderCommentCommandList
+        //2、插入评论
+        cmd.getCommentList()
                 .forEach(orderCommentCommand -> {
 
                     OrderComment orderComment = new OrderComment();
@@ -710,21 +682,23 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
                     } else {
                         orderCommentMapper.updateById(orderComment);
                     }
+                    //3、更新评论分数
                     OrderServe orderServe = orderServeMapper.selectById(orderComment.getOrderServeId());
-                    orderServe.setCommentStatus(OrderServe.COMMENT_STATUS_YES);
                     orderServe.setCommentScore(orderCommentCommand.getOrderServeCommentScore());
                     orderServeMapper.updateById(orderServe);
                 });
 
         orderManage.setStatus(OrderManage.STATUS_FINISHED);
         orderManage.setFinishTime(new Date());
+
         //订单已完成
         orderManageMapper.updateById(orderManage);
         Coupon coupon = couponService.getOne(new LambdaQueryWrapper<Coupon>().eq(Coupon::getName, "评价礼券"));
         if (coupon != null) {
             couponService.sendCoupon(coupon.getId(), orderManage.getOrderUser());
         }
-        return orderServeList;
+
+        return orderManage.getListOrderServer();
     }
 
 

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

@@ -9,21 +9,32 @@ import com.gogirl.domain.store.store.StoreTechnician;
 import com.gogirl.domain.user.customer.Customer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
 
-@ApiModel("订单评论")
+/**
+ * 如果要查询订单服务的评论标签 先根据order_serve.id查询List<OrderComment> orderCommentList
+ * 然后 orderCommentList group by OrderComment#orderServeId 然后根据orderComment 的labelStick去查询
+ */
+@ApiModel("订单服务美甲师评论")
 @Data
 @TableName("order_comment")
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
 public class OrderComment implements Serializable {
 
     /**
      *
      */
     private static final long serialVersionUID = 1L;
+
     @ApiModelProperty("评论id")
     @TableId(type = IdType.AUTO)
     private Integer id;
@@ -31,7 +42,7 @@ public class OrderComment implements Serializable {
     @ApiModelProperty("订单id")
     private Integer orderId;
 
-    @ApiModelProperty("服务id")
+    @ApiModelProperty("订单服务id")
     private Integer orderServeId;
 
     @ApiModelProperty("评论用户id")
@@ -43,7 +54,7 @@ public class OrderComment implements Serializable {
     @ApiModelProperty("备注")
     private String remark;
 
-    @ApiModelProperty("图片地址")
+    @ApiModelProperty("评论图片地址，逗号分隔")
     private String picturePath;
 
     @ApiModelProperty("便签贴")
@@ -63,7 +74,6 @@ public class OrderComment implements Serializable {
     @ApiModelProperty("技师id  关联store_technician")
     private Integer technicianId;
 
-
     /**
      * 非数据库字段
      */
@@ -86,10 +96,8 @@ public class OrderComment implements Serializable {
     @ApiModelProperty("订单评论关联的服务详情")
     private OrderServe orderServe;
 
-
     @TableField(exist = false)
     @ApiModelProperty("订单评论标签列表")
     private List<OrderCommentLabel> listOrderCommentLabel;
 
-
 }

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

@@ -140,11 +140,12 @@ public class Schedule {
             //如果推荐人不为空
             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));
+                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 (referee_ids.toString().startsWith(",")) {
@@ -152,7 +153,6 @@ public class Schedule {
                 }
                 customerBalanceRecord.setRefereeId(referee_ids.toString());
             }
-
             if (cbrt != null && cbrt.getDepartmentId() != null) {
                 customerBalanceRecord.setDepartmentId(cbrt.getDepartmentId());
             }
@@ -160,6 +160,7 @@ public class Schedule {
                 balanceRecordDao.updateByPrimaryKeySelective(customerBalanceRecord);
             }
         }
+
         log.debug("每天晚上11:50定时设置当天服务的技师为推荐人** 任务结束");
     }
 

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

@@ -8,8 +8,8 @@ import lombok.Data;
 import java.io.Serializable;
 import java.util.Date;
 
-@ApiModel("订单评论")
-//@Entity
+
+@ApiModel("订单服务美甲师评论")
 @Data
 public class OrderCommentCommand implements Serializable {
 
@@ -19,7 +19,6 @@ public class OrderCommentCommand implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty("评论id")
-
     private Integer id;
 
     @ApiModelProperty("订单id")
@@ -31,7 +30,7 @@ public class OrderCommentCommand implements Serializable {
     @ApiModelProperty("评论用户id")
     private Integer userId;
 
-    @ApiModelProperty("订单服务评价等级")
+    @ApiModelProperty("美甲师评论得分")
     private Integer level;
 
     @ApiModelProperty("备注")
@@ -54,7 +53,7 @@ public class OrderCommentCommand implements Serializable {
     @ApiModelProperty("状态 1-未评价 2-以评价")
     private Integer status;
 
-    @ApiModelProperty("技师id  关联store_technician")
+    @ApiModelProperty("美甲师评分")
     private Integer technicianId;
 
     @ApiModelProperty("订单服务评论得分")