ufo / yohoufo-fore · Commits

Go to a project

Authored by wujiexiang
Commit 45813c357ad511016c796f21082f664434f0cefb 2 parents 8f2d8a72 9e7361ec

Merge branch 'dev_bid' into test6.9.13

Inline Side-by-side
Showing 7 changed files with 136 additions and 31 deletions
@@ -137,7 +137,8 @@ public class ActionStatusHold { @@ -137,7 +137,8 @@ public class ActionStatusHold {
137 SellerOrderStatus.HAS_PAYED.getCode(), 137 SellerOrderStatus.HAS_PAYED.getCode(),
138 // 支付成功回调超时，但已经超时取消了，这种场景可以退款 138 // 支付成功回调超时，但已经超时取消了，这种场景可以退款
139 SellerOrderStatus.TIMEOUT_CANCEL.getCode(), 139 SellerOrderStatus.TIMEOUT_CANCEL.getCode(),
140 - SellerOrderStatus.SELf_CANCEL_PAY.getCode()); 140 + SellerOrderStatus.SELf_CANCEL_PAY.getCode(),
  141 + SellerOrderStatus.BUYER_BID_CANCEL_PAY_AFTER_BIND.getCode());
141 } 142 }
142 // 143 //
143 static List<Integer> CanCancelStatus; 144 static List<Integer> CanCancelStatus;
@@ -29,7 +29,6 @@ import com.yohoufo.order.service.IExpressInfoService; @@ -29,7 +29,6 @@ import com.yohoufo.order.service.IExpressInfoService;
29 import com.yohoufo.order.service.IOrderDetailService; 29 import com.yohoufo.order.service.IOrderDetailService;
30 import com.yohoufo.order.service.seller.support.SkupTypeCodeSupport; 30 import com.yohoufo.order.service.seller.support.SkupTypeCodeSupport;
31 import com.yohoufo.order.service.support.BuyerOrderMetaMapperSupport; 31 import com.yohoufo.order.service.support.BuyerOrderMetaMapperSupport;
32 -import com.yohoufo.order.service.support.OrderStatusDetailItemFactory;  
33 import com.yohoufo.order.utils.*; 32 import com.yohoufo.order.utils.*;
34 import lombok.Builder; 33 import lombok.Builder;
35 import org.apache.commons.collections.CollectionUtils; 34 import org.apache.commons.collections.CollectionUtils;
@@ -16,10 +16,9 @@ import com.yohoufo.order.constants.ViewType; @@ -16,10 +16,9 @@ import com.yohoufo.order.constants.ViewType;
16 import com.yohoufo.order.model.bo.DetailItem; 16 import com.yohoufo.order.model.bo.DetailItem;
17 import com.yohoufo.order.model.request.OrderListRequest; 17 import com.yohoufo.order.model.request.OrderListRequest;
18 import com.yohoufo.order.service.IOrderListService; 18 import com.yohoufo.order.service.IOrderListService;
19 -import com.yohoufo.order.service.support.OrderStatusDetailItemFactory; 19 +import com.yohoufo.order.service.support.BuyerOrderStatusDetailItemFactory;
20 import com.yohoufo.order.utils.BuyerOrderUtils; 20 import com.yohoufo.order.utils.BuyerOrderUtils;
21 import com.yohoufo.order.utils.OrderAssist; 21 import com.yohoufo.order.utils.OrderAssist;
22 -import com.yohoufo.order.utils.SellerGoodsHelper;  
23 import org.apache.commons.collections.CollectionUtils; 22 import org.apache.commons.collections.CollectionUtils;
24 import org.apache.commons.lang3.StringUtils; 23 import org.apache.commons.lang3.StringUtils;
25 import org.slf4j.Logger; 24 import org.slf4j.Logger;
@@ -62,7 +61,7 @@ public abstract class AbsOrderListService extends AbsOrderViewService implements @@ -62,7 +61,7 @@ public abstract class AbsOrderListService extends AbsOrderViewService implements
62 SellerOrderMapper sellerOrderMapper; 61 SellerOrderMapper sellerOrderMapper;
63 62
64 @Autowired 63 @Autowired
65 - OrderStatusDetailItemFactory orderStatusDetailItemFactory; 64 + BuyerOrderStatusDetailItemFactory orderStatusDetailItemFactory;
66 65
67 /** 66 /**
68 * 获取鉴定视频 67 * 获取鉴定视频
@@ -12,7 +12,7 @@ import com.yohoufo.order.model.bo.DetailItem; @@ -12,7 +12,7 @@ import com.yohoufo.order.model.bo.DetailItem;
12 import com.yohoufo.order.model.dto.BuyerPenaltyCalResult; 12 import com.yohoufo.order.model.dto.BuyerPenaltyCalResult;
13 import com.yohoufo.order.service.handler.BuyerCancelCompensateComputeHandler; 13 import com.yohoufo.order.service.handler.BuyerCancelCompensateComputeHandler;
14 import com.yohoufo.order.service.support.BuyerOrderButtonFormatFunction; 14 import com.yohoufo.order.service.support.BuyerOrderButtonFormatFunction;
15 -import com.yohoufo.order.service.support.OrderStatusDetailItemFactory; 15 +import com.yohoufo.order.service.support.BuyerOrderStatusDetailItemFactory;
16 import com.yohoufo.order.service.wrapper.OrderTimeoutContext; 16 import com.yohoufo.order.service.wrapper.OrderTimeoutContext;
17 import com.yohoufo.order.service.wrapper.OrderTimeoutFactory; 17 import com.yohoufo.order.service.wrapper.OrderTimeoutFactory;
18 import com.yohoufo.order.service.wrapper.TimeoutWrapper; 18 import com.yohoufo.order.service.wrapper.TimeoutWrapper;
@@ -42,7 +42,7 @@ public abstract class AbsOrderViewService { @@ -42,7 +42,7 @@ public abstract class AbsOrderViewService {
42 TradeBillsService tradeBillsService; 42 TradeBillsService tradeBillsService;
43 43
44 @Autowired 44 @Autowired
45 - protected OrderStatusDetailItemFactory orderStatusDetailItemFactory; 45 + protected BuyerOrderStatusDetailItemFactory orderStatusDetailItemFactory;
46 46
47 public abstract Logger getLogger(); 47 public abstract Logger getLogger();
48 48
@@ -401,7 +401,7 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService { @@ -401,7 +401,7 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
401 targetStatus = OrderStatus.BUYER_CANCEL_BEFORE_DEPOSIT_PAY; 401 targetStatus = OrderStatus.BUYER_CANCEL_BEFORE_DEPOSIT_PAY;
402 break; 402 break;
403 case WAITING_PAY: 403 case WAITING_PAY:
404 - targetStatus = OrderStatus.BUYER_CANCEL_TIMEOUT; 404 + targetStatus = OrderStatus.BUYER_BID_CANCEL_PAY;;
405 break; 405 break;
406 default: 406 default:
407 logger.warn("in buyer auto cancel fail uid {} order code {} expectStatus {}", 407 logger.warn("in buyer auto cancel fail uid {} order code {} expectStatus {}",
@@ -488,8 +488,8 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService { @@ -488,8 +488,8 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
488 buyerOrderStateChangers.selectOneToChange(buyerOrder, OrderStatus.BIDING, targetStatus); 488 buyerOrderStateChangers.selectOneToChange(buyerOrder, OrderStatus.BIDING, targetStatus);
489 break; 489 break;
490 case WAITING_PAY: 490 case WAITING_PAY:
491 - targetStatus = OrderStatus.BUYER_CANCEL_BEFORE_PAY;  
492 if (buyerOrder.isBidOrder()) { 491 if (buyerOrder.isBidOrder()) {
  492 + targetStatus = OrderStatus.BUYER_BID_CANCEL_PAY;
493 RequestedCancelEventStatusChangeBuyerOrder statusChangeBuyerOrder = new RequestedCancelEventStatusChangeBuyerOrder(buyerOrder, 493 RequestedCancelEventStatusChangeBuyerOrder statusChangeBuyerOrder = new RequestedCancelEventStatusChangeBuyerOrder(buyerOrder,
494 expectStatus, 494 expectStatus,
495 targetStatus, 495 targetStatus,
@@ -497,6 +497,7 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService { @@ -497,6 +497,7 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
497 orderRequest.getOrderCancelEvent()); 497 orderRequest.getOrderCancelEvent());
498 buyerOrderStateChangers.selectOneToChange(statusChangeBuyerOrder); 498 buyerOrderStateChangers.selectOneToChange(statusChangeBuyerOrder);
499 } else { 499 } else {
  500 + targetStatus = OrderStatus.BUYER_CANCEL_BEFORE_PAY;
500 cancelBeforePaid(orderRequest, node, expectStatus, targetStatus); 501 cancelBeforePaid(orderRequest, node, expectStatus, targetStatus);
501 //取消事件 502 //取消事件
502 orderChangeListenerContainer.fireAsyncEvent(new BuyerOrderChangeEvent(buyerOrder, BuyerOrderChangeEvent.BizCase.CANCEL_BYBUYER, targetStatus)); 503 orderChangeListenerContainer.fireAsyncEvent(new BuyerOrderChangeEvent(buyerOrder, BuyerOrderChangeEvent.BizCase.CANCEL_BYBUYER, targetStatus));
1 package com.yohoufo.order.service.impl.statechange; 1 package com.yohoufo.order.service.impl.statechange;
2 2
  3 +import com.google.common.collect.Lists;
3 import com.yoho.error.ServiceError; 4 import com.yoho.error.ServiceError;
4 import com.yoho.error.exception.ServiceException; 5 import com.yoho.error.exception.ServiceException;
  6 +import com.yohobuy.ufo.model.order.bo.MerchantOrderAttachInfo;
5 import com.yohobuy.ufo.model.order.common.OrderStatus; 7 import com.yohobuy.ufo.model.order.common.OrderStatus;
6 import com.yohobuy.ufo.model.order.common.Payment; 8 import com.yohobuy.ufo.model.order.common.Payment;
  9 +import com.yohobuy.ufo.model.order.common.SellerOrderStatus;
  10 +import com.yohobuy.ufo.model.order.common.SkupStatus;
7 import com.yohoufo.common.alarm.EventBusPublisher; 11 import com.yohoufo.common.alarm.EventBusPublisher;
  12 +import com.yohoufo.common.utils.DateUtil;
  13 +import com.yohoufo.dal.order.SellerOrderMapper;
8 import com.yohoufo.dal.order.model.*; 14 import com.yohoufo.dal.order.model.*;
  15 +import com.yohoufo.order.common.RefundCase;
9 import com.yohoufo.order.common.TransferCase; 16 import com.yohoufo.order.common.TransferCase;
  17 +import com.yohoufo.order.event.BillLogEvent;
10 import com.yohoufo.order.event.PayConfirmEvent; 18 import com.yohoufo.order.event.PayConfirmEvent;
11 import com.yohoufo.order.model.PayQueryBo; 19 import com.yohoufo.order.model.PayQueryBo;
12 import com.yohoufo.order.model.RequestedCancelEventStatusChangeBuyerOrder; 20 import com.yohoufo.order.model.RequestedCancelEventStatusChangeBuyerOrder;
13 import com.yohoufo.order.model.RequestedStatusChangeBuyerOrder; 21 import com.yohoufo.order.model.RequestedStatusChangeBuyerOrder;
  22 +import com.yohoufo.order.model.request.PaymentRequest;
14 import com.yohoufo.order.model.request.TranseferCellNode; 23 import com.yohoufo.order.model.request.TranseferCellNode;
15 import com.yohoufo.order.model.request.TransferMoneyRequest; 24 import com.yohoufo.order.model.request.TransferMoneyRequest;
16 import com.yohoufo.order.service.AbstractBuyerOrderStateChanger; 25 import com.yohoufo.order.service.AbstractBuyerOrderStateChanger;
  26 +import com.yohoufo.order.service.handler.RefundEarnestMoneyHandler;
  27 +import com.yohoufo.order.service.impl.PayRefundService;
17 import com.yohoufo.order.service.impl.TransferService; 28 import com.yohoufo.order.service.impl.TransferService;
18 import com.yohoufo.order.service.listener.BuyerOrderChangeEvent; 29 import com.yohoufo.order.service.listener.BuyerOrderChangeEvent;
19 import com.yohoufo.order.service.pay.AbstractPayService; 30 import com.yohoufo.order.service.pay.AbstractPayService;
  31 +import com.yohoufo.order.service.seller.setting.SellerService;
  32 +import com.yohoufo.order.utils.PaymentHelper;
20 import org.springframework.beans.factory.annotation.Autowired; 33 import org.springframework.beans.factory.annotation.Autowired;
21 import org.springframework.stereotype.Service; 34 import org.springframework.stereotype.Service;
22 35
23 import java.math.BigDecimal; 36 import java.math.BigDecimal;
24 -import java.util.ArrayList; 37 +import java.util.Arrays;
25 import java.util.Collection; 38 import java.util.Collection;
26 -import java.util.List; 39 +import java.util.concurrent.atomic.AtomicReference;
27 40
28 import static com.yohobuy.ufo.model.order.common.OrderStatus.*; 41 import static com.yohobuy.ufo.model.order.common.OrderStatus.*;
29 42
@@ -38,6 +51,15 @@ public class BuyerOrderWaitingPayCancelChanger extends AbstractBuyerOrderStateCh @@ -38,6 +51,15 @@ public class BuyerOrderWaitingPayCancelChanger extends AbstractBuyerOrderStateCh
38 @Autowired 51 @Autowired
39 private TransferService transferService; 52 private TransferService transferService;
40 53
  54 + @Autowired
  55 + private SellerOrderMapper sellerOrderMapper;
  56 +
  57 + @Autowired
  58 + private SellerService sellerService;
  59 +
  60 + @Autowired
  61 + private PayRefundService payRefundService;
  62 +
41 @Override 63 @Override
42 protected boolean beforeChange(RequestedCancelEventStatusChangeBuyerOrder statusChangeBuyerOrder) { 64 protected boolean beforeChange(RequestedCancelEventStatusChangeBuyerOrder statusChangeBuyerOrder) {
43 BuyerOrder buyerOrder = statusChangeBuyerOrder.getBuyerOrder(); 65 BuyerOrder buyerOrder = statusChangeBuyerOrder.getBuyerOrder();
@@ -84,22 +106,36 @@ public class BuyerOrderWaitingPayCancelChanger extends AbstractBuyerOrderStateCh @@ -84,22 +106,36 @@ public class BuyerOrderWaitingPayCancelChanger extends AbstractBuyerOrderStateCh
84 @Override 106 @Override
85 protected Collection<Statement> afterStatements(RequestedCancelEventStatusChangeBuyerOrder statusChangeBuyerOrder) { 107 protected Collection<Statement> afterStatements(RequestedCancelEventStatusChangeBuyerOrder statusChangeBuyerOrder) {
86 BuyerOrder buyerOrder = statusChangeBuyerOrder.getBuyerOrder(); 108 BuyerOrder buyerOrder = statusChangeBuyerOrder.getBuyerOrder();
87 - List<Statement> statements = new ArrayList<>();  
88 - if (buyerOrder.isBidOrder()) {  
89 - statements.add(() -> bidOrderAfterStatement(buyerOrder));  
90 - statements.add(() -> cacheCleaner.cleanSellerAndBuyerOrderDetailAndList(buyerOrder.getSellerUid(), buyerOrder.getUid(), buyerOrder.getOrderCode()));  
91 - } else {  
92 - //nothing 109 +
  110 + if (!buyerOrder.isBidOrder()) {
  111 + logger.warn("[{}] is not bid order", buyerOrder.getOrderCode());
  112 + return Lists.newArrayList();
93 } 113 }
94 - return statements; 114 +
  115 + final AtomicReference<Integer> skupRefer = new AtomicReference();
  116 + skupRefer.get();
  117 + return Lists.newArrayList(
  118 + () -> transferDepositToSeller(buyerOrder),
  119 + () -> skupRefer.set(getSkup(buyerOrder)),
  120 + () -> cancelSellerOrder(skupRefer.get()),
  121 + () -> refundSellerEarnestMoney(skupRefer.get(), buyerOrder, statusChangeBuyerOrder.getTargetStatus()),
  122 + () -> cacheCleaner.cleanSellerAndBuyerOrderDetailAndList(buyerOrder.getSellerUid(), buyerOrder.getUid(), buyerOrder.getOrderCode())
  123 + );
  124 + }
  125 +
  126 +
  127 + private int getSkup(BuyerOrder buyerOrder) {
  128 + BuyerOrderGoods buyerOrderGoods = buyerOrderGoodsMapper.selectByOrderCode(buyerOrder.getUid(), buyerOrder.getOrderCode());
  129 + int skup = buyerOrderGoods.getSkup();
  130 + return skup;
95 } 131 }
96 132
97 /** 133 /**
98 - * 求购订单 134 + * 定金赔偿给卖家
99 * 135 *
100 * @param buyerOrder 136 * @param buyerOrder
101 */ 137 */
102 - private void bidOrderAfterStatement(BuyerOrder buyerOrder) { 138 + private void transferDepositToSeller(BuyerOrder buyerOrder) {
103 //定金金额 139 //定金金额
104 double depositAmount = getDepositAmount(buyerOrder); 140 double depositAmount = getDepositAmount(buyerOrder);
105 // //定金赔偿给卖家 141 // //定金赔偿给卖家
@@ -113,6 +149,74 @@ public class BuyerOrderWaitingPayCancelChanger extends AbstractBuyerOrderStateCh @@ -113,6 +149,74 @@ public class BuyerOrderWaitingPayCancelChanger extends AbstractBuyerOrderStateCh
113 } 149 }
114 150
115 /** 151 /**
  152 + * 取消seller order
  153 + *
  154 + * @param skup
  155 + */
  156 + private void cancelSellerOrder(int skup) {
  157 + logger.info("cancel seller order by skup:{}", skup);
  158 + SellerOrderGoods targetGoods = new SellerOrderGoods();
  159 + targetGoods.setId(skup);
  160 + targetGoods.setStatus(SkupStatus.BUYER_BID_CANCEL_PAY_AFTER_BIND.getCode());
  161 + targetGoods.setExceptStatus(SkupStatus.SELL_OUT.getCode());
  162 + boolean result = sellerOrderGoodsMapper.updateStatusBySkpu(targetGoods) > 0;
  163 + logger.info("seller order goods was updated by skup:{},result:{}", skup, result);
  164 + SellerOrder soc = new SellerOrder();
  165 + soc.setStatus(SellerOrderStatus.BUYER_BID_CANCEL_PAY_AFTER_BIND.getCode());
  166 + soc.setUpdateTime(DateUtil.getCurrentTimeSecond());
  167 + result = sellerOrderMapper.updateBySkups(soc, Arrays.asList(skup)) > 0;
  168 + logger.info("seller order goods updated by skup:{},result:{}", skup, result);
  169 + }
  170 +
  171 + /**
  172 + * 退还卖家的保证金
  173 + * @param skup
  174 + * @param buyerOrder
  175 + * @param targetOrderStatus
  176 + */
  177 + private void refundSellerEarnestMoney(int skup, BuyerOrder buyerOrder, OrderStatus targetOrderStatus) {
  178 + int buyerUid = buyerOrder.getUid();
  179 + long orderCode = buyerOrder.getOrderCode();
  180 + SellerOrder sellerOrder = sellerOrderMapper.selectBySkup(skup);
  181 + int sellerUid = sellerOrder.getUid();
  182 + long sellerOrderCode = sellerOrder.getOrderCode();
  183 + BigDecimal earnestMoney = sellerOrder.getEarnestMoney();
  184 + Integer payment = sellerOrder.getPayment() == null ? 0 : sellerOrder.getPayment();
  185 + PaymentRequest refundReqOfSeller = PaymentRequest.builder().uid(sellerUid).refundCase(RefundCase.SELLER_EARNEST_MONEY)
  186 + .orderCode(sellerOrderCode).refundAmount(earnestMoney.doubleValue())
  187 + .payment(payment)
  188 + .build();
  189 + boolean sellerIsSuper = sellerService.isSuperEntrySeller(sellerUid);
  190 + refundReqOfSeller.setSuper(sellerIsSuper);
  191 + if (!sellerIsSuper && PaymentHelper.isWallet(payment)) {
  192 +
  193 + MerchantOrderAttachInfo moai = MerchantOrderAttachInfo.builder().uid(sellerUid)
  194 + .orderCode(sellerOrderCode).skup(skup).earnestMoney(sellerOrder.getEarnestMoney())
  195 + .type(SellerWalletDetail.Type.BUYER_CANCEL_NO_DELIVERY.getValue()).build();
  196 + refundReqOfSeller.setRefundattch(moai);
  197 + }
  198 +
  199 + BillLogEvent.BillLogEventBuilder bleb = BillLogEvent.builder()
  200 + .buyerUid(buyerUid).sellerUid(sellerUid).orderCode(sellerOrder.getOrderCode())
  201 + .payType(sellerOrder.getPayment()).refundCase(RefundCase.SELLER_EARNEST_MONEY)
  202 + .skup(skup);
  203 + logger.info("in refundSellerEarnestMoney call begin payRefundService.refund seller, buyerUid {}, orderCode {}, skup {} refundReqOfSeller {}",
  204 + buyerUid, orderCode, skup, refundReqOfSeller);
  205 + boolean result = new RefundEarnestMoneyHandler()
  206 + .loadRefundAction(payRefundService::refund)
  207 + .loadBillLogEventBuilder(bleb)
  208 + .loadPaymentRequest(refundReqOfSeller)
  209 + .loadBuyer(buyerUid, orderCode, targetOrderStatus)
  210 + .loadSeller(sellerUid, sellerIsSuper, null, null)
  211 + .loadLogger(logger)
  212 + .refund();
  213 +
  214 + logger.info("in refundSellerEarnestMoney call after payRefundService.refund seller, buyerUid {}, orderCode {}, skup {} result {}",
  215 + buyerUid, orderCode, skup, result);
  216 + }
  217 +
  218 +
  219 + /**
116 * @param buyerUid 220 * @param buyerUid
117 * @param buyerOrderCode 221 * @param buyerOrderCode
118 * @param sellerUid 222 * @param sellerUid
@@ -143,6 +247,6 @@ public class BuyerOrderWaitingPayCancelChanger extends AbstractBuyerOrderStateCh @@ -143,6 +247,6 @@ public class BuyerOrderWaitingPayCancelChanger extends AbstractBuyerOrderStateCh
143 OrderStatus targetStatus = statusChangeBuyerOrder.getTargetStatus(); 247 OrderStatus targetStatus = statusChangeBuyerOrder.getTargetStatus();
144 return statusChangeBuyerOrder instanceof RequestedCancelEventStatusChangeBuyerOrder 248 return statusChangeBuyerOrder instanceof RequestedCancelEventStatusChangeBuyerOrder
145 && sourceStatus == WAITING_PAY 249 && sourceStatus == WAITING_PAY
146 - && (targetStatus == BUYER_CANCEL_BEFORE_PAY || targetStatus == BUYER_CANCEL_TIMEOUT); 250 + && (targetStatus == BUYER_BID_CANCEL_PAY || targetStatus == BUYER_BID_CANCEL_PAY_TIMEOUT);
147 } 251 }
148 } 252 }
@@ -13,7 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired; @@ -13,7 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
13 import org.springframework.stereotype.Component; 13 import org.springframework.stereotype.Component;
14 14
15 @Component 15 @Component
16 -public class OrderStatusDetailItemFactory { 16 +public class BuyerOrderStatusDetailItemFactory {
17 17
18 @Autowired 18 @Autowired
19 private BuyerOrderMetaMapperSupport buyerOrderMetaMapperSupport; 19 private BuyerOrderMetaMapperSupport buyerOrderMetaMapperSupport;
@@ -47,11 +47,11 @@ public class OrderStatusDetailItemFactory { @@ -47,11 +47,11 @@ public class OrderStatusDetailItemFactory {
47 case WAITING_PAY: 47 case WAITING_PAY:
48 detailItem = new WaitingPayItem(createTime, tabType); 48 detailItem = new WaitingPayItem(createTime, tabType);
49 break; 49 break;
50 - case BUYER_CANCEL_BEFORE_PAY:  
51 - detailItem = new CancelBeforePayItem(tabType); 50 + case BUYER_BID_CANCEL_PAY:
  51 + detailItem = new BuyerBidCancelPayItem(tabType);
52 break; 52 break;
53 - case BUYER_CANCEL_TIMEOUT:  
54 - detailItem = new CancelTimeOutBeforePayItem(tabType); 53 + case BUYER_BID_CANCEL_PAY_TIMEOUT:
  54 + detailItem = new BuyerBidCancelPayTimeOutItem(tabType);
55 break; 55 break;
56 default: 56 default:
57 break; 57 break;
@@ -90,6 +90,7 @@ public class OrderStatusDetailItemFactory { @@ -90,6 +90,7 @@ public class OrderStatusDetailItemFactory {
90 90
91 public final static String CANCEL_TIMEOUT_BEFORE_PAY_SELLER_DESC = "买家付款超时，系统取消订单，您已获得买家定金赔偿"; 91 public final static String CANCEL_TIMEOUT_BEFORE_PAY_SELLER_DESC = "买家付款超时，系统取消订单，您已获得买家定金赔偿";
92 92
  93 + //创建时间 秒
93 protected int createTime; 94 protected int createTime;
94 //操作限制 单位秒 95 //操作限制 单位秒
95 private int timeOutLimit; 96 private int timeOutLimit;
@@ -175,15 +176,15 @@ public class OrderStatusDetailItemFactory { @@ -175,15 +176,15 @@ public class OrderStatusDetailItemFactory {
175 case BUY: 176 case BUY:
176 return WAITING_PAY_BUYER_DESC; 177 return WAITING_PAY_BUYER_DESC;
177 case SELL: 178 case SELL:
178 - return String.format(WAITING_PAY_SELLER_DESC, DelayTime.BUYER_BID_ORDER_WAITING_PAY); 179 + return String.format(WAITING_PAY_SELLER_DESC, DelayTime.BUYER_BID_ORDER_WAITING_PAY / 60);
179 default: 180 default:
180 return EMPTY_DESC; 181 return EMPTY_DESC;
181 } 182 }
182 } 183 }
183 } 184 }
184 185
185 - private class CancelBeforePayItem extends AbstractOrderDetailItem {  
186 - public CancelBeforePayItem(TabType tabType) { 186 + private class BuyerBidCancelPayItem extends AbstractOrderDetailItem {
  187 + public BuyerBidCancelPayItem(TabType tabType) {
187 super(tabType); 188 super(tabType);
188 } 189 }
189 190
@@ -200,8 +201,8 @@ public class OrderStatusDetailItemFactory { @@ -200,8 +201,8 @@ public class OrderStatusDetailItemFactory {
200 } 201 }
201 } 202 }
202 203
203 - private class CancelTimeOutBeforePayItem extends AbstractOrderDetailItem {  
204 - public CancelTimeOutBeforePayItem(TabType tabType) { 204 + private class BuyerBidCancelPayTimeOutItem extends AbstractOrderDetailItem {
  205 + public BuyerBidCancelPayTimeOutItem(TabType tabType) {
205 super(tabType); 206 super(tabType);
206 } 207 }
207 208