refactor

@@ -6,6 +6,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import com.yohobuy.ufo.model.order.common.BuyerOrderCancelType;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -416,13 +417,13 @@ public class BuyerOrderController {
 	 */
 	@RequestMapping(value = "/cancelBuyerOrder")
 	public ApiResponse cancelBuyerOrder(String orderCode,@RequestParam(value = "cancelType",required = false) Integer cancelType) {
-		buyerOrderService.cancelBuyerOrder(orderCode, cancelType);
+		buyerOrderService.cancelBuyerOrder(orderCode, BuyerOrderCancelType.getBuyerOrderCancelType(cancelType));
 		return new ApiResponse.ApiResponseBuilder().code(200).build();
 	}
 
 	@RequestMapping(value = "/cancelBuyerOrderClickFarm")
 	public ApiResponse cancelBuyerOrderClickFarm(String orderCode) {
-		buyerOrderService.cancelBuyerOrder(orderCode, 1);
+		buyerOrderService.cancelBuyerOrder(orderCode, BuyerOrderCancelType.PULL_WOOL);
 		return new ApiResponse.ApiResponseBuilder().code(200).build();
 	}
 

@@ -8,6 +8,7 @@ import com.yoho.core.dal.datasource.annotation.Database;
 import com.yoho.order.model.*;
 import com.yoho.ufo.service.impl.UserHelper;
 import com.yoho.ufo.service.model.PageResponseBO;
+import com.yohobuy.ufo.model.order.common.BuyerOrderCancelType;
 import com.yohobuy.ufo.model.order.resp.*;
 
 /**
@@ -29,7 +30,7 @@ public interface IBuyerOrderService {
 	 * 客服取消订单
 	 * @param orderCode
 	 */
-	void cancelBuyerOrder(String orderCode, Integer cancelType);
+	void cancelBuyerOrder(String orderCode, BuyerOrderCancelType cancelType);
 
 	/**
 	 * 商品无法鉴定

@@ -19,6 +19,7 @@ import java.util.stream.Collectors;
 import javax.annotation.Resource;
 
 import com.yoho.ufo.util.*;
+import com.yohobuy.ufo.model.order.common.*;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -143,12 +144,6 @@ import com.yoho.ufo.service.impl.UserHelper;
 import com.yoho.ufo.service.model.PageResponseBO;
 import com.yohobuy.ufo.model.order.bo.AppraiseExpressInfoBo;
 import com.yohobuy.ufo.model.order.bo.DepositDetailBo;
-import com.yohobuy.ufo.model.order.common.EnumExpressType;
-import com.yohobuy.ufo.model.order.common.EnumQualityCheckStatus;
-import com.yohobuy.ufo.model.order.common.EnumQualityCheckType;
-import com.yohobuy.ufo.model.order.common.OperateTypeEnum;
-import com.yohobuy.ufo.model.order.common.OrderAttributes;
-import com.yohobuy.ufo.model.order.common.OrderStatus;
 import com.yohobuy.ufo.model.order.constants.BusinessClientEnum;
 import com.yohobuy.ufo.model.order.constants.DepositOrderStatusEnum;
 import com.yohobuy.ufo.model.order.constants.DepositOutTypeEnum;
@@ -1539,14 +1534,14 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService, ApplicationCon
 	}
 
 	@Override
-	public void cancelBuyerOrder(String orderCode, Integer cancelType) {
+	public void cancelBuyerOrder(String orderCode, BuyerOrderCancelType cancelType) {
 		BuyerOrder buyerOrder = buyerOrderMapper.selectByOrderCode(orderCode);
 		if (null == buyerOrder) {
 			throw new ServiceException(400, "订单不存在");
 		}
 		OperateTypeEnum operateType;
 		// 买家刷单
-		if (Objects.equals(Integer.valueOf(1), cancelType)) {
+		if (cancelType == BuyerOrderCancelType.PULL_WOOL) {
 			operateType = OperateTypeEnum.CS_CANCEL_CLICK_FARM;
 			if (Constant.BUYER_ORDER_STATUS_BUYER_PAYED.getByteVal() != buyerOrder.getStatus().byteValue()
 					&& Constant.BUYER_ORDER_STATUS_ALLOCATING.getByteVal() != buyerOrder.getStatus().byteValue()
@@ -1556,7 +1551,7 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService, ApplicationCon
 			}
 		}
 		// 卖家无法发货
-		else if (Objects.equals(Integer.valueOf(2), cancelType)) {
+		else if (cancelType == BuyerOrderCancelType.SELLER_CAN_NOT_SEND_OUT) {
 			operateType = OperateTypeEnum.CS_CANCEL_SELLER_CAN_NOT_SEND_OUT;
 			if (Constant.BUYER_ORDER_STATUS_BUYER_PAYED.getByteVal() != buyerOrder.getStatus().byteValue()) {
 				throw new ServiceException(400, "错误：订单状态变化，不允许取消订单,请重新刷新列表");
@@ -1576,7 +1571,9 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService, ApplicationCon
 		BuyerOrderCancelReq request = new BuyerOrderCancelReq();
 		request.setUid(buyerOrder.getUid());
 		request.setOrderCode(Long.valueOf(orderCode));
-		request.setCancelType(cancelType);
+		if(Objects.nonNull(cancelType)){
+			request.setCancelType(cancelType.getCode());
+		}
 		JSONObject result = serviceCaller.asyncCall(args, request, JSONObject.class).get(5);
 		LOGGER.info("call ufo-gateway orderCode is {}, interface is {},result is {}", orderCode, args, result);
 	}