提交2。0代码

hai-order/src/main/java/com/web/controller/notify/MobileRechargeNotifyController.java

@@ -200,7 +200,7 @@ public class MobileRechargeNotifyController {
             dataObject.put("out_order_id" , out_order_id);
             dataObject.put("orderid" , orderid);
             dataObject.put("return_time" , return_time);
-            dataObject.put("return_price" , mchid);
+            dataObject.put("return_price" , return_price);
             dataObject.put("recharge_price" , recharge_price);
             dataObject.put("price" , price);
             dataObject.put("status" , status);
@@ -255,7 +255,7 @@ public class MobileRechargeNotifyController {
             response.setCharacterEncoding("UTF-8");
             response.setContentType("text/html;charset=utf-8");
             PrintWriter writer= response.getWriter();
-            writer.write("SUCCESS");
+            writer.write("success");
 
 
         } catch (Exception e) {

hai-schedule/src/main/java/com/hai/schedule/HighRechargeOrderSchedule.java

@@ -167,17 +167,24 @@ public class HighRechargeOrderSchedule {
                         if (outRechargeOrder.getOutRechargeChildOrders().get(0).getRechargePlatform() == 4) {
                             object.put("orderid" , outRechargeOrder.getOutRechargeChildOrders().get(0).getOrderNo());
 
-                            JSONObject objectData = RechargeConfig.checkOrderByHg(object);
+                            JSONObject jsonObject = RechargeConfig.checkOrderByHg(object);
-
+                            if (jsonObject.getJSONArray("data") == null) {
-                            //（0充值中1成功2失败3已取消4部分充值5缓存订单）
-                            if (!(objectData.getInteger("status") == 1 || objectData.getInteger("status") == 0 ||  objectData.getInteger("status") == 4)) {
                                 outRechargeOrderService.refundOrder(outRechargeOrder.getId() , outRechargeOrder.getOutRechargeChildOrders().get(0));
+                            } else {
+                                JSONArray objectJSONArray = jsonObject.getJSONArray("data");
+                                JSONObject objectData;
+                                for (Object objects : objectJSONArray) {
+                                    objectData =  (JSONObject) objects;
+                                    // -1取消，0充值中 ，1充值成功，2充值失败，3部分成功
+                                    if (!(objectData.getInteger("status") == 1 || objectData.getInteger("status") == 0 ||  objectData.getInteger("status") == 4)) {
+                                        outRechargeOrderService.refundOrder(outRechargeOrder.getId() , outRechargeOrder.getOutRechargeChildOrders().get(0));
+                                    }
+                                }
                             }
                         }
                     }
                 }
 
-
             }
 
         }