ufo / yohoufo-fore · Commits

Go to a project

Authored by chenchao
Commit e65de5ba76fde96e9ac73f948241fe95b7a0b691 2 parents dea97eb6 d4356973

Merge branch 'dev_order' into test6.8.2

Inline Side-by-side
Showing 3 changed files with 3 additions and 5 deletions
@@ -179,8 +179,8 @@ public class BuyerOrderCancelService { @@ -179,8 +179,8 @@ public class BuyerOrderCancelService {
179 buyerUid, orderCode, skup, transferCase, compensate); 179 buyerUid, orderCode, skup, transferCase, compensate);
180 PayRefundBo prb = null; 180 PayRefundBo prb = null;
181 try { 181 try {
182 - SellerOrder sellerOrder = sellerOrderMapper.selectByOrderCode(orderCode);  
183 - logger.info("in BuyerCancelAfterProcessTask call sellerOrderMapper.selectByOrderCode, buyerUid {}, orderCode {}, skup {}", 182 + SellerOrder sellerOrder = sellerOrderMapper.selectBySkup(skup);
  183 + logger.info("in BuyerCancelAfterProcessTask call sellerOrderMapper.selectBySkup, buyerUid {}, orderCode {}, skup {}",
184 buyerUid, orderCode, skup ); 184 buyerUid, orderCode, skup );
185 int sellerUid = sellerOrder.getUid(); 185 int sellerUid = sellerOrder.getUid();
186 long sellerOrderCode = sellerOrder.getOrderCode(); 186 long sellerOrderCode = sellerOrder.getOrderCode();
@@ -129,7 +129,7 @@ public class BuyerOrderDetailService extends AbsOrderDetailService implements IO @@ -129,7 +129,7 @@ public class BuyerOrderDetailService extends AbsOrderDetailService implements IO
129 .build(); 129 .build();
130 130
131 // 待付款时，剩余时间 131 // 待付款时，剩余时间
132 - int leftTime = getLeftTime(tabType,buyerOrder.getUid(), buyerOrder.getOrderCode(), orderStatus.getCode(), buyerOrder.getCreateTime()); 132 + Integer leftTime = getLeftTime(tabType,buyerOrder.getUid(), buyerOrder.getOrderCode(), orderStatus.getCode(), buyerOrder.getCreateTime());
133 statusDetail.setLeftTime(leftTime); 133 statusDetail.setLeftTime(leftTime);
134 boolean isShowWaitingTime = OrderStatus.WAITING_RECEIVE.getCode() == orderStatus.getCode(); 134 boolean isShowWaitingTime = OrderStatus.WAITING_RECEIVE.getCode() == orderStatus.getCode();
135 if(isShowWaitingTime){ 135 if(isShowWaitingTime){
@@ -155,8 +155,6 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService { @@ -155,8 +155,6 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
155 .expected(expectStatus).target(targetStatus).skup(skup).sellerUid(buyerOrder.getSellerUid()) 155 .expected(expectStatus).target(targetStatus).skup(skup).sellerUid(buyerOrder.getSellerUid())
156 .build(); 156 .build();
157 buyerOrderCancelService.cancel(bsde); 157 buyerOrderCancelService.cancel(bsde);
158 - //退还优惠券  
159 - buyerOrderCancelService.refundCouponIfNeed(orderRequest.getUid(),orderRequest.getOrderCode());  
160 break; 158 break;
161 case SELLER_SEND_OUT: 159 case SELLER_SEND_OUT:
162 bog = buyerOrderGoodsMapper.selectByOrderCode(orderRequest.getUid(), 160 bog = buyerOrderGoodsMapper.selectByOrderCode(orderRequest.getUid(),