Commit f16195c7 by huluobin

update

parent 28222e74
......@@ -670,7 +670,15 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
//参数检查
//保存所有订单评论给
List<OrderCommentCommand> orderCommentCommandList = cmd.getCommentList();
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
.forEach(orderCommentCommand -> {
......
......@@ -1145,6 +1145,7 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
scheduleServe.setCreateTime(new Date());
scheduleServe.setStatus(1);
}
scheduleServe.setMainServeId(scheduleServeCommand.getMainServeId());
scheduleServe.setSchId(cmd.getId());
//是否指定美甲师
......
......@@ -34,8 +34,8 @@ spring:
name: gogirl-miniapp-backend
# 数据配置
datasource:
url: jdbc:mysql://10.0.0.9:3306/bailun_gogirl?useUnicode=true&characterEncoding=utf-8&useSSL=false&&zeroDateTimeBehavior=convertToNull
# url: jdbc:mysql://gz-cdb-c0sq6eax.sql.tencentcdb.com:60779/bailun_gogirl?useUnicode=true&characterEncoding=utf-8&useSSL=false&zeroDateTimeBehavior=convertToNull
# url: jdbc:mysql://10.0.0.9:3306/bailun_gogirl?useUnicode=true&characterEncoding=utf-8&useSSL=false&&zeroDateTimeBehavior=convertToNull
url: jdbc:mysql://gz-cdb-c0sq6eax.sql.tencentcdb.com:60779/bailun_gogirl?useUnicode=true&characterEncoding=utf-8&useSSL=false&zeroDateTimeBehavior=convertToNull
username: root
password: "#7kfnymAM$Y9-Ntf"
driver-class-name: com.mysql.jdbc.Driver
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment