clunt
/
ghy-all
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

no message

This commit is contained in:
cb 2025-11-13 10:46:50 +08:00
parent 5c17e811a9
commit f88d3a1673
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java
View File

@ -263,8 +263,8 @@ public class OrderDetailServiceImpl implements OrderDetailService {
orderDetails.forEach(model -> {
if (StringUtils.isNotEmpty(orderDetail.getIsCall())) {
OrderCallRecord param = new OrderCallRecord();
// param.setOrderType("02");
param.setOrderId(model.getId());
param.setOrderType("02");
param.setOrderId(model.getOrderMasterId());
List<OrderCallRecord> list = orderCallRecordService.selectOrderCallRecordList(param);
// 用于判断是约 还是 排的问题
if ("01".equals(orderDetail.getIsCall()) && CollectionUtils.isEmpty(list)) {
@ -393,6 +393,12 @@ public class OrderDetailServiceImpl implements OrderDetailService {
// 更新子订单状态
orderDetailMapper.updateStatus(orderDetailId, OrderStatus.CANCEL.code());
logger.info("Set OrderDetail[{}].orderStatus = {}", orderDetailId, OrderStatus.CANCEL.code());
// 清除超时状态
OrderDetail updateOrderDetail = new OrderDetail();
updateOrderDetail.setId(orderDetailId);
updateOrderDetail.setTimeout(0);
orderDetailMapper.updateOrderDetail(updateOrderDetail);
// 查询出所有的子订单 就走主订单取消流程
List<OrderDetail> orderDetails = orderDetailMapper.selectByOrderMasterId(orderDetail.getOrderMasterId());
// 判断是否是已付款的订单,未付款不需要退款

6
ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml
View File

@ -270,9 +270,9 @@
</otherwise>
</choose>
</if>
<!-- <if test="isCall != null">-->
<!-- AND om.is_call = #{isCall}-->
<!-- </if>-->
<if test="isCall != null">
AND om.is_call = #{isCall}
</if>
</where>
order by od.create_time
<trim suffixOverrides=",">

2
ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderServiceImpl.java
View File

@ -129,7 +129,7 @@ public class OrderServiceImpl implements OrderService {
}
}
// 晚上19点后 - 早上8点前不需要执行定时器
if (nowT.getHour() < 8 || nowT.getHour() > 20) {
if (nowT.getHour() < 8 || nowT.getHour() >=20) {
return;
}
List<Integer> list = new ArrayList<>();