'commit'

Ylt/ms-task/src/main/java/com/charge/task/TaskApplication.java

@@ -24,13 +24,4 @@ public class TaskApplication {
 	public String index() {
 		return "Hello,task micro service!!!";
 	}
-
-
-	/*@Bean
-	public FilterRegistrationBean filterRegist() {
-		FilterRegistrationBean frBean = new FilterRegistrationBean();
-		frBean.setFilter(new CorsFilter());
-		frBean.addUrlPatterns("/*");
-		return frBean;
-	}*/
 }

Ylt/ms-task/src/main/java/com/charge/task/controller/YltController.java

@@ -10,6 +10,7 @@ import com.charge.util.CommonUtil;
 import com.charge.util.ResultVO;
 import com.charge.util.SignUtils;
 import com.jfinal.kit.Kv;
+import com.jfinal.kit.StrKit;
 import com.jfinal.plugin.activerecord.Record;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -42,14 +43,20 @@ public class YltController {
      * @return
      */
     @PostMapping("/completeUnReportOrderByOrderNo")
-    public ResultVO completeUnReportOrderByOrderNo(String orderNo) {
+    public Kv completeUnReportOrderByOrderNo(String orderNo) {
         //查询挂起订单
         EquipmentChargeOrderDO hangUpOrder = equipmentChargeOrderDOMapper.queryChargeOrderByOrderNo(orderNo);
         asyncTaskService.completeUnReportOrder(hangUpOrder);
         Record record = ym.getLastUnReportOrderByOrderNoTrack(orderNo);
         String fail_reason = record.getStr("fail_reason");
-        Kv kv = Kv.by("msg", fail_reason);
-        return ResultVO.success(kv);
+        Kv kv = Kv.by("success", true).set("message", fail_reason);
+        //补单失败,补单异常
+        if (!StrKit.isBlank(fail_reason)) {
+            if (fail_reason.indexOf("补单失败") >= 0 || fail_reason.indexOf("补单异常") >= 0) {
+                kv.set("success", false);
+            }
+        }
+        return kv;
     }
 
     /**
@@ -81,11 +88,10 @@ public class YltController {
         Record user = ym.getUser(request);
         int userId = Integer.parseInt(user.get("userId"));
         List<Record> list = ym.getCarList(userId);
-        kv.set("success", true);
-        kv.set("message", "获取成功！");
-        kv.set("data", list);
+        kv.set("success", true).set("message", "获取成功！").set("data", list);
         return kv;
     }
+
     /**
      * 功能: 向第三方道闸同步充电桩支付信息
      */
@@ -205,7 +211,7 @@ public class YltController {
                         .execute().body(); // 发送请求并获取响应体
                 //记录到数据库中闸机的流水记录
                 ym.recordDzLog(order_no, charge_plate_no, jo.toString(), result);
-                kv.set("success",true).set("message","已经向智门科技闸机平台发送了减免消息！").set("data",JSONObject.parseObject(result));
+                kv.set("success", true).set("message", "已经向智门科技闸机平台发送了减免消息！").set("data", JSONObject.parseObject(result));
                 return kv;
             }
         }