ufo / yohoufo-fore · Commits

Go to a project

Authored by LUOXC
Commit a78c89fbff9f379c10ef611378a9d1e8528777eb 1 parent ecda3343

refactor

Inline Side-by-side
Showing 2 changed files with 17 additions and 19 deletions
@@ -156,7 +156,7 @@ public class OrderHelpController { @@ -156,7 +156,7 @@ public class OrderHelpController {
156 try { 156 try {
157 buyerOrderService.cancel(order); 157 buyerOrderService.cancel(order);
158 } catch (Exception e) { 158 } catch (Exception e) {
159 - log.info("buyer Cancel fail {}", orders,e); 159 + log.info("buyer Cancel fail {}", order,e);
160 } 160 }
161 sleep(50); 161 sleep(50);
162 }); 162 });
@@ -174,7 +174,7 @@ public class OrderHelpController { @@ -174,7 +174,7 @@ public class OrderHelpController {
174 try { 174 try {
175 buyerOrderCancelService.buyerCancelRefund(order.getUid(), order.getOrderCode()); 175 buyerOrderCancelService.buyerCancelRefund(order.getUid(), order.getOrderCode());
176 } catch (Exception e) { 176 } catch (Exception e) {
177 - log.info("buyer cancel refund fail {}", orders,e); 177 + log.info("buyer cancel refund fail {}", order,e);
178 } 178 }
179 sleep(50); 179 sleep(50);
180 }); 180 });
@@ -8,7 +8,6 @@ import com.yohobuy.ufo.model.order.bo.MerchantOrderAttachInfo; @@ -8,7 +8,6 @@ import com.yohobuy.ufo.model.order.bo.MerchantOrderAttachInfo;
8 import com.yohobuy.ufo.model.order.common.OrderStatus; 8 import com.yohobuy.ufo.model.order.common.OrderStatus;
9 import com.yohobuy.ufo.model.order.common.SellerOrderStatus; 9 import com.yohobuy.ufo.model.order.common.SellerOrderStatus;
10 import com.yohobuy.ufo.model.order.common.SkupStatus; 10 import com.yohobuy.ufo.model.order.common.SkupStatus;
11 -import com.yohobuy.ufo.model.order.common.TabType;  
12 import com.yohobuy.ufo.model.order.constants.CustomsClearanceResultType; 11 import com.yohobuy.ufo.model.order.constants.CustomsClearanceResultType;
13 import com.yohobuy.ufo.model.order.constants.RegionEnum; 12 import com.yohobuy.ufo.model.order.constants.RegionEnum;
14 import com.yohobuy.ufo.model.promotion.request.CouponSendMqBean; 13 import com.yohobuy.ufo.model.promotion.request.CouponSendMqBean;
@@ -42,7 +41,6 @@ import com.yohoufo.order.service.proxy.*; @@ -42,7 +41,6 @@ import com.yohoufo.order.service.proxy.*;
42 import com.yohoufo.order.service.seller.setting.SellerService; 41 import com.yohoufo.order.service.seller.setting.SellerService;
43 import com.yohoufo.order.service.seller.support.SkupTypeCodeSupport; 42 import com.yohoufo.order.service.seller.support.SkupTypeCodeSupport;
44 import com.yohoufo.order.utils.LoggerUtils; 43 import com.yohoufo.order.utils.LoggerUtils;
45 -import com.yohoufo.order.utils.NamedThreadFactory;  
46 import com.yohoufo.order.utils.OrderAssist; 44 import com.yohoufo.order.utils.OrderAssist;
47 import com.yohoufo.order.utils.PaymentHelper; 45 import com.yohoufo.order.utils.PaymentHelper;
48 import lombok.Builder; 46 import lombok.Builder;
@@ -366,23 +364,23 @@ public class BuyerOrderCancelService { @@ -366,23 +364,23 @@ public class BuyerOrderCancelService {
366 } 364 }
367 } 365 }
368 366
369 - public void buyerCancelRefund(int uid, long orderCode){ 367 + public void buyerCancelRefund(int uid, long orderCode) {
370 OrderStatus targetOrderStatus = OrderStatus.BUYER_CANCEL_BEFORE_DEPOT_RECEIVE; 368 OrderStatus targetOrderStatus = OrderStatus.BUYER_CANCEL_BEFORE_DEPOT_RECEIVE;
371 BuyerOrder buyerOrder = buyerOrderMapper.selectByOrderCode(orderCode); 369 BuyerOrder buyerOrder = buyerOrderMapper.selectByOrderCode(orderCode);
372 - if(targetOrderStatus.getCode() == buyerOrder.getStatus().intValue()){  
373 - BuyerOrderGoods buyerOrderGoods = buyerOrderGoodsMapper.selectByOrderCode(uid,orderCode);  
374 - BuyerPenaltyCalResult bpcr = buyerCancelCompensateComputeHandler.calBuyerPenaltyCalResult(buyerOrder, buyerOrderGoods, targetOrderStatus);  
375 - TransferCase transferCase = TransferCase.PART_GOODS_MONEY_TO_SELLER;  
376 - BuyerCancelAfterProcessTask bcapt = new BuyerCancelAfterProcessTask(buyerOrder, buyerOrderGoods.getSkup(),  
377 - bpcr, transferCase,false);  
378 - bcapt.targetOrderStatus = targetOrderStatus;  
379 - bcapt.setSwdType(SellerWalletDetail.Type.BUYER_CANCEL_DELIVERY);  
380 - try {  
381 - bcapt.call();  
382 - } catch (Exception e) {  
383 - throwServiceException("服务异常");  
384 - logger.warn("buyerCancelRefund fail uid {}, orderCode {}", uid, orderCode);  
385 - } 370 + throwServiceExceptionIf(Objects.isNull(buyerOrder), "订单不存在");
  371 + throwServiceExceptionIf(targetOrderStatus.getCode() != buyerOrder.getStatus().intValue(), "订单状态错误");
  372 + BuyerOrderGoods buyerOrderGoods = buyerOrderGoodsMapper.selectByOrderCode(uid, orderCode);
  373 + BuyerPenaltyCalResult bpcr = buyerCancelCompensateComputeHandler.calBuyerPenaltyCalResult(buyerOrder, buyerOrderGoods, targetOrderStatus);
  374 + TransferCase transferCase = TransferCase.PART_GOODS_MONEY_TO_SELLER;
  375 + BuyerCancelAfterProcessTask bcapt = new BuyerCancelAfterProcessTask(buyerOrder, buyerOrderGoods.getSkup(),
  376 + bpcr, transferCase, false);
  377 + bcapt.targetOrderStatus = targetOrderStatus;
  378 + bcapt.setSwdType(SellerWalletDetail.Type.BUYER_CANCEL_DELIVERY);
  379 + try {
  380 + bcapt.call();
  381 + } catch (Exception e) {
  382 + logger.warn("buyerCancelRefund fail uid {}, orderCode {}", uid, orderCode);
  383 + throwServiceException("服务异常");
386 } 384 }
387 } 385 }
388 386