|
@@ -510,16 +510,6 @@ public class TbOrderService extends ServiceImpl<TbOrderMapper, TbOrder> implemen
|
|
|
} else if (1 == SXB010Status) {//扣款成功
|
|
|
tbOrder.setSxb010Status(1)
|
|
|
.setSxb010StatusTime(new Date());
|
|
|
-
|
|
|
- /*tbOrder.setPeopleConfirmTime(new Date())
|
|
|
- .setPeopleConfirmStatus(ConfirmStatus.CONFIRM_STATUS_ONE.getCode())
|
|
|
- .setUpdateTime(new Date());*/
|
|
|
- if ("1".equals(tbOrder.getDeclareType())) {
|
|
|
- // TODO: 2023/8/29 调用航通009接口,发送信息
|
|
|
- sendConfirmMsgToHt(tbOrder);
|
|
|
- //当declareType为边民时,不需要走后续两个确认,订单状态改为已完成
|
|
|
- //tbOrder.setFinishStatus(FinishStatus.FINISH_STATUS_ONE.getCode());
|
|
|
- }
|
|
|
}
|
|
|
|
|
|
return super.updateById(tbOrder);
|
|
@@ -576,8 +566,7 @@ public class TbOrderService extends ServiceImpl<TbOrderMapper, TbOrder> implemen
|
|
|
wrapper.eq(TbOrder::getId, orderId);
|
|
|
boolean result = update(wrapper);
|
|
|
|
|
|
- if (result && !"1".equals(tbOrder.getDeclareType())
|
|
|
- && tbOrder.getPeopleConfirmStatus() == 1 && tbOrder.getCooperEntrustStatus() == 1) {
|
|
|
+ if (result && tbOrder.getPeopleConfirmStatus() == 1) {
|
|
|
// TODO: 2023/8/29 调用航通009接口,发送信息
|
|
|
sendConfirmMsgToHt(tbOrder);
|
|
|
}
|