'commit'

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

@@ -4,6 +4,7 @@ import com.charge.task.dao.EquipmentChargeOrderDOMapper;
 import com.charge.task.model.EquipmentChargeOrderDO;
 import com.charge.task.service.AsyncTaskService;
 import com.charge.task.service.HandleOrderTarckService;
+import com.charge.util.ResultVO;
 import com.jfinal.kit.Kv;
 import com.jfinal.kit.StrKit;
 import com.jfinal.plugin.activerecord.Record;
@@ -34,20 +35,20 @@ public class YltControllerForVue {
      * @return
      */
     @PostMapping("/completeUnReportOrderByOrderNo")
-    public Kv completeUnReportOrderByOrderNo(String orderNo) {
+    public ResultVO 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("success", true).set("message", fail_reason);
+        boolean success = true;
         //补单失败,补单异常
         if (!StrKit.isBlank(fail_reason)) {
             if (fail_reason.indexOf("补单失败") >= 0 || fail_reason.indexOf("补单异常") >= 0) {
-                kv.set("success", false);
+                success = false;
             }
         }
-        return kv;
+        return ResultVO.custom(fail_reason, success ? 1000 : -1);
     }
 }
 

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

@@ -7,6 +7,7 @@ import com.charge.task.model.EquipmentChargeOrderDO;
 import com.charge.task.service.AsyncTaskService;
 import com.charge.task.service.HandleOrderTarckService;
 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;
@@ -41,46 +42,35 @@ public class YltControllerForWx {
      * @param order_no
      */
     @PostMapping("/station/isThirdPartyStation")
-    public Kv isThirdPartyStation(String order_no) {
-        Kv kv = Kv.create();
+    public ResultVO isThirdPartyStation(String order_no) {
         Record record = ym.getThirdPartyStation(order_no);
         if (record == null) {
-            kv.set("success", false);
-            kv.set("message", "不在合作的道闸车场内！");
-            return kv;
+            return ResultVO.custom("不在合作的道闸车场内", -1);
         }
-        kv.set("success", true);
-        kv.set("message", "在合作的道闸车场内！");
-        return kv;
+        return ResultVO.custom("在合作的道闸车场内", 1000);
     }
 
     /**
      * 功能：获取用户的车牌列表
      */
     @PostMapping("/station/getCarList")
-    public Kv getCarList(HttpServletRequest request) {
-        Kv kv = Kv.create();
+    public ResultVO getCarList(HttpServletRequest request) {
         //获取当前登录人员信息
         Record user = ym.getUser(request);
         int userId = Integer.parseInt(user.get("userId"));
         List<Record> list = ym.getCarList(userId);
-        kv.set("success", true).set("message", "获取成功！").set("data", list);
-        return kv;
+        return ResultVO.success(list);
     }
 
     /**
      * 功能: 向第三方道闸同步充电桩支付信息
      */
     @PostMapping("/station/SyncChargePilePay")
-    public Kv SyncChargePilePay(String order_no, String charge_plate_no) {
-        Kv kv = Kv.create();
-
+    public ResultVO SyncChargePilePay(String order_no, String charge_plate_no) {
         //根据订单号获取到第三方方面提供的车场信息
         Record thirdPartyStation = ym.getThirdPartyStation(order_no);
         if (thirdPartyStation == null) {
-            kv.set("success", false);
-            kv.set("message", "检查到不是需要免费的道闸所在车场，无需发送减免消息！！");
-            return kv;
+            return ResultVO.custom("检查到不是需要免费的道闸所在车场，无需发送减免消息！！", -1);
         }
         //请求地址
         String url = thirdPartyStation.getStr("third_party_url");
@@ -163,8 +153,7 @@ public class YltControllerForWx {
                         .execute().body(); // 发送请求并获取响应体
                 //记录到数据库中闸机的流水记录
                 ym.recordDzLog(order_no, charge_plate_no, jo.toString(), result);
-                kv.set("success", true).set("message", "已经向科拓闸机平台发送了减免消息！").set("data", JSONObject.parseObject(result));
-                return kv;
+                return ResultVO.success(JSONObject.parseObject(result));
             } else if ("智门科技".equals(name)) {
                 JSONObject jo = new JSONObject();
                 jo.put("Ver", 2);//协议版本
@@ -187,8 +176,7 @@ public class YltControllerForWx {
                         .execute().body(); // 发送请求并获取响应体
                 //记录到数据库中闸机的流水记录
                 ym.recordDzLog(order_no, charge_plate_no, jo.toString(), result);
-                kv.set("success", true).set("message", "已经向智门科技闸机平台发送了减免消息！").set("data", JSONObject.parseObject(result));
-                return kv;
+                return ResultVO.success(JSONObject.parseObject(result));
             }
         }
         return null;