ufo / ufo-platform · Commits

Go to a project

Authored by Lixiaodi
Commit d0af1208f1c9ccf207ebebf0a111f8f15f47520d 1 parent 07dd4010

bug修改

Inline Side-by-side
Showing 1 changed file with 3 additions and 2 deletions
@@ -12,6 +12,7 @@ import javax.annotation.Resource; @@ -12,6 +12,7 @@ import javax.annotation.Resource;
12 import com.yoho.ufo.order.service.event.DepotNumUpdateEvent; 12 import com.yoho.ufo.order.service.event.DepotNumUpdateEvent;
13 import com.yohobuy.ufo.model.order.constants.ExpressCompanyEnum; 13 import com.yohobuy.ufo.model.order.constants.ExpressCompanyEnum;
14 import com.yohobuy.ufo.model.order.constants.IdentifyCenterEnum; 14 import com.yohobuy.ufo.model.order.constants.IdentifyCenterEnum;
  15 +import com.yohobuy.ufo.model.order.req.BuyerOrderCancelReq;
15 import com.yohobuy.ufo.model.order.resp.*; 16 import com.yohobuy.ufo.model.order.resp.*;
16 import org.apache.commons.collections.CollectionUtils; 17 import org.apache.commons.collections.CollectionUtils;
17 import org.apache.commons.lang3.StringUtils; 18 import org.apache.commons.lang3.StringUtils;
@@ -919,11 +920,11 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService, ApplicationCon @@ -919,11 +920,11 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService, ApplicationCon
919 if (buyerOrder == null || buyerOrder.getStatus() != 4) { 920 if (buyerOrder == null || buyerOrder.getStatus() != 4) {
920 throw new ServiceException(400, "错误：订单不存在或者订单状态变化，不允许清关失败"); 921 throw new ServiceException(400, "错误：订单不存在或者订单状态变化，不允许清关失败");
921 } 922 }
922 - buyerOrderFeedbackService.submitBuyerOrderFeedback(req.getOrderCode(),req.getSettleFailReason());  
923 String args = "ufo-gateway.cancelOverseasOrderForBuyerClearFail"; 923 String args = "ufo-gateway.cancelOverseasOrderForBuyerClearFail";
924 JSONObject jsonObject = asyncCallSettleFail(args, buyerOrder.getOrderCode()); 924 JSONObject jsonObject = asyncCallSettleFail(args, buyerOrder.getOrderCode());
925 925
926 LOGGER.info("settleFail orderCode is {} ,result json {}", req.getOrderCode(), jsonObject); 926 LOGGER.info("settleFail orderCode is {} ,result json {}", req.getOrderCode(), jsonObject);
  927 + buyerOrderFeedbackService.submitBuyerOrderFeedback(req.getOrderCode(),req.getSettleFailReason());
927 928
928 return jsonObject; 929 return jsonObject;
929 } 930 }
@@ -1605,7 +1606,7 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService, ApplicationCon @@ -1605,7 +1606,7 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService, ApplicationCon
1605 1606
1606 private JSONObject asyncCallSettleFail(String args, String orderCode) { 1607 private JSONObject asyncCallSettleFail(String args, String orderCode) {
1607 LOGGER.info("asyncCallSettleFail call ufo-gateway enter orderCode is {}, interface is {},result is {}", orderCode, args); 1608 LOGGER.info("asyncCallSettleFail call ufo-gateway enter orderCode is {}, interface is {},result is {}", orderCode, args);
1608 - OrderRequest request = new OrderRequest(); 1609 + BuyerOrderCancelReq request = new BuyerOrderCancelReq();
1609 request.setOrderCode(Long.valueOf(orderCode)); 1610 request.setOrderCode(Long.valueOf(orderCode));
1610 JSONObject jsonObject = serviceCaller.asyncCall(args, request, JSONObject.class).get(5, TimeUnit.SECONDS); 1611 JSONObject jsonObject = serviceCaller.asyncCall(args, request, JSONObject.class).get(5, TimeUnit.SECONDS);
1611 LOGGER.info("asyncCallSettleFail call ufo-gateway orderCode is {}, interface is {},result is {}", orderCode, args, jsonObject); 1612 LOGGER.info("asyncCallSettleFail call ufo-gateway orderCode is {}, interface is {},result is {}", orderCode, args, jsonObject);