Authored by chenchao

fix auto cancel before paid

@@ -164,8 +164,12 @@ public class SellerDepositOrderService extends AbsGoodsServiceOrderService imple @@ -164,8 +164,12 @@ public class SellerDepositOrderService extends AbsGoodsServiceOrderService imple
164 .orderAttributes(getOrderAttributes()) 164 .orderAttributes(getOrderAttributes())
165 .build(); 165 .build();
166 appraiseOrderCreateService.createSellerDepoistOrder(context); 166 appraiseOrderCreateService.createSellerDepoistOrder(context);
167 - //TODO notice  
168 - 167 + //
  168 + SellerDepositOrderCancelAsyncEvent event = new SellerDepositOrderCancelAsyncEvent(this::handleOrderCancelAsyncEvent);
  169 + event.setUid(req.getUid());
  170 + event.setOrderCode(orderCode);
  171 + EventBusPublisher.publishEvent(event);
  172 + logger.info("submit seller deposit order , SellerDepositOrderCancelAsyncEvent send out, event {}", event);
169 return SellerDepositOrderSubmitResp.builder().orderCode(orderCode).build(); 173 return SellerDepositOrderSubmitResp.builder().orderCode(orderCode).build();
170 } 174 }
171 175
@@ -231,6 +235,7 @@ public class SellerDepositOrderService extends AbsGoodsServiceOrderService imple @@ -231,6 +235,7 @@ public class SellerDepositOrderService extends AbsGoodsServiceOrderService imple
231 } 235 }
232 236
233 public int cancelByTimeout(OrderCancelEvent orderCancelEvent){ 237 public int cancelByTimeout(OrderCancelEvent orderCancelEvent){
  238 + logger.info("in seller deposit order cancelByTimeout orderCancelEvent {}", orderCancelEvent);
234 Long orderCode = orderCancelEvent.getOrderCode(); 239 Long orderCode = orderCancelEvent.getOrderCode();
235 int uid = orderCancelEvent.getUid(); 240 int uid = orderCancelEvent.getUid();
236 if(!serviceOrderProcessor.isGoodsServiceOrder(orderCode)){ 241 if(!serviceOrderProcessor.isGoodsServiceOrder(orderCode)){
@@ -607,11 +612,8 @@ public class SellerDepositOrderService extends AbsGoodsServiceOrderService imple @@ -607,11 +612,8 @@ public class SellerDepositOrderService extends AbsGoodsServiceOrderService imple
607 Integer uid = orderInfo.getUid(); 612 Integer uid = orderInfo.getUid();
608 AppraiseOrderStatus targetOrderStatus = AppraiseOrderStatus.HAS_PAYED; 613 AppraiseOrderStatus targetOrderStatus = AppraiseOrderStatus.HAS_PAYED;
609 inBoxFacade.sellerDepositOrderNotice(orderInfo.getUid(), orderInfo.getOrderCode(), targetOrderStatus); 614 inBoxFacade.sellerDepositOrderNotice(orderInfo.getUid(), orderInfo.getOrderCode(), targetOrderStatus);
610 - SellerDepositOrderCancelAsyncEvent event = new SellerDepositOrderCancelAsyncEvent(this::handleOrderCancelAsyncEvent);  
611 - event.setUid(uid);  
612 - event.setOrderCode(orderCode);  
613 - EventBusPublisher.publishEvent(event);  
614 - logger.info("processAfterPay seller deposit order , SellerDepositOrderCancelAsyncEvent send out, event {}", event); 615 +
  616 +
615 SellerCancelDeliverEvent cancelDeliverEvent = 617 SellerCancelDeliverEvent cancelDeliverEvent =
616 SellerCancelDeliverEvent.builder() 618 SellerCancelDeliverEvent.builder()
617 .uid(orderInfo.getUid()) 619 .uid(orderInfo.getUid())