Merge branch 'dev_order' into test6.8.2

@@ -179,8 +179,8 @@ public class BuyerOrderCancelService {
                     buyerUid, orderCode, skup, transferCase, compensate);
             PayRefundBo prb = null;
             try {
-                SellerOrder sellerOrder = sellerOrderMapper.selectByOrderCode(orderCode);
-                logger.info("in BuyerCancelAfterProcessTask call  sellerOrderMapper.selectByOrderCode, buyerUid {}, orderCode {}, skup {}",
+                SellerOrder sellerOrder = sellerOrderMapper.selectBySkup(skup);
+                logger.info("in BuyerCancelAfterProcessTask call  sellerOrderMapper.selectBySkup, buyerUid {}, orderCode {}, skup {}",
                         buyerUid, orderCode, skup );
                 int sellerUid = sellerOrder.getUid();
                 long sellerOrderCode = sellerOrder.getOrderCode();

@@ -129,7 +129,7 @@ public class BuyerOrderDetailService extends AbsOrderDetailService implements IO
                 .build();
 
         // 待付款时，剩余时间
-        int leftTime = getLeftTime(tabType,buyerOrder.getUid(), buyerOrder.getOrderCode(), orderStatus.getCode(), buyerOrder.getCreateTime());
+        Integer leftTime = getLeftTime(tabType,buyerOrder.getUid(), buyerOrder.getOrderCode(), orderStatus.getCode(), buyerOrder.getCreateTime());
         statusDetail.setLeftTime(leftTime);
         boolean isShowWaitingTime = OrderStatus.WAITING_RECEIVE.getCode() == orderStatus.getCode();
         if(isShowWaitingTime){

@@ -155,8 +155,6 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
                         .expected(expectStatus).target(targetStatus).skup(skup).sellerUid(buyerOrder.getSellerUid())
                         .build();
                 buyerOrderCancelService.cancel(bsde);
-                //退还优惠券
-                buyerOrderCancelService.refundCouponIfNeed(orderRequest.getUid(),orderRequest.getOrderCode());
                 break;
             case SELLER_SEND_OUT:
                 bog = buyerOrderGoodsMapper.selectByOrderCode(orderRequest.getUid(),