Merge branch 'dev_order' into test6.8.2

@@ -144,6 +144,7 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
             case WAITING_PAY:
                 targetStatus = OrderStatus.BUYER_CANCEL_BEFORE_PAY;
                 cancelBeforePaid(orderRequest, node, expectStatus, targetStatus);
+                buyerOrderCancelService.refundCouponIfNeed(buyerOrder.getUid(), buyerOrder.getOrderCode());
                 break;
             case HAS_PAYED:
                 BuyerOrderGoods bog = buyerOrderGoodsMapper.selectByOrderCode(orderRequest.getUid(),

@@ -287,7 +287,7 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I
 
         // 待付款时 或待发货，剩余时间
 
-        int leftTime = getPayLeftTime(TabType.SELL, skupStatus.getCode(), order.getCreateTime());
+        Integer leftTime = getPayLeftTime(TabType.SELL, skupStatus.getCode(), order.getCreateTime());
         statusDetail.setLeftTime(leftTime);
 
         return statusDetail;