Merge branch 'dev_bid' into test6.9.13

@@ -398,6 +398,8 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
             OrderStatus targetStatus;
             switch (expectStatus) {
                 case WAITING_PAY_DEPOSIT:
+                    targetStatus = OrderStatus.BUYER_CANCEL_BEFORE_DEPOSIT_PAY;
+                    break;
                 case WAITING_PAY:
                     targetStatus = OrderStatus.BUYER_CANCEL_TIMEOUT;
                     break;
@@ -408,7 +410,6 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
 
             }
             doCancelBidByAuto(buyerOrder, orderRequest.getOrderCancelEvent(), expectStatus, targetStatus);
-
         } else {
             doCancelByAuto(orderRequest, node);
         }

@@ -37,7 +37,7 @@ public class BuyerOrderWaitingPayDepositCancelChanger extends AbstractBuyerOrder
     public boolean isSupport(RequestedStatusChangeBuyerOrder statusChangeBuyerOrder) {
         OrderStatus sourceStatus = statusChangeBuyerOrder.getSourceStatus();
         OrderStatus targetStatus = statusChangeBuyerOrder.getTargetStatus();
-        return sourceStatus == WAITING_PAY_DEPOSIT && targetStatus == BUYER_CANCEL_TIMEOUT ;
+        return sourceStatus == WAITING_PAY_DEPOSIT && targetStatus == BUYER_CANCEL_BEFORE_DEPOSIT_PAY ;
     }
 
     private void processIfExistChangePriceRecord(long orderCode, Operator operator) {