Merge branch 'test6.8.3' into dev6.8.3_order

@@ -189,9 +189,10 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
         }
 
         //买家已付款，卖家已发货，只有这两种状态的情况下，才允许改地址
-        boolean allowChange = buyerOrder.getStatus().intValue() == OrderStatus.HAS_PAYED.getCode()
-                ||buyerOrder.getStatus().intValue() == OrderStatus.SELLER_SEND_OUT.getCode() ;
+        /*boolean allowChange = buyerOrder.getStatus().intValue() == OrderStatus.HAS_PAYED.getCode()
+                ||buyerOrder.getStatus().intValue() == OrderStatus.SELLER_SEND_OUT.getCode() ;*/
 
+        boolean allowChange =  ActionStatusHold.buyerCanModifyAddress(buyerOrder.getStatus());
         if(!allowChange){
             logger.warn("buyerModifyAddress check orderCode status not invalid, uid is {}, orderCode is {} ,status is {}",
                     uid, orderCode,buyerOrder.getStatus() );