From 46eed722cd0431aa433bea2470b23015b8d83b3e Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期一, 21 二月 2022 10:03:25 +0800
Subject: [PATCH] 优化三亚物业 临时收费问题

---
 java110-bean/src/main/java/com/java110/vo/ResultVo.java |   62 ++++++++++++++++++++++++++++++-
 1 files changed, 60 insertions(+), 2 deletions(-)

diff --git a/java110-bean/src/main/java/com/java110/vo/ResultVo.java b/java110-bean/src/main/java/com/java110/vo/ResultVo.java
old mode 100644
new mode 100755
index 06c4976..8eb7044
--- a/java110-bean/src/main/java/com/java110/vo/ResultVo.java
+++ b/java110-bean/src/main/java/com/java110/vo/ResultVo.java
@@ -28,6 +28,7 @@
 
     public static final int CODE_UNAUTHORIZED = 401; //璁よ瘉澶辫触
     public static final int CODE_WECHAT_UNAUTHORIZED = 1401; //璁よ瘉澶辫触
+    public static final int CODE_BUSINESS_VERIFICATION = 5010; //涓氬姟鏍￠獙鏈�氳繃
 
     public static final int ORDER_ERROR = 500; //璁㈠崟璋冨害寮傚父
 
@@ -41,6 +42,10 @@
     public static final int DEFAULT_RECORD = 1;
     public static final int DEFAULT_TOTAL = 1;
 
+    public static final int CODE_WAIT_PAY = 41;// 鏀粯鏈畬鎴�
+
+    public static final String EMPTY_ARRAY = "[]";
+
     // 鍒嗛〉椤垫暟
     private int page;
     // 琛屾暟
@@ -50,7 +55,7 @@
     private int records;
 
     // 鎬昏褰曟暟
-    private int total;
+    private long total;
 
     //鐘舵��
     private int code;
@@ -63,6 +68,9 @@
 
     //鐢ㄦ潵瀛樻斁澶ц銆佸皬璁￠噾棰�
     private Object sumTotal;
+
+    //鎵�闇�鏁版嵁
+    private Object rep;
 
     public ResultVo() {
     }
@@ -86,6 +94,14 @@
         this.data = data;
     }
 
+    public ResultVo(int records, long total, Object data) {
+        this.code = CODE_OK;
+        this.msg = MSG_OK;
+        this.records = records;
+        this.total = total;
+        this.data = data;
+    }
+
     public ResultVo(int records, int total, Object data, Object sumTotal) {
         this.code = CODE_OK;
         this.msg = MSG_OK;
@@ -93,6 +109,16 @@
         this.total = total;
         this.data = data;
         this.sumTotal = sumTotal;
+    }
+
+    public ResultVo(int records, int total, Object data, Object sumTotal, Object rep) {
+        this.code = CODE_OK;
+        this.msg = MSG_OK;
+        this.records = records;
+        this.total = total;
+        this.data = data;
+        this.sumTotal = sumTotal;
+        this.rep = rep;
     }
 
     public ResultVo(int code, String msg, Object data) {
@@ -133,7 +159,7 @@
         this.records = records;
     }
 
-    public int getTotal() {
+    public long getTotal() {
         return total;
     }
 
@@ -171,6 +197,14 @@
 
     public void setSumTotal(Object sumTotal) {
         this.sumTotal = sumTotal;
+    }
+
+    public Object getRep() {
+        return rep;
+    }
+
+    public void setRep(Object rep) {
+        this.rep = rep;
     }
 
     @Override
@@ -218,8 +252,30 @@
      *
      * @return
      */
+    public static ResponseEntity<String> error(String msg,HttpStatus status) {
+        ResultVo resultVo = new ResultVo(CODE_ERROR, msg);
+        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), status);
+        return responseEntity;
+    }
+
+    /**
+     * 鎴愬姛閫氱敤鍥炲
+     *
+     * @return
+     */
     public static ResponseEntity<String> error(String msg) {
         ResultVo resultVo = new ResultVo(CODE_ERROR, msg);
+        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+        return responseEntity;
+    }
+
+    /**
+     * 鎴愬姛閫氱敤鍥炲
+     *
+     * @return
+     */
+    public static ResponseEntity<String> error(String msg,Object data) {
+        ResultVo resultVo = new ResultVo(CODE_ERROR, msg,data);
         ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
         return responseEntity;
     }
@@ -308,4 +364,6 @@
         ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
         return responseEntity;
     }
+
+
 }

--
Gitblit v1.8.0