|
|
@@ -968,11 +968,13 @@ public class UnifyOrderManager {
|
|
|
orderStatusVo.setInsOrdersAccidentalDriving(insOrdersAccidentalDriving);
|
|
|
OrderStatusResultVo orderStatusResultVo = orderStatusService.queryOrderState(orderStatusVo);
|
|
|
log.info("订单状态orderStatusResultVo=[{}]", JSONUtil.toJsonStr(orderStatusResultVo));
|
|
|
-
|
|
|
+ if (orderStatusResultVo == null) {
|
|
|
+ return HttpResult.ok("订单状态已更新");
|
|
|
+ }
|
|
|
// 保存状态查询结果
|
|
|
insOrdersService.orderAfterUpdateOrderStatus(orderStatusVo.getOrder().getOrdersNo(), orderStatusResultVo);
|
|
|
// 保存支付链接
|
|
|
- insOrders.setPayLink(!TextUtils.isEmpty(orderStatusResultVo.getPaymentLink()) ? orderStatusResultVo.getPaymentLink() : insOrders.getPayLink());
|
|
|
+ insOrders.setPayLink((orderStatusResultVo != null && !TextUtils.isEmpty(orderStatusResultVo.getPaymentLink())) ? orderStatusResultVo.getPaymentLink() : insOrders.getPayLink());
|
|
|
insOrdersQrcodeService.updateQrCode(insOrders);
|
|
|
//////////////////////////////////////////新增营销抽奖活动////////////////////////////////////////////////
|
|
|
// 承保(客户)、出单(业务员)
|