调整oms业务返回对比BUG

order-application-service/src/main/java/cn/freemud/controller/OrderController.java

@@ -144,6 +144,8 @@ public class OrderController {
         return orderservice.refundNotifyCallback(requestVo);
     }
 
+
+
     /**
      * 查询订单列表
      */

order-management/src/main/java/cn/freemud/management/service/impl/SaasOrderMangerServiceImpl.java

 package cn.freemud.management.service.impl;
 
 import cn.freemud.base.entity.BaseResponse;
+import cn.freemud.base.util.JsonUtil;
 import cn.freemud.management.entities.dto.request.order.OrderManagerRequest;
 import cn.freemud.management.entities.dto.response.order.OrderManagerResponse;
 import cn.freemud.management.entities.dto.response.pay.PayRefundResponse;
@@ -37,6 +38,7 @@ import com.freemud.sdk.api.assortment.order.request.order.CancelOrderRequest;
 import com.freemud.sdk.api.assortment.order.response.order.BaseOrderResponse;
 import com.freemud.sdk.api.assortment.order.response.order.QueryOrdersResponse;
 import com.google.common.collect.Lists;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.StringUtils;
@@ -63,6 +65,7 @@ import static cn.freemud.management.enums.OperateType.ORDER_CANCEL;
  * @Copyright: 2020 www.freemud.cn Inc. All rights reserved.
  * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
  */
+@Slf4j
 @Service
 public class SaasOrderMangerServiceImpl implements OrderManagerService {
 
@@ -267,6 +270,7 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
     private BaseResponse<OrderManagerResponse> executeRefund(OrderManagerRequest request,QueryOrdersResponse.DataBean.OrderBean orderBean, String operationType) {
         //订单接单参数校验
         BaseResponse verifyResponse = orderVerifyHandle.orderCancel(orderBean, request, OperateType.ORDER_AGREE_REFUND.getOpType());
+        log.info("executeRefund verifyResponse :" + JsonUtil.toJSONString(verifyResponse));
         if (ObjectUtils.notEqual(verifyResponse.getCode(), ResponseResult.SUCCESS.getCode())) {
             return ResponseUtil.error(verifyResponse.getCode());
         }
@@ -280,6 +284,7 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
             // 同意退款在支付退款后的退款/退货完成操作
             baseResponse = this.orderAgreeRefund(request, orderBean);
         }
+        log.info("executeRefund executeRefund baseResponse :" + JsonUtil.toJSONString(baseResponse));
         if(!ObjectUtils.equals(SUCCESS,Integer.valueOf(baseResponse.getCode()))){
             emailAlertService.sendEmailAlert("商家取消订单失败", "请求json:" + JSONObject.toJSONString(orderBean) + "返回msg:" + baseResponse.getMessage());
             return ResponseUtil.error(ResponseResult.PARTNER_ORDER_CANCEL_ERROR);