清機失敗返回訂單編號

component-main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/model/bean/SendSettlement.java

@@ -3,6 +3,8 @@ package com.gingersoft.gsa.cloud.main.mvp.model.bean;
 import java.io.Serializable;
 import java.util.List;
 
+import lombok.Data;
+
 /**
  * 作者：ELEGANT_BIN
  * 版本：1.6.0
@@ -10,9 +12,9 @@ import java.util.List;
  * 修订历史：2020-03-05
  * 描述：
  */
+@Data
 public class SendSettlement {
 
-
     /**
      * success : true
      * sysTime : 1583402463139
@@ -25,139 +27,26 @@ public class SendSettlement {
     private long sysTime;
     private DataBean data;
 
-    public boolean isSuccess() {
-        return success;
-    }
-
-    public void setSuccess(boolean success) {
-        this.success = success;
-    }
-
-    public String getErrCode() {
-        return errCode;
-    }
-
-    public void setErrCode(String errCode) {
-        this.errCode = errCode;
-    }
-
-    public String getErrMsg() {
-        return errMsg;
-    }
-
-    public void setErrMsg(String errMsg) {
-        this.errMsg = errMsg;
-    }
-
-    public long getSysTime() {
-        return sysTime;
-    }
-
-    public void setSysTime(long sysTime) {
-        this.sysTime = sysTime;
-    }
-
-    public DataBean getData() {
-        return data;
-    }
-
-    public void setData(DataBean data) {
-        this.data = data;
-    }
-
+    @Data
     public static class DataBean {
         /**
          * msg : 仍有臺號未結賬,請先結賬;
          * table : ["外4","外2","外1","ceshitai1*","51533","51536","外5","外賣台2","509","510","511","51512","外賣台","102","51534","51531","51529","107","103","21","11A","10A","10","9","8","7","4"]
          */
-
         private String msg;
         private List<String> table;
-
+        //未完結的外賣自取訂單號
+        private String orderNo;
         private String type1;
         private String type2;
         private String type3;
         private List<DateNumBean> dateNum;
-
         private String errCode;
 
-
-        public String getType1() {
-            return type1;
-        }
-
-        public void setType1(String type1) {
-            this.type1 = type1;
-        }
-
-        public String getType2() {
-            return type2;
-        }
-
-        public void setType2(String type2) {
-            this.type2 = type2;
-        }
-
-        public String getType3() {
-            return type3;
-        }
-
-        public void setType3(String type3) {
-            this.type3 = type3;
-        }
-
-        public List<DateNumBean> getDateNum() {
-            return dateNum;
-        }
-
-        public void setDateNum(List<DateNumBean> dateNum) {
-            this.dateNum = dateNum;
-        }
-
-        public String getMsg() {
-            return msg;
-        }
-
-        public void setMsg(String msg) {
-            this.msg = msg;
-        }
-
-        public List<String> getTable() {
-            return table;
-        }
-
-        public void setTable(List<String> table) {
-            this.table = table;
-        }
-
-        public String getErrCode() {
-            return errCode;
-        }
-
-        public void setErrCode(String errCode) {
-            this.errCode = errCode;
-        }
-
+        @Data
         public static class DateNumBean  implements Serializable {
-
             private String date;
             private int num;
-
-            public String getDate() {
-                return date;
-            }
-
-            public void setDate(String date) {
-                this.date = date;
-            }
-
-            public int getNum() {
-                return num;
-            }
-
-            public void setNum(int num) {
-                this.num = num;
-            }
         }
     }
 }

component-main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/presenter/SettlementReportPresenter.java

@@ -3,6 +3,7 @@ package com.gingersoft.gsa.cloud.main.mvp.presenter;
 import android.app.Activity;
 import android.app.Application;
 import android.text.TextUtils;
+
 import com.gingersoft.gsa.cloud.common.bean.BaseResult;
 import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
 import com.gingersoft.gsa.cloud.common.core.settlement.SettlementReport;
@@ -202,6 +203,11 @@ public class SettlementReportPresenter extends BasePresenter<SettlementReportCon
 //                            CommonTipDialog.showDoubtDialog(IActivity, "今天已清機過,是否合併清機", SettlementReportPresenter.class, SettlementReportPresenter.this,
 //                                    "sendSettlement", parameterTypes, parameters);
                             showMergeSettlementDialog(IActivity, "今天已清機過,是否合併清機");
+                        } else if (info.getErrCode().equals("restaurant.operation.0007")) {
+                            SendSettlement.DataBean data = info.getData();
+                            if (data != null) {
+                                showSettlementErrorDialog(info.getErrMsg() + ",清機失敗,仍有訂單未完結，請先結賬\n" + data.getOrderNo());
+                            }
                         } else {
                             if (!TextUtils.isEmpty(info.getErrMsg())) {
                                 showSettlementErrorDialog(info.getErrMsg() + ",清機失敗");