增加微信回调内容打印

soss-framework/src/main/java/com/soss/framework/web/service/WeixinServiceImpl.java

@@ -355,12 +355,13 @@ public class WeixinServiceImpl {
     }
 
 
-    public String wxNotify(HttpServletRequest request) throws Exception {
+    @Transactional
+    public synchronized String wxNotify(HttpServletRequest request) throws Exception {
         Map<String, String> returnMap = new HashMap<>();//应答对象
 
         //处理通知参数
         String body = this.readData(request);
-        log.info("wx notify receive: \n{}", body);
+        log.info("wx notify receive origin: \n{}", body);
 
         //验签
         if (!WXPayUtil.isSignatureValid(body, key)) {
@@ -374,6 +375,7 @@ public class WeixinServiceImpl {
 
         //解析xml数据
         Map<String, String> notifyMap = WXPayUtil.xmlToMap(body);
+        log.info("wx notify receive decode: \n{}", JSONObject.toJSONString(notifyMap));
         //判断通信和业务是否成功
         if (!"SUCCESS".equals(notifyMap.get("return_code")) || !"SUCCESS".equals(notifyMap.get("result_code"))) {
             log.error("失败");
@@ -397,33 +399,33 @@ public class WeixinServiceImpl {
 //        }
 
         //处理订单
-        if (lock.tryLock()) {
-            Order order = new Order();
-            order.setOrderNo(orderNo);
-            List<Order> orders = orderService.selectOrderList(order);
-            if (orders.isEmpty()) {
-                returnMap.put("return_code", "FAIL");
-                returnMap.put("return_msg", "没有该订单");
-                return WXPayUtil.mapToXml(returnMap);
-            }
-            order = orders.get(0);
-            try {
-                //处理重复的通知
-                //接口调用的幂等性：无论接口被调用多少次，产生的结果是一致的。
-                String orderStatus = order.getState();
-                log.info("order current status: {}", orderStatus);
-                if (OrderStatusConstant.Unpaid.equals(orderStatus)) {
-                    //更新订单状态
-                    order.setPayTime(new Date());
-                    order.setState(OrderStatusConstant.Paid);
-                    order.setPickCode(generatePickCode(order));
-                    orderService.updateOrder(order);
-                }
-            } finally {
-                //要主动释放锁
-                lock.unlock();
-            }
+//        if (lock.tryLock()) {
+        Order order = new Order();
+        order.setOrderNo(orderNo);
+        List<Order> orders = orderService.selectOrderList(order);
+        if (orders.isEmpty()) {
+            returnMap.put("return_code", "FAIL");
+            returnMap.put("return_msg", "没有该订单");
+            return WXPayUtil.mapToXml(returnMap);
         }
+        order = orders.get(0);
+//        try {
+        //处理重复的通知
+        //接口调用的幂等性：无论接口被调用多少次，产生的结果是一致的。
+        String orderStatus = order.getState();
+        log.info("order current status: {}", orderStatus);
+        if (OrderStatusConstant.Unpaid.equals(orderStatus)) {
+            //更新订单状态
+            order.setPayTime(new Date());
+            order.setState(OrderStatusConstant.Paid);
+            order.setPickCode(generatePickCode(order));
+            orderService.updateOrder(order);
+        }
+        /*} finally {
+            //要主动释放锁
+            lock.unlock();
+        }*/
+//        }
         returnMap.put("return_code", "SUCCESS");
         returnMap.put("return_msg", "OK");
         String returnXml = WXPayUtil.mapToXml(returnMap);