修復店員BUG

app/src/main/java/com/xingdata/zzdpos/C.java

@@ -79,7 +79,7 @@ public class C {
         /**
          * 地址
          */
-        public static final String BASE_URL = URL_DEMO;
+        public static final String BASE_URL = URL_TEST;
 
         private static final String PKG = "/tk/";
 

app/src/main/java/com/xingdata/zzdpos/ui/manage/user/UserActivity.java

@@ -41,8 +41,7 @@ public class UserActivity extends BaseActivity<UserPresenter, ActivityUserBindin
     }
 
     @Override
-    public void updateUserSus(Oper oper)
-    {
+    public void updateUserSus(Oper oper) {
         ToastUtils.showShort("修改成功");
         mPresenter.userListFragment.updateUserSus(oper);
     }
@@ -58,6 +57,11 @@ public class UserActivity extends BaseActivity<UserPresenter, ActivityUserBindin
         mPresenter.userListSearchFragment.searchOperSus(operPager);
     }
 
+    @Override
+    public void searchError() {
+        mPresenter.userListFragment.searchError();
+    }
+
     @Override
     public boolean dispatchTouchEvent(MotionEvent ev) {
         Global.clickHideKeyboard(ev, this);

app/src/main/java/com/xingdata/zzdpos/ui/manage/user/UserContract.java

@@ -26,6 +26,7 @@ public interface UserContract {
         void updateUserSus(Oper oper);
         void delUserSus();
         void searchOperSus(Pager<Oper> operPager);
+        void searchError();
     }
 
     abstract class Presenter extends BasePresenter<View> {

app/src/main/java/com/xingdata/zzdpos/ui/manage/user/UserPresenter.java

@@ -4,6 +4,7 @@ package com.xingdata.zzdpos.ui.manage.user;
 import com.blankj.utilcode.util.ToastUtils;
 import com.xingdata.zzdpos.api.ApiFactory;
 import com.xingdata.zzdpos.model.Oper;
+import com.xingdata.zzdpos.ui.login.LoginPresenter;
 import com.xingdata.zzdpos.ui.manage.user.dialog.UserMenuDialog;
 import com.xingdata.zzdpos.ui.manage.user.fragment.UserInfoEditFragment;
 import com.xingdata.zzdpos.ui.manage.user.fragment.UserInfoFragment;
@@ -52,9 +53,9 @@ public class UserPresenter extends UserContract.Presenter {
     public void getUserList(String wd) {
         ApiFactory.Oper.queryOper(wd).subscribe(operPager -> {
 
-            if (wd==null){
+            if (wd == null) {
                 mView.queryOperSus(operPager);
-            }else {
+            } else {
                 mView.searchOperSus(operPager);
             }
         }, throwable -> {
@@ -108,12 +109,38 @@ public class UserPresenter extends UserContract.Presenter {
 //    }
 
 
+//    public List<String> getOperLevelList() {
+//        ArrayList<String> operLevelList = new ArrayList<>();
+//        Iterator<Map.Entry<String, String>> iterator = operLevel.entrySet().iterator();
+//        while (iterator.hasNext()) {
+//            operLevelList.add(iterator.next().getKey());
+//        }
+//        return operLevelList.subList(0, operLevelList.size() - 1);
+//    }
+
+    /**
+     * 获取下拉列表
+     * @return
+     */
     public List<String> getOperLevelList() {
         ArrayList<String> operLevelList = new ArrayList<>();
         Iterator<Map.Entry<String, String>> iterator = operLevel.entrySet().iterator();
         while (iterator.hasNext()) {
-            operLevelList.add(iterator.next().getKey());
+            Map.Entry entity = iterator.next();
+            int inOperLevel = Integer.parseInt(entity.getValue().toString());
+            if (inOperLevel < LoginPresenter.loginReturnBean.getOperLevel()) {
+                operLevelList.add(entity.getKey().toString());
             }
-        return operLevelList.subList(0, operLevelList.size() - 1);
+        }
+        return operLevelList;
+    }
+
+    /**
+     * 判断是否有权限编辑店员
+     * @param oper  编辑的店员级别
+     * @return
+     */
+    public boolean isEdit(Oper oper) {
+        return oper!=null&&LoginPresenter.loginReturnBean.getOperLevel() > oper.getOperLevel() && LoginPresenter.loginReturnBean.getOperLevel() != 1;
     }
 }

app/src/main/java/com/xingdata/zzdpos/ui/manage/user/fragment/UserInfoEditFragment.java

@@ -4,34 +4,18 @@ package com.xingdata.zzdpos.ui.manage.user.fragment;
  * Created by JM_DEV on 2017/12/21.
  */
 
-import android.app.DatePickerDialog;
 import android.graphics.Color;
 import android.view.View;
-import android.widget.CheckBox;
-import android.widget.DatePicker;
-import android.widget.RadioButton;
-import android.widget.TextView;
 
 import com.bigkoo.pickerview.OptionsPickerView;
 import com.blankj.utilcode.util.ToastUtils;
 import com.xingdata.zzdpos.R;
-import com.xingdata.zzdpos.base.BaseActivity;
 import com.xingdata.zzdpos.base.BaseFragment;
 import com.xingdata.zzdpos.databinding.FragmentUserInfoEditBinding;
-import com.xingdata.zzdpos.databinding.FragmentVipInfoEditBinding;
-import com.xingdata.zzdpos.model.Level;
 import com.xingdata.zzdpos.model.Oper;
-import com.xingdata.zzdpos.model.Vip;
 import com.xingdata.zzdpos.ui.manage.user.UserPresenter;
-import com.xingdata.zzdpos.ui.manage.user.dialog.UserMenuDialog;
-import com.xingdata.zzdpos.ui.vip.VipPresenter;
-import com.xingdata.zzdpos.ui.vip.dialog.VipEditMenuDialog;
-import com.xingdata.zzdpos.util.ConvertUtil;
-import com.xingdata.zzdpos.util.StringUtil;
-
-import java.util.Calendar;
-import java.util.Date;
-import java.util.LinkedHashMap;
+
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -39,6 +23,7 @@ import java.util.List;
  */
 public class UserInfoEditFragment extends BaseFragment<UserPresenter, FragmentUserInfoEditBinding> {
     private Oper oper;
+    private List<String> strLevels;
 
     public void setOper(Oper oper) {
         this.oper = oper;
@@ -78,7 +63,7 @@ public class UserInfoEditFragment extends BaseFragment<UserPresenter, FragmentUs
                         ToastUtils.showShort("店员帐号不能为空");
                         return;
                     }
-                    if (mViewBinding.userPhone.getText().length() !=11) {
+                    if (mViewBinding.userPhone.getText().length() != 11) {
                         ToastUtils.showShort("店员帐号长度必须11位");
                         return;
                     }
@@ -91,7 +76,7 @@ public class UserInfoEditFragment extends BaseFragment<UserPresenter, FragmentUs
                     mOper.setOperLevel(Byte.valueOf(mPresenter.operLevel.get(mViewBinding.userLevel.getText().toString())));
                     mOper.setOperMobile(Long.parseLong(mViewBinding.userPhone.getText().toString()));
                     mOper.setOperName(mViewBinding.userName.getText().toString());
-                    if (oper==null) {
+                    if (oper == null) {
                         mPresenter.addUser(mOper);
                     } else {
                         mOper.setOperId(oper.getOperId());
@@ -103,6 +88,12 @@ public class UserInfoEditFragment extends BaseFragment<UserPresenter, FragmentUs
         mViewBinding.infoTitle.ivBack.setOnClickListener(view -> {
             pop();
         });
+        strLevels = mPresenter.getOperLevelList();
+        if (strLevels.size()!=0){
+            mViewBinding.userLevel.setText(strLevels.get(strLevels.size()-1));
+        }
+
+
 
 
     }
@@ -116,7 +107,7 @@ public class UserInfoEditFragment extends BaseFragment<UserPresenter, FragmentUs
                 OptionsPickerView.OnOptionsSelectListener() {
                     @Override
                     public void onOptionsSelect(int options1, int options2, int options3, View v) {
-                        mViewBinding.userLevel.setText(mPresenter.getOperLevelList().get(options1));
+                        mViewBinding.userLevel.setText(strLevels.get(options1));
                     }
                 }).setTitleText("请选择")
                 .setDividerColor(Color.BLACK)
@@ -124,7 +115,7 @@ public class UserInfoEditFragment extends BaseFragment<UserPresenter, FragmentUs
                 .setContentTextSize(20)
                 .build();
 
-        pvOptions.setPicker(mPresenter.getOperLevelList());
+        pvOptions.setPicker(strLevels);
         pvOptions.show();
     }
 
@@ -134,5 +125,4 @@ public class UserInfoEditFragment extends BaseFragment<UserPresenter, FragmentUs
         return false;
     }
 
-
 }

app/src/main/java/com/xingdata/zzdpos/ui/manage/user/fragment/UserInfoFragment.java

@@ -12,10 +12,8 @@ import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseActivity;
 import com.xingdata.zzdpos.base.BaseFragment;
 import com.xingdata.zzdpos.databinding.FragmentUserInfoBinding;
-import com.xingdata.zzdpos.databinding.FragmentUserInfoEditBinding;
 import com.xingdata.zzdpos.model.Oper;
 import com.xingdata.zzdpos.ui.manage.user.UserPresenter;
-import com.xingdata.zzdpos.ui.manage.user.dialog.UserMenuDialog;
 
 /**
  * 会员信息界面
@@ -41,7 +39,7 @@ public class UserInfoFragment extends BaseFragment<UserPresenter, FragmentUserIn
         mViewBinding.setOnClickListener(view -> {
             switch (view.getId()) {
                 case R.id.user_Level:
-                    ShowPickerViewStoreAddress();
+//                    ShowPickerViewStoreAddress();
                     break;
 
                 case R.id.onSure:
@@ -62,6 +60,7 @@ public class UserInfoFragment extends BaseFragment<UserPresenter, FragmentUserIn
         mViewBinding.infoTitle.ivBack.setOnClickListener(view -> {
             pop();
         });
+        mViewBinding.infoTitle.popMenu.setVisibility(mPresenter.isEdit(oper) ? View.VISIBLE : View.GONE);
         mViewBinding.infoTitle.popMenu.setOnClickListener(view -> {
             mPresenter.userMenuDialog.setOper(oper);
             mPresenter.userMenuDialog.show((BaseActivity) getActivity());
@@ -69,26 +68,26 @@ public class UserInfoFragment extends BaseFragment<UserPresenter, FragmentUserIn
 
     }
 
-
-    /**
-     * 弹出选择会员P
-     */
-    private void ShowPickerViewStoreAddress() {// 弹出选择器
-        OptionsPickerView pvOptions = new OptionsPickerView.Builder(getActivity(), new
-                OptionsPickerView.OnOptionsSelectListener() {
-                    @Override
-                    public void onOptionsSelect(int options1, int options2, int options3, View v) {
-                        mViewBinding.userLevel.setText(mPresenter.getOperLevelList().get(options1));
-                    }
-                }).setTitleText("请选择")
-                .setDividerColor(Color.BLACK)
-                .setTextColorCenter(Color.BLACK) //设置选中项文字颜色
-                .setContentTextSize(20)
-                .build();
-
-        pvOptions.setPicker(mPresenter.getOperLevelList());
-        pvOptions.show();
-    }
+//
+//    /**
+//     * 弹出选择会员P
+//     */
+//    private void ShowPickerViewStoreAddress() {// 弹出选择器
+//        OptionsPickerView pvOptions = new OptionsPickerView.Builder(getActivity(), new
+//                OptionsPickerView.OnOptionsSelectListener() {
+//                    @Override
+//                    public void onOptionsSelect(int options1, int options2, int options3, View v) {
+//                        mViewBinding.userLevel.setText(mPresenter.getOperLevelList().get(options1));
+//                    }
+//                }).setTitleText("请选择")
+//                .setDividerColor(Color.BLACK)
+//                .setTextColorCenter(Color.BLACK) //设置选中项文字颜色
+//                .setContentTextSize(20)
+//                .build();
+//
+//        pvOptions.setPicker(mPresenter.getOperLevelList());
+//        pvOptions.show();
+//    }
 
 
     @Override

app/src/main/java/com/xingdata/zzdpos/ui/manage/user/fragment/UserListFragment.java

@@ -115,4 +115,12 @@ public class UserListFragment extends BaseFragment<UserPresenter, FragmentUserLi
         onRefresh();
     }
 
+
+    public void searchError() {
+        adapter.setNewData(null);
+        adapter.setEnableLoadMore(false);
+        adapter.loadMoreComplete();
+        mViewBinding.userRefresh.setRefreshing(false);
+    }
+
 }

app/src/main/java/com/xingdata/zzdpos/ui/vip/VipActivity.java

@@ -104,9 +104,9 @@ public class VipActivity extends BaseActivity<VipPresenter, ActivityVipBinding>
     @Override
     public void rechangeSus(Vip v) {
         ViewTools.toastSuss(this, "充值成功");
-        if ( mPresenter.vipSearchFragment!=null)pop();
+        if (mPresenter.vipSearchFragment != null) pop();
 //        if ( mPresenter.vipRechargeFragment!=null)pop();
-        popTo(mPresenter.vipListFragment.getClass(),false);
+        popTo(mPresenter.vipListFragment.getClass(), false);
         mPresenter.vipListFragment.onRefresh();
     }
 
@@ -123,6 +123,11 @@ public class VipActivity extends BaseActivity<VipPresenter, ActivityVipBinding>
                 }).show(this);
     }
 
+    @Override
+    public void rechangListerror() {
+        mPresenter.vipRechargeListFragment.rechangListerror();
+    }
+
 
     @Override
     public void getVipLevelSus(Pager<Level> levelPager) {

app/src/main/java/com/xingdata/zzdpos/ui/vip/VipContract.java

@@ -44,6 +44,7 @@ public interface VipContract {
         void loadPays(List<Pay> pays);
         void rechangeSus(Vip v);
         void rechangeErr(Vip v, Long amtPay, Long amtSend,String mes);
+        void rechangListerror();
 
     }
 

app/src/main/java/com/xingdata/zzdpos/ui/vip/VipPresenter.java

@@ -124,6 +124,7 @@ public class VipPresenter extends VipContract.Presenter {
         ApiFactory.Rctrace.queryRecharge(vipID, number, 10).subscribe(rechargeOrderPager -> {
             mView.getRechargeOrderSus(rechargeOrderPager);
         }, throwable -> {
+            mView.rechangListerror();
             ToastUtils.showShort(throwable.getMessage());
         });
 

app/src/main/java/com/xingdata/zzdpos/ui/vip/adapter/VipRechargeAdapter.java

@@ -35,7 +35,7 @@ public class VipRechargeAdapter extends BaseAdapter<VipRechargeOrder, ItemVipExp
         mViewBinding.expenseMoney.setText(ConvertUtil.fenToYuan2(item.getCardAmtPay()));
         mViewBinding.expenseShop.setText(LoginPresenter.loginReturnBean.getShopNameAbcn());
         //设置支付方式
-//        mViewBinding.expenseType.setText(item.getPayName());
+//        mViewBinding.expenseType.setText(item.getP);
 //        mViewBinding.imgLeft.setBackgroundResource(getPayName(item));
         mViewBinding.expenseTime.setText(StringUtil.format(new Date(item.getCreateTime()),StringUtil.mmddhhmmmDatePattern));
     }

app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipRechargeListFragment.java

@@ -107,4 +107,14 @@ public class VipRechargeListFragment extends BaseFragment<VipPresenter, Fragment
         mViewBinding.rechargeRefresh.setRefreshing(false);
 
     }
+
+
+    public void rechangListerror() {
+        vipRechargeAdapter.setNewData(null);
+        vipRechargeAdapter.setEnableLoadMore(false);
+        vipRechargeAdapter.loadMoreComplete();
+        mViewBinding.rechargeRefresh.setRefreshing(false);
+    }
+
+
 }

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

@@ -34,7 +34,7 @@
                     style="@style/default_blacktext_no_margin_smallstyle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="" />
+                    android:text="现金" />
 
                 <TextView
                     android:id="@+id/expense_time"