Authored by Lixiaodi

bug修改

... ... @@ -12,6 +12,7 @@ import javax.annotation.Resource;
import com.yoho.ufo.order.service.event.DepotNumUpdateEvent;
import com.yohobuy.ufo.model.order.constants.ExpressCompanyEnum;
import com.yohobuy.ufo.model.order.constants.IdentifyCenterEnum;
import com.yohobuy.ufo.model.order.req.BuyerOrderCancelReq;
import com.yohobuy.ufo.model.order.resp.*;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
... ... @@ -919,11 +920,11 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService, ApplicationCon
if (buyerOrder == null || buyerOrder.getStatus() != 4) {
throw new ServiceException(400, "错误:订单不存在或者订单状态变化,不允许清关失败");
}
buyerOrderFeedbackService.submitBuyerOrderFeedback(req.getOrderCode(),req.getSettleFailReason());
String args = "ufo-gateway.cancelOverseasOrderForBuyerClearFail";
JSONObject jsonObject = asyncCallSettleFail(args, buyerOrder.getOrderCode());
LOGGER.info("settleFail orderCode is {} ,result json {}", req.getOrderCode(), jsonObject);
buyerOrderFeedbackService.submitBuyerOrderFeedback(req.getOrderCode(),req.getSettleFailReason());
return jsonObject;
}
... ... @@ -1605,7 +1606,7 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService, ApplicationCon
private JSONObject asyncCallSettleFail(String args, String orderCode) {
LOGGER.info("asyncCallSettleFail call ufo-gateway enter orderCode is {}, interface is {},result is {}", orderCode, args);
OrderRequest request = new OrderRequest();
BuyerOrderCancelReq request = new BuyerOrderCancelReq();
request.setOrderCode(Long.valueOf(orderCode));
JSONObject jsonObject = serviceCaller.asyncCall(args, request, JSONObject.class).get(5, TimeUnit.SECONDS);
LOGGER.info("asyncCallSettleFail call ufo-gateway orderCode is {}, interface is {},result is {}", orderCode, args, jsonObject);
... ...