求购订单 取消提示

@@ -3,6 +3,7 @@ package com.yohoufo.order.service.impl;
 import com.yoho.error.ServiceError;
 import com.yoho.error.exception.ServiceException;
 import com.yohobuy.ufo.model.order.common.OrderStatus;
+import com.yohobuy.ufo.model.order.constants.ConfirmDesc;
 import com.yohobuy.ufo.model.order.resp.OrderCancelComputeResult;
 import com.yohobuy.ufo.model.order.resp.OrderDetailInfo;
 import com.yohobuy.ufo.model.order.resp.OrderListInfo;
@@ -109,6 +110,14 @@ public class BuyerOrderViewService implements IOrderListService, IOrderDetailSer
         BuyerPenaltyCalResult bpcr = null;
         OrderCancelComputeResult occr = null;
         switch (expectStatus){
+            case WAITING_PAY_DEPOSIT:
+                occr = OrderCancelComputeResult.builder()
+                        .confirmDesc(ConfirmDesc.Buyer.CANCEL_WHEN_WAITING_PAY_DEPOSIT).build();
+                break;
+            case BIDING:
+                occr = OrderCancelComputeResult.builder()
+                        .confirmDesc(ConfirmDesc.Buyer.CANCEL_WHEN_BIDING).build();
+                break;
             case WAITING_PAY:
                 if (buyerOrder.isBidOrder()) {
                     //求购订单取消需要赔付定金
@@ -119,7 +128,7 @@ public class BuyerOrderViewService implements IOrderListService, IOrderDetailSer
                     occr = bpcr2occr(bpcr);
                     occr.setNeedPenalty(true);
                 } else {
-                    targetStatus = OrderStatus.BUYER_CANCEL_BEFORE_PAY;
+                    //targetStatus = OrderStatus.BUYER_CANCEL_BEFORE_PAY;
                     occr = OrderCancelComputeResult.builder()
                             .confirmDesc("确定取消订单？").build();
                 }