Merge branch 'feature/售后单记录支付信息' into qa

order-management/src/main/java/cn/freemud/management/service/handle/PaymentHandle.java

@@ -17,6 +17,7 @@ import cn.freemud.management.thirdparty.OMSPaymentClient;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.freemud.application.sdk.api.base.BaseResponse;
+import com.freemud.application.sdk.api.log.ApiLog;
 import com.freemud.application.sdk.api.log.ErrorLog;
 import com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1;
 import com.freemud.application.sdk.api.ordercenter.enums.CashTypeEnum;
@@ -87,6 +88,7 @@ public class PaymentHandle {
             PayRefundResponse multiRefundResponse = multiRefundService.multiRefund(orderBean.getCompanyId(), orderBean.getShopId(), orderBean.getOid(), refundAmount, orderBean.getOrderPayItem());
             if (multiRefundResponse != null) {
                 refundResponse = multiRefundResponse;
+                ApiLog.infoMessage("getCommonPayRefundResponse---1, 返回json:{}", JSONObject.toJSONString(refundResponse));
             }else {
                 OrderExtendedReq extended = orderBean.getOrderExtended();
                 if (StringUtils.isNotBlank(extended.getAgentPayerId()) && !Objects.equals(extended.getAgentPayerId(), orderBean.getUserId())) {

order-management/src/main/java/cn/freemud/management/service/handle/SaasOrderHandle.java

@@ -10,6 +10,8 @@ import cn.freemud.management.enums.ResponseResult;
 import cn.freemud.management.intercept.OrderServiceException;
 import cn.freemud.management.util.ResponseUtil;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.freemud.application.sdk.api.log.ApiLog;
 import com.freemud.application.sdk.api.log.LogThreadLocal;
 import com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1;
 import com.freemud.application.sdk.api.ordercenter.entities.vo.OrderCallBackRequestVo;
@@ -218,6 +220,7 @@ public class SaasOrderHandle {
             });
         }
         cancelOrderRequest.setPayRefundItemList(refundItemList);
+        ApiLog.infoMessage("orderReject---2, 返回json:{}", JSONObject.toJSONString(cancelOrderRequest));
 
         BaseOrderResponse baseOrderResponse = orderCenterSdkService.orderReject(cancelOrderRequest);
         if (baseOrderResponse == null || ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(), baseOrderResponse.getErrcode().toString())) {

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

@@ -222,6 +222,8 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
         }
 
         //订单拒单
+        ApiLog.infoMessage("orderReject---1, 返回json:{}", JSONObject.toJSONString(refundResponse));
+
         saasOrderHandle.orderReject(request, refundResponse, orderBean);
         // 推送pos、微信消息中心
         orderBaseService.sendMessage(orderBean, OperateType.ORDER_REJECT, request.getReason());
@@ -395,6 +397,8 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
             if (PAY_RETURN_FILTER_CODES.contains(baseResponse.getCode())) {
                 return ResponseUtil.error(ResponseResult.getResponseResult(baseResponse.getCode()));
             }
+            ApiLog.infoMessage("商家取消订单失败, 请求json:{} 返回msg:{}", JSONObject.toJSONString(orderBean), baseResponse.getMessage());
+
             emailAlertService.sendEmailAlert("商家取消订单失败", "请求json:" + JSONObject.toJSONString(orderBean) + "返回msg:" + baseResponse.getMessage());
             return ResponseUtil.error(ResponseResult.PARTNER_ORDER_CANCEL_ERROR);
         }