ufo / yohoufo-fore · Commits

Go to a project

Authored by chenchao
Commit b7b7daeb41c143b0baa921d72ab83f8c25b0b52c 2 parents e65de5ba b457d1dd

Merge branch 'dev_order' into test6.8.2

Inline Side-by-side
Showing 2 changed files with 2 additions and 1 deletions
@@ -144,6 +144,7 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService { @@ -144,6 +144,7 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
144 case WAITING_PAY: 144 case WAITING_PAY:
145 targetStatus = OrderStatus.BUYER_CANCEL_BEFORE_PAY; 145 targetStatus = OrderStatus.BUYER_CANCEL_BEFORE_PAY;
146 cancelBeforePaid(orderRequest, node, expectStatus, targetStatus); 146 cancelBeforePaid(orderRequest, node, expectStatus, targetStatus);
  147 + buyerOrderCancelService.refundCouponIfNeed(buyerOrder.getUid(), buyerOrder.getOrderCode());
147 break; 148 break;
148 case HAS_PAYED: 149 case HAS_PAYED:
149 BuyerOrderGoods bog = buyerOrderGoodsMapper.selectByOrderCode(orderRequest.getUid(), 150 BuyerOrderGoods bog = buyerOrderGoodsMapper.selectByOrderCode(orderRequest.getUid(),
@@ -287,7 +287,7 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I @@ -287,7 +287,7 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I
287 287
288 // 待付款时 或待发货，剩余时间 288 // 待付款时 或待发货，剩余时间
289 289
290 - int leftTime = getPayLeftTime(TabType.SELL, skupStatus.getCode(), order.getCreateTime()); 290 + Integer leftTime = getPayLeftTime(TabType.SELL, skupStatus.getCode(), order.getCreateTime());
291 statusDetail.setLeftTime(leftTime); 291 statusDetail.setLeftTime(leftTime);
292 292
293 return statusDetail; 293 return statusDetail;