Merge branch 'master' into test6.9.9

@@ -300,21 +300,16 @@ public class AppraiseService {
     }
 
     private void deliveryDepositGoodsToBuyer(AppraiseExpressInfoBo appraiseExpressInfoBo, BuyerOrder buyerOrder) {
-        if(buyerOrder.getStatus() == OrderStatus.DONE.getCode()){
-            expressInfoService.deliverGoods(buyerOrder.getUid(),
-                    appraiseExpressInfoBo.getExpressCompanyId(),
-                    buyerOrder.getOrderCode(),
-                    appraiseExpressInfoBo.getWayBillCode(),
-                    appraiseExpressInfoBo.getDepotNum(),
-                    appraiseExpressInfoBo.getMobile());
-            // 通知买家已发货
-            buyerNoticeFacade.deliveryDepositGoodsToBuyer(buyerOrder.getUid(), appraiseExpressInfoBo.getWayBillCode(),
-                    () -> cleanCacheAfterUpdateStatus(buyerOrder.getOrderCode(), buyerOrder.getUid(), buyerOrder.getSellerUid()),
-                    sellerOrderGoods -> Optional.ofNullable(sellerOrderGoods).map(SellerOrderGoods::getProductId).map(productMapper::selectByPrimaryKey).orElse(null));
-        }else {
-            LOGGER.warn("in deliveryGoodsToBuyer, buyer Deposit Order orderCode {}", buyerOrder.getOrderCode());
-            throw new ServiceException(ServiceError.ORDER_STATUS_INVALIDATE);
-        }
+        expressInfoService.deliverGoods(buyerOrder.getUid(),
+                appraiseExpressInfoBo.getExpressCompanyId(),
+                buyerOrder.getOrderCode(),
+                appraiseExpressInfoBo.getWayBillCode(),
+                appraiseExpressInfoBo.getDepotNum(),
+                appraiseExpressInfoBo.getMobile());
+        // 通知买家已发货
+        buyerNoticeFacade.deliveryDepositGoodsToBuyer(buyerOrder.getUid(), appraiseExpressInfoBo.getWayBillCode(),
+                () -> cleanCacheAfterUpdateStatus(buyerOrder.getOrderCode(), buyerOrder.getUid(), buyerOrder.getSellerUid()),
+                sellerOrderGoods -> Optional.ofNullable(sellerOrderGoods).map(SellerOrderGoods::getProductId).map(productMapper::selectByPrimaryKey).orElse(null));
     }
 
     private void deliveryNonDepositGoodsToBuyer(AppraiseExpressInfoBo appraiseExpressInfoBo, BuyerOrder buyerOrder) {