Merge branch 'hotfix20181210sellercancelbug' into dev6.8.3_order

@@ -61,6 +61,13 @@ public class ActionStatusHold {
             CanCancelStatus = Arrays.asList(SellerOrderStatus.WAITING_PAY.getCode(),
                     SellerOrderStatus.HAS_PAYED.getCode());
         }
+
+        //seller cancel buyer
+
+        static List<Integer> sellerCanCancelBuyerOrderStatus;
+        static {
+            sellerCanCancelBuyerOrderStatus =  Arrays.asList(OrderStatus.HAS_PAYED.getCode());
+        }
     }
     public static List<Integer> getSellerShowExpressStatusList(){
         return SellerASH.View_Express_Status;
@@ -71,6 +78,9 @@ public class ActionStatusHold {
     }
 
 
+    public static boolean sellerCanCancelBuyerOrder(Integer buyerOrderStatus){
+        return SellerASH.sellerCanCancelBuyerOrderStatus.contains(buyerOrderStatus);
+    }
 
 
     public static List<Integer> getBuyerCanDelStatusList(){

@@ -6,6 +6,7 @@ import com.yohobuy.ufo.model.order.bo.MerchantOrderAttachInfo;
 import com.yohobuy.ufo.model.order.common.*;
 import com.yohoufo.common.alarm.EventBusPublisher;
 import com.yohoufo.common.alarm.SmsAlarmEvent;
+import com.yohoufo.common.exception.UfoServiceException;
 import com.yohoufo.common.utils.DateUtil;
 import com.yohoufo.dal.order.BuyerOrderGoodsMapper;
 import com.yohoufo.dal.order.BuyerOrderMapper;
@@ -318,6 +319,11 @@ public class SellerOrderCancelService {
          * 3. sellerOrderGoods
          * 4. 瓜分保证金 退货款
          */
+        Integer buyerOrderStatus = buyerOrder.getStatus();
+        if (Objects.isNull(buyerOrderStatus) || !ActionStatusHold.sellerCanCancelBuyerOrder(buyerOrderStatus)){
+            throw new UfoServiceException(501, "不能取消");
+        }
+
         final int sellerUid = sellerOrder.getUid(), buyerUid = buyerOrder.getUid();
         final long sellerOrderCode = sellerOrder.getOrderCode(), buyerOrderCode = buyerOrder.getOrderCode();