加点日志

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

@@ -442,7 +442,7 @@ public class OrderServiceImpl implements Orderservice {
     }
     @Override
     public String paySuccessCallback(PaysuccessNoticeMessage message, ConfirmOrderDto confirmOrderDto, Map<String, QueryOrdersResponseDto.DataBean.OrderBean> orderBeans) {
-        ApiLog.info("支付成功清空购物车，confirmOrderDto,orderBeans",confirmOrderDto,orderBeans);
+        ApiLog.info("支付成功清空购物车1，confirmOrderDto,orderBeans",confirmOrderDto,orderBeans);
         OrderBean orderBean = orderBeans.get(OrderBeanType.SAASORDER.getCode());
         String oid = StringUtils.isNotEmpty(orderBean.getParentCode()) && !"0".equals(orderBean.getParentCode()) ? orderBean.getParentCode() : orderBean.getOid();
         String partnerId = orderBean.getCompanyId();
@@ -472,6 +472,7 @@ public class OrderServiceImpl implements Orderservice {
         }
         // 如果订单状态不是未支付，返回信息
         if (!PayStatus.NOT_PAY.getCode().equals(orderBean.getPayStatus()) || !OrderStatus.WAIT_PAY.getCode().equals(orderBean.getStatus())) {
+
             return sendPaySuccessNoticeMessage();
         }
         //若该订单使用了优惠券，则移除卡包,移除失败也不退款，现在支付成功个调用核销，无需调用此功能
@@ -505,13 +506,17 @@ public class OrderServiceImpl implements Orderservice {
         JSONObject jsonObject2 = JSONObject.parseObject(string2);
         payAccessResponse = jsonObject2.toJavaObject(PayAccessResponse.class);
         // 添加幂等处理，若订单是已支付成功状态，直接返回成功
+        ApiLog.info("支付成功清空购物车2",var1,payAccessRes);
         if (!RESPONSE_SUCCESS_CODE.equals(payAccessResponse.getErrcode())) {
             OrderBean saasOrder = getOrderBeanByOrderId(confirmOrderDto.getOrderId()).get(OrderBeanType.SAASORDER.getCode());
+            ApiLog.info("支付成功清空购物车3",confirmOrderDto,saasOrder);
             if (saasOrder != null && (!PayStatus.NOT_PAY.getCode().equals(saasOrder.getPayStatus()) || !OrderStatus.WAIT_PAY.getCode().equals(saasOrder.getStatus()))) {
+                ApiLog.info("支付成功清空购物车4");
                 return sendPaySuccessNoticeMessage();
             }
             LogUtil.error("paySuccessCallback_payAccess_faild", gson.toJson(confirmOrderDto), gson.toJson(payAccessResponse));
             //orderRefund(orderBean, "订单异常退款", openid, oid);
+            ApiLog.info("支付成功清空购物车5",message,"");
             return gson.toJson(message);
         }
         // TODO 订单序号替换取餐码显示
@@ -526,7 +531,7 @@ public class OrderServiceImpl implements Orderservice {
         newShoppingCartClearDto.setAppId(wxappid);
         newShoppingCartClearDto.setSessionId(sessionId);
         newShoppingCartClearDto.setOperationType(1);
-        ApiLog.info("支付成功清空购物车，newShoppingCartClearDto",newShoppingCartClearDto,"");
+        ApiLog.info("支付成功清空购物车6，newShoppingCartClearDto",newShoppingCartClearDto,"");
         shoppingCartClient.clearShoppingCart(newShoppingCartClearDto);
 
         // 清空拼单购物车