订单回调逻辑完善

src/main/java/com/usky/dxtop/service/api/TopApi.java

@@ -47,7 +47,7 @@ public class TopApi {
     /**
      * 回调url
      */
-    public static final String SCAN_NOTIFY_URL = "https://wx.ewoogi.com/top/notify";
+    public static final String SCAN_NOTIFY_URL = "https://wx.ewoogi.com/dxapi/top/notify";
 
 
 

src/main/java/com/usky/dxtop/service/impl/OrderServiceImpl.java

@@ -223,14 +223,20 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
     @Override
     public void checkOrder(Order order,String result){
         JSONObject obj= JSON.parseObject(result);
-        if ("成功".equals(obj.get("status"))){
-            paySuccess(order);
-        }else if ("等待中".equals(obj.get("status"))){
-            payWaiting(order);
-        }else if ("交易订单不存在".equals(obj.get("status"))){
-            dealNo(order);
+        if ("0000".equals(obj.get("status"))){
+            //交易成功
+            if ("2".equals(obj.get("trxstatus"))) {
+                paySuccess(order);
+            }else if ("0".equals(obj.get("trxstatus"))){
+                //交易等待
+                payWaiting(order);
+            }else {
+                payError(order);
+            }
         }else {
-            payError(order);
+            if (!"交易订单不存在".equals(obj.get("errorMessage"))){
+                payError(order);
+            }
         }
     }