子单未约未排问题
This commit is contained in:
parent
ccc6b3cb99
commit
89a9c13822
|
|
@ -7,9 +7,11 @@ import com.ghy.common.utils.WechatMsgUtils;
|
||||||
import com.ghy.customer.domain.CustomerAddress;
|
import com.ghy.customer.domain.CustomerAddress;
|
||||||
import com.ghy.customer.service.CustomerAddressService;
|
import com.ghy.customer.service.CustomerAddressService;
|
||||||
import com.ghy.order.domain.AfterServiceRecord;
|
import com.ghy.order.domain.AfterServiceRecord;
|
||||||
|
import com.ghy.order.domain.OrderCallRecord;
|
||||||
import com.ghy.order.domain.OrderDetail;
|
import com.ghy.order.domain.OrderDetail;
|
||||||
import com.ghy.order.domain.OrderMaster;
|
import com.ghy.order.domain.OrderMaster;
|
||||||
import com.ghy.order.service.IAfterServiceRecordService;
|
import com.ghy.order.service.IAfterServiceRecordService;
|
||||||
|
import com.ghy.order.service.IOrderCallRecordService;
|
||||||
import com.ghy.order.service.OrderDetailService;
|
import com.ghy.order.service.OrderDetailService;
|
||||||
import com.ghy.order.service.OrderMasterService;
|
import com.ghy.order.service.OrderMasterService;
|
||||||
import com.ghy.payment.domain.FinancialDetail;
|
import com.ghy.payment.domain.FinancialDetail;
|
||||||
|
|
@ -79,6 +81,8 @@ public class OrderServiceImpl implements OrderService {
|
||||||
private WorkerService workerService;
|
private WorkerService workerService;
|
||||||
@Autowired
|
@Autowired
|
||||||
private CustomerAddressService customerAddressService;
|
private CustomerAddressService customerAddressService;
|
||||||
|
@Autowired
|
||||||
|
private IOrderCallRecordService orderCallRecordService;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void overTimeOrder(String orderStatus) {
|
public void overTimeOrder(String orderStatus) {
|
||||||
|
|
@ -335,8 +339,12 @@ public class OrderServiceImpl implements OrderService {
|
||||||
if (overTime.before(now)) {
|
if (overTime.before(now)) {
|
||||||
log.info("订单[{}]超时30分钟", order.getId());
|
log.info("订单[{}]超时30分钟", order.getId());
|
||||||
orderDetailService.updateTimeout(order.getId(), 1, 0);
|
orderDetailService.updateTimeout(order.getId(), 1, 0);
|
||||||
|
// 判断是否约单
|
||||||
|
OrderCallRecord param = new OrderCallRecord();
|
||||||
|
param.setOrderId(order.getId());
|
||||||
|
List<OrderCallRecord> list = orderCallRecordService.selectOrderCallRecordList(param);
|
||||||
// 超时预约通知
|
// 超时预约通知
|
||||||
if("01".equals(order.getIsCall())){
|
if(CollectionUtil.isEmpty(list)){
|
||||||
// 通知师傅新订单
|
// 通知师傅新订单
|
||||||
try {
|
try {
|
||||||
// 推送公众号通知数据。
|
// 推送公众号通知数据。
|
||||||
|
|
@ -359,7 +367,7 @@ public class OrderServiceImpl implements OrderService {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// 超时未排单
|
// 超时未排单
|
||||||
if("02".equals(order.getIsCall())){
|
if(CollectionUtil.isNotEmpty(list)){
|
||||||
// 通知师傅新订单
|
// 通知师傅新订单
|
||||||
try {
|
try {
|
||||||
// 推送公众号通知数据。
|
// 推送公众号通知数据。
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue