1、打印积分二维码问题处理

base-module/src/main/java/com/gingersoft/gsa/cloud/base/common/bean/mealManage/MyOrderManage.java

@@ -103,7 +103,7 @@ public class MyOrderManage {
     /**
      * 現在有多少積分
      */
-    private float nowPoint;
+    private float nowPoints;
     /**
      * 結賬積分QRCode
      */
@@ -336,7 +336,7 @@ public class MyOrderManage {
         }
         addPoints = 0;
         oldPoints = 0;
-        nowPoint = 0;
+        nowPoints = 0;
         integralQrcode = "";
         wholeAmount = 0.0;
         totalAmount = 0.0;
@@ -472,12 +472,12 @@ public class MyOrderManage {
         this.oldPoints = oldPoints;
     }
 
-    public float getNowPoint() {
-        return nowPoint;
+    public float getNowPoints() {
+        return nowPoints;
     }
 
-    public void setNowPoint(float nowPoint) {
-        this.nowPoint = nowPoint;
+    public void setNowPoints(float nowPoints) {
+        this.nowPoints = nowPoints;
     }
 
     public String getIntegralQrcode() {

print-module/src/main/java/com/joe/print/mvp/print/PrintBill.java

@@ -103,19 +103,19 @@ public class PrintBill extends PrinterRoot {
         layout.addView(getDiningBillPayMethod(mContext, MyOrderManage.getInstance().getBillMoney()));
         layout.addView(getLine(mContext));
 
-        layout.addView(getTableMealMemberIntegerView(mContext, getOrderDetail(),MyOrderManage.getInstance().getIntegralQrcode()));
+        layout.addView(getTableMealMemberIntegerView(mContext, getOrderMemberInfo(),MyOrderManage.getInstance().getIntegralQrcode()));
 
         return zoomBitmap(deviceBean, viewToBitmap(mContext, layout));
     }
 
 
-    private OrderDetails.DataBean getOrderDetail() {
+    private OrderDetails.DataBean getOrderMemberInfo() {
         OrderDetails.DataBean dataBean = new OrderDetails.DataBean();
         MemberInfo memberInfo = MyOrderManage.getInstance().getMemberInfo();
         if (memberInfo != null) {
             dataBean.setMEMBER_NAME(memberInfo.getMemberName());
             dataBean.setPHONE(memberInfo.getPhone());
-            dataBean.setNowPoints(MyOrderManage.getInstance().getNowPoint());
+            dataBean.setNowPoints(MyOrderManage.getInstance().getNowPoints());
             dataBean.setAddPoints(MyOrderManage.getInstance().getAddPoints());
             dataBean.setOldPoints(MyOrderManage.getInstance().getOldPoints());
         }

print-module/src/main/res/layout/print_model_meal_member_integer_info.xml

@@ -76,8 +76,8 @@
 
        <ImageView
            android:id="@+id/iv_integral_qrcode"
-           android:layout_width="@dimen/dp_180"
-           android:layout_height="@dimen/dp_180"
+           android:layout_width="@dimen/dp_250"
+           android:layout_height="@dimen/dp_250"
            android:layout_marginTop="@dimen/dp_5"/>
 
        <TextView

table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/bean/OrderPayRespose.java

 package com.gingersoft.gsa.cloud.table.mvp.model.bean;
 
+import java.io.Serializable;
+
 import lombok.Data;
 
 /**
@@ -10,7 +12,7 @@ import lombok.Data;
  * 描述：
  */
 @Data
-public class OrderPayRespose {
+public class OrderPayRespose implements Serializable {
 
     /**
      * verifyCode : 387F9C1D8B2AD91B42982C8E50835A8C
@@ -18,12 +20,12 @@ public class OrderPayRespose {
      */
 
     private String verifyCode;
-    //本次加多少積分
+    //本次加减多少積分
     private float addPoints;
-    //之前有多少積分
+    //上次積分
     private float oldPoints;
-    //現在有多少積分
-    private float nowPoint;
+    //结余積分
+    private float nowPoints;
 
 
 }

table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/bean/SoldoutCtrFood.java

 package com.gingersoft.gsa.cloud.table.mvp.model.bean;
 
+import lombok.Data;
+
 /**
  * 作者：ELEGANT_BIN
  * 版本：1.6.0

table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/bean/TableDetail.java

@@ -2,6 +2,8 @@ package com.gingersoft.gsa.cloud.table.mvp.model.bean;
 
 import com.gingersoft.gsa.cloud.base.common.bean.TableBean;
 
+import lombok.Data;
+
 /**
  * 作者：ELEGANT_BIN
  * 版本：1.6.0
@@ -9,6 +11,7 @@ import com.gingersoft.gsa.cloud.base.common.bean.TableBean;
  * 修订历史：2020-02-22
  * 描述：
  */
+@Data
 public class TableDetail {
 
     /**
@@ -22,36 +25,5 @@ public class TableDetail {
     private long sysTime;
     private TableBean.DataBean data;
 
-    public boolean isSuccess() {
-        return success;
-    }
-
-    public void setSuccess(boolean success) {
-        this.success = success;
-    }
-
-    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 TableBean.DataBean getData() {
-        return data;
-    }
-
-    public void setData(TableBean.DataBean data) {
-        this.data = data;
-    }
 
 }

table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/OrderPayPresenter.java

@@ -238,12 +238,12 @@ public class OrderPayPresenter extends BaseOrderPresenter<OrderPayContract.Model
                         if (baseResult.isSuccess()) {
                             OrderPayRespose orderPayRespose = JsonUtils.parseObject(baseResult.getData(), OrderPayRespose.class);
                             if (orderPayRespose != null) {
-                                if(myOrderManage.getMemberInfo() != null){
+                                if (myOrderManage.getMemberInfo() != null) {
                                     MyOrderManage.getInstance().setAddPoints(orderPayRespose.getAddPoints());
-                                    MyOrderManage.getInstance().setNowPoint(orderPayRespose.getNowPoint());
+                                    MyOrderManage.getInstance().setNowPoints(orderPayRespose.getNowPoints());
                                     MyOrderManage.getInstance().setOldPoints(orderPayRespose.getOldPoints());
-                                }else {
-                                    if(!TextUtils.isEmpty(orderPayRespose.getVerifyCode())){
+                                } else {
+                                    if (!TextUtils.isEmpty(orderPayRespose.getVerifyCode())) {
                                         MyOrderManage.getInstance().setIntegralQrcode(orderPayRespose.getVerifyCode());
                                     }
                                 }

table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/orderManager/AllOrderPresenter.java

@@ -100,7 +100,7 @@ public class AllOrderPresenter extends BasePresenter<AllOrderContract.Model, All
         mOrderCenterAdapter.setOnItemClickListener(new OrderCenterAdapter.OnItemClickListener() {
             @Override
             public void onItemClick(OrderDetailItem datasBean, int position) {
-                Intent intent = new Intent(GsaCloudApplication.getAppContext(), OrderDetailActivity.class);
+                Intent intent = new Intent(IActivity, OrderDetailActivity.class);
                 intent.putExtra("orderDetailItem", datasBean);
                 mRootView.launchActivity(intent);
             }