|
|
|
@ -217,20 +217,26 @@ public class RecycleOrderController {
|
|
|
|
|
OrderCancel cancel = new OrderCancel();
|
|
|
|
|
cancel.setMessageType(MessageTypeEnum.CANCEL);
|
|
|
|
|
cancel.setAppType(AppTypeEnum.recycler);
|
|
|
|
|
cancel.setReceiveUserId(order.getStaffsId());
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
cancel.setOrderNo(order.getOrderNumber());
|
|
|
|
|
cancel.setOrderStatus(order.getOrderStatus());
|
|
|
|
|
cancel.setCancelOrderTime(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
|
|
|
|
|
cancel.setClientPhone(order.getClientMobile());
|
|
|
|
|
cancel.setClientAddress(addressInfo.getReceiveStreet());
|
|
|
|
|
|
|
|
|
|
try {
|
|
|
|
|
wsService.sendMsgToUser(cancel);
|
|
|
|
|
} catch (IOException e) {
|
|
|
|
|
e.printStackTrace();
|
|
|
|
|
//已接单取消 通知人 未接单取消 则不通知
|
|
|
|
|
if (StrUtil.isNotEmpty(order.getStaffsId())) {
|
|
|
|
|
cancel.setReceiveUserId(order.getStaffsId());
|
|
|
|
|
try {
|
|
|
|
|
wsService.sendMsgToUser(cancel);
|
|
|
|
|
} catch (IOException e) {
|
|
|
|
|
e.printStackTrace();
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
//未接单取消 则不通知
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return CommonResult.success(true);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|