|
|
@@ -201,13 +201,10 @@ public class WashOrderServiceImpl extends MyBaseServiceImpl<WashOrderMapper, Was
|
|
|
}
|
|
|
|
|
|
// 尝试通过 RRpc 发送关闭命令
|
|
|
- boolean sent = sendCloseOrderWithRetry(order.getProductKey(), order.getDeviceName(), order.getOrderId(), 1);
|
|
|
- if (sent) {
|
|
|
- return;
|
|
|
- }
|
|
|
+ sendCloseOrderWithRetry(order.getProductKey(), order.getDeviceName(), order.getOrderId(), 1);
|
|
|
|
|
|
- // RRpc 失败,主动查询设备订单状态
|
|
|
- log.warn("订单 {} 关闭命令发送失败,尝试主动查询设备状态", order.getOrderId());
|
|
|
+ // 查询设备订单状态进行结算
|
|
|
+ log.info("订单 {} 已发送关闭命令,查询设备订单状态进行结算", order.getOrderId());
|
|
|
try {
|
|
|
OrderInfo orderInfo = awoaraService.queryOrder(order.getProductKey(), order.getDeviceName(), order.getOrderId());
|
|
|
if (orderInfo != null && orderInfo.getClose_type() != null && !orderInfo.getClose_type().isEmpty()) {
|