Merge remote-tracking branch 'origin/master'

order-application-service/src/main/java/cn/freemud/service/impl/MallOrderServiceImpl.java

@@ -10,6 +10,7 @@ import cn.freemud.amqp.MQService;
 import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.base.log.LogTreadLocal;
 import cn.freemud.base.util.DateUtil;
+import cn.freemud.base.util.JsonUtil;
 import cn.freemud.constant.RedisKeyConstant;
 import cn.freemud.constant.ResponseCodeConstant;
 import cn.freemud.entities.dto.*;
@@ -439,6 +440,7 @@ public class MallOrderServiceImpl implements MallOrderService {
 
     @Override
     public String paySuccessCallback(PaysuccessNoticeMessage message, ConfirmOrderDto confirmOrderDto, Map<String, QueryOrdersResponseDto.DataBean.OrderBean> orderBeans) {
+        log.info("paySuccessCallback start" + JsonUtil.toJSONString(orderBeans));
         QueryOrdersResponseDto.DataBean.OrderBean orderBean = orderBeans.get(OrderBeanType.SAASORDER.getCode());
 
         String partnerId = orderBean.getCompanyId();
@@ -457,6 +459,7 @@ public class MallOrderServiceImpl implements MallOrderService {
                 sessionId = orderExtInfoDto.getSessionId();
             }
         }
+        log.info("paySuccessCallback orderBean" + JsonUtil.toJSONString(orderBean));
         // 如果订单状态不是未支付，返回信息
         if (!PayStatus.NOT_PAY.getCode().equals(orderBean.getPayStatus()) || !OrderStatus.WAIT_PAY.getCode().equals(orderBean.getStatus())) {
             return sendPaySuccessNoticeMessage();
@@ -496,7 +499,7 @@ public class MallOrderServiceImpl implements MallOrderService {
             }
 
         }
-
+        log.info("paySuccessCallback confirmOrderRequest" + JsonUtil.toJSONString(confirmOrderRequest));
         // 订单支付成功
         com.freemud.sdk.api.assortment.order.response.order.PayAccessResponse payAccessRes = orderCenterSdkService.payAccess(confirmOrderRequest);
         String string2 = JSONObject.toJSONString(payAccessRes);

order-application-service/src/main/java/cn/freemud/service/impl/OrderAdapterServiceImpl.java

@@ -333,6 +333,7 @@ public class OrderAdapterServiceImpl implements OrderAdapterService {
                 orderService.timeOutRefund(orderBean);
                 return orderAdapter.sendPaySuccessNoticeMessage();
             }
+
             /**
              * 围餐处理
              */