ufo / yohoufo-fore · Commits

Go to a project

Authored by LUOXC
Commit 3bd6ee4ae8f708d8a1d7b4495e769ae5c91022ef 2 parents a5604aee 00f99cca

Merge branch 'master' into test6.9.9

Inline Side-by-side
Showing 1 changed file with 10 additions and 15 deletions
@@ -300,21 +300,16 @@ public class AppraiseService { @@ -300,21 +300,16 @@ public class AppraiseService {
300 } 300 }
301 301
302 private void deliveryDepositGoodsToBuyer(AppraiseExpressInfoBo appraiseExpressInfoBo, BuyerOrder buyerOrder) { 302 private void deliveryDepositGoodsToBuyer(AppraiseExpressInfoBo appraiseExpressInfoBo, BuyerOrder buyerOrder) {
303 - if(buyerOrder.getStatus() == OrderStatus.DONE.getCode()){  
304 - expressInfoService.deliverGoods(buyerOrder.getUid(),  
305 - appraiseExpressInfoBo.getExpressCompanyId(),  
306 - buyerOrder.getOrderCode(),  
307 - appraiseExpressInfoBo.getWayBillCode(),  
308 - appraiseExpressInfoBo.getDepotNum(),  
309 - appraiseExpressInfoBo.getMobile());  
310 - // 通知买家已发货  
311 - buyerNoticeFacade.deliveryDepositGoodsToBuyer(buyerOrder.getUid(), appraiseExpressInfoBo.getWayBillCode(),  
312 - () -> cleanCacheAfterUpdateStatus(buyerOrder.getOrderCode(), buyerOrder.getUid(), buyerOrder.getSellerUid()),  
313 - sellerOrderGoods -> Optional.ofNullable(sellerOrderGoods).map(SellerOrderGoods::getProductId).map(productMapper::selectByPrimaryKey).orElse(null));  
314 - }else {  
315 - LOGGER.warn("in deliveryGoodsToBuyer, buyer Deposit Order orderCode {}", buyerOrder.getOrderCode());  
316 - throw new ServiceException(ServiceError.ORDER_STATUS_INVALIDATE);  
317 - } 303 + expressInfoService.deliverGoods(buyerOrder.getUid(),
  304 + appraiseExpressInfoBo.getExpressCompanyId(),
  305 + buyerOrder.getOrderCode(),
  306 + appraiseExpressInfoBo.getWayBillCode(),
  307 + appraiseExpressInfoBo.getDepotNum(),
  308 + appraiseExpressInfoBo.getMobile());
  309 + // 通知买家已发货
  310 + buyerNoticeFacade.deliveryDepositGoodsToBuyer(buyerOrder.getUid(), appraiseExpressInfoBo.getWayBillCode(),
  311 + () -> cleanCacheAfterUpdateStatus(buyerOrder.getOrderCode(), buyerOrder.getUid(), buyerOrder.getSellerUid()),
  312 + sellerOrderGoods -> Optional.ofNullable(sellerOrderGoods).map(SellerOrderGoods::getProductId).map(productMapper::selectByPrimaryKey).orElse(null));
318 } 313 }
319 314
320 private void deliveryNonDepositGoodsToBuyer(AppraiseExpressInfoBo appraiseExpressInfoBo, BuyerOrder buyerOrder) { 315 private void deliveryNonDepositGoodsToBuyer(AppraiseExpressInfoBo appraiseExpressInfoBo, BuyerOrder buyerOrder) {