寄存完成的订单允许发货给买家

@@ -44,6 +44,7 @@ import com.yohoufo.order.service.proxy.OrderOperateRecordService;
 import com.yohoufo.order.service.proxy.OrderStatusFlowService;
 import com.yohoufo.order.service.proxy.ProductProxyService;
 import com.yohoufo.order.service.seller.setting.SellerService;
+import com.yohoufo.order.utils.BuyerOrderUtils;
 import com.yohoufo.order.utils.PaymentHelper;
 import com.yohoufo.order.utils.PubThreadFactory;
 import lombok.Data;
@@ -195,6 +196,7 @@ public class AppraiseService {
      * 正常发货
      * 鉴定通过 -- 待收货
      * 瑕疵接收 -- 待收货
+     * 寄存完成 -- 待收货
      */
     public void deliveryGoodsToBuyer(AppraiseExpressInfoBo appraiseExpressInfoBo) {
         LOGGER.info("deliveryGoodsToBuyer enter req {}", appraiseExpressInfoBo);
@@ -211,6 +213,11 @@ public class AppraiseService {
             expectOrderStatus = OrderStatus.JUDGE_PASS;
         } else if (buyerOrder.getStatus() == OrderStatus.MINI_FAULT_ACCEPT.getCode()) {
             expectOrderStatus = OrderStatus.MINI_FAULT_ACCEPT;
+        }
+        // 寄存订单已完成
+        else if (BuyerOrderUtils.isDeposit(buyerOrder.getAttributes())
+                && buyerOrder.getStatus() == OrderStatus.DONE.getCode()) {
+            expectOrderStatus = OrderStatus.DONE;
         } else {
             LOGGER.warn("in deliveryGoodsToBuyer, buyer Order orderCode {} pstatus {}, expect Order Status JUDGE_PASS or MINI_FAULT_ACCEPT ",
                     orderCode, buyerOrder.getStatus());

@@ -42,4 +42,11 @@ public class BuyerOrderUtils {
 
         return isOffline(orderInfo.getAttributes());
     }
+
+    /**
+     * 是否寄存订单
+     */
+    public static boolean isDeposit(Integer attributes) {
+        return OrderAttributes.getOrderAttributes(attributes) == OrderAttributes.DEPOSITE;
+    }
 }