收银;

app/src/main/java/com/xingdata/zzdpos/ui/settle/fragment/SettleFragment.java

@@ -77,21 +77,11 @@ public class SettleFragment extends BaseFragment<SettlePresenter, FragmentSettle
      * @param vip 会员信息
      */
     public void loadVip(Vip vip) {
-        if (vip.isDefaultVip()) {
-            for (int i = 0; i < mPayAdapter.getData().size(); i++) {
-                if (mPayAdapter.getData().get(i).isNeedVip()) mPayAdapter.remove(i);
-            }
-        } else {
-            for (int i = 0; i < mPays.size(); i++) {
-                if (mPays.get(i).isNeedVip() && (mPays.get(i).getPayType() != C.PAY_CHANNEL.CARD || vip.getAcctCbal() > mViewBinding.getOrderPayAmt())) {
-                    mPayAdapter.addData(mPays.get(i));
-                }
-            }
-        }
+        mPayAdapter.setNewData(getAvlPays(vip));
 
         mViewBinding.setDefualtVip(vip.isDefaultVip());
         mViewBinding.setName(vip.getVipName());
-        mViewBinding.setPhone(ConvertUtil.longToString(vip.getVipMobile()));
+        mViewBinding.setPhone(vip.getVipMobile());
         mViewBinding.setBalance(vip.getAcctCbal());
         mViewBinding.cbPoint.setChecked(false);
 
@@ -141,14 +131,21 @@ public class SettleFragment extends BaseFragment<SettlePresenter, FragmentSettle
      * 加载支付方式
      */
     public void loadPays(List<Pay> pays) {
-        mPays.addAll(pays);
-        List<Pay> _pays = new ArrayList<>();
         for (int i = 0; i < pays.size(); i++) {
             pays.get(i).init();
-            if (!pays.get(i).isNeedVip()) _pays.add(pays.get(i));
         }
-        mPayAdapter.setNewData(_pays);
+        mPays.addAll(pays);
+        mPayAdapter.setNewData(getAvlPays(Vip.createDefault()));
     }
 
 
+    List<Pay> getAvlPays(Vip vip) {
+        List<Pay> _pays = new ArrayList<>();
+        for (int i = 0; i < mPays.size(); i++) {
+            if (!mPays.get(i).isNeedVip() || (!vip.isDefaultVip() && (mPays.get(i).getPayType() != C.PAY_CHANNEL.CARD || vip.getAcctCbal() >= mViewBinding.getOrderPayAmt())))
+                _pays.add(mPays.get(i));
+        }
+        return _pays;
+    }
+
 }

app/src/main/res/layout/fragment_settle.xml

@@ -27,7 +27,7 @@
 
         <variable
             name="phone"
-            type="String" />
+            type="long" />
 
         <variable
             name="disRate"
@@ -127,7 +127,7 @@
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="@{phone}"
+                            android:text="@{ConvertUtil.longToString(phone)}"
                             android:textColor="@color/black_likui"
                             android:textSize="@dimen/all_caption_size" />
                     </LinearLayout>