大吉大利+1

app/src/main/java/com/xingdata/zzdpos/ui/help/HelpActivity.java

@@ -9,6 +9,7 @@ import android.view.View;
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.databinding.ActivityHelpBinding;
 import com.xingdata.zzdpos.util.OnClickListener;
+import com.xingdata.zzdpos.util.SystemUtil;
 
 public class HelpActivity extends AppCompatActivity {
     private ActivityHelpBinding mHelpBinding;
@@ -19,6 +20,7 @@ public class HelpActivity extends AppCompatActivity {
         View root = LayoutInflater.from(this).inflate(R.layout.activity_help, null);
         setContentView(root);
         mHelpBinding = DataBindingUtil.bind(root);
+        mHelpBinding.setVersionNo(SystemUtil.getVersionName());
         mHelpBinding.icTitle.tvTitle.setText(R.string.help_hint);
         mHelpBinding.icTitle.setOnClickListener(new OnClickListener() {
             @Override

app/src/main/java/com/xingdata/zzdpos/ui/main/MainPresenter.java

@@ -893,44 +893,7 @@ public class MainPresenter extends MainContract.Presenter {
         }
     }
 
-//    /**
-//     * 更新交班信息
-//     */
-//    private void updateHandover() {
-//        getRealm().beginTransaction();
-//        handoverInfo.setSumOrder(handoverInfo.getSumOrder() + 1);
-//        switch (mPayType) {
-//            case C.PAY_CHANNEL.CASH:
-//                handoverInfo.setCash(handoverInfo.getCash() + mOrderInfo.getOrderPayAmt());
-//                handoverInfo.setFinallyAmt(handoverInfo.getFinallyAmt() + mOrderInfo
-//                        .getOrderPayAmt());
-//                break;
-//            case C.PAY_CHANNEL.WECHAT:
-//                handoverInfo.setWechat(handoverInfo.getWechat() + mOrderInfo.getOrderPayAmt());
-//                handoverInfo.setFinallyAmt(handoverInfo.getFinallyAmt() + mOrderInfo
-//                        .getOrderPayAmt());
-//                break;
-//            case C.PAY_CHANNEL.ALI:
-//                handoverInfo.setAlipay(handoverInfo.getAlipay() + mOrderInfo.getOrderPayAmt());
-//                handoverInfo.setFinallyAmt(handoverInfo.getFinallyAmt() + mOrderInfo
-//                        .getOrderPayAmt());
-//                break;
-//            case C.PAY_CHANNEL.BANK:
-//                handoverInfo.setPos(handoverInfo.getPos() + mOrderInfo.getOrderPayAmt());
-//                handoverInfo.setFinallyAmt(handoverInfo.getFinallyAmt() + mOrderInfo
-//                        .getOrderPayAmt());
-//                break;
-//            case C.PAY_CHANNEL.CARD:
-//                handoverInfo.setVip(handoverInfo.getVip() + mOrderInfo.getOrderPayAmt());
-//                handoverInfo.setFinallyAmt(handoverInfo.getFinallyAmt() + mOrderInfo
-//                        .getOrderPayAmt());
-//                break;
-//            case C.PAY_CHANNEL.TALLY:
-//                break;
-//        }
-//        getRealm().copyToRealmOrUpdate(handoverInfo);
-//        getRealm().commitTransaction();
-//    }
+
 
 
     @Override

app/src/main/java/com/xingdata/zzdpos/ui/main/fragment/MyselfFragment.java

@@ -37,7 +37,7 @@ public class MyselfFragment extends BaseFragment<MainPresenter, FragmentMyselfBi
     @Override
     public void initView() {
         mViewBinding.setOpername(LoginPresenter.loginReturnBean.getOperName());
-        mViewBinding.setPhone(LoginPresenter.loginReturnBean.getOperMobile()+"");
+//        mViewBinding.setPhone(LoginPresenter.loginReturnBean.getOperMobile()+"");
         mViewBinding.setAddress(LoginPresenter.loginReturnBean.getCityProvName()+LoginPresenter.loginReturnBean.getCityCountyName()+LoginPresenter.loginReturnBean.getCityAddress());
         mViewBinding.fragmentMyselfRecycler.setLayoutManager(new LinearLayoutManager(getActivity()));
         integers = new ArrayList<>();

app/src/main/java/com/xingdata/zzdpos/ui/settle/SettlePresenter.java

@@ -5,11 +5,13 @@ import com.blankj.utilcode.util.StringUtils;
 import com.xingdata.zzdpos.C;
 import com.xingdata.zzdpos.api.ApiFactory;
 import com.xingdata.zzdpos.db.DBFactory;
+import com.xingdata.zzdpos.model.HandoverInfo;
 import com.xingdata.zzdpos.model.Ms;
 import com.xingdata.zzdpos.model.Saledetail;
 import com.xingdata.zzdpos.model.Saleorder;
 import com.xingdata.zzdpos.model.Ticket;
 import com.xingdata.zzdpos.model.Vip;
+import com.xingdata.zzdpos.ui.main.MainPresenter;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -18,6 +20,10 @@ import io.reactivex.Observable;
 
 public class SettlePresenter extends SettleContract.Presenter {
 
+    /**
+     * 当前的使用的支付方式
+     */
+    private int mPayType;
     /**
      * 结算模式
      */
@@ -214,23 +220,28 @@ public class SettlePresenter extends SettleContract.Presenter {
 
     @Override
     public void payInCash(Long inputAmt, Long changeAmt) {
+        this.mPayType = C.PAY_CHANNEL.CASH;
         subscribePay(commitOrder().flatMap(orderNo -> ApiFactory.Saleorder.addOrderPayMis(mSaleorder.pay(orderNo, C.PAY_CHANNEL.CASH))));
     }
 
     @Override
     public void payInAli(String payCode) {
+        this.mPayType = C.PAY_CHANNEL.ALI;
     }
 
     @Override
     public void payInWechat(String payCode) {
+        this.mPayType = C.PAY_CHANNEL.WECHAT;
     }
 
     @Override
     public void payInBank() {
+        this.mPayType = C.PAY_CHANNEL.BANK;
     }
 
     @Override
     public void payInCard(Long cardNo, String password) {
+        this.mPayType = C.PAY_CHANNEL.CARD;
         ApiFactory.Recard.checkPwd(mVip.getVipId(), String.valueOf(cardNo), password).subscribe(
                 b -> {
                     mView.dismissPasswordDialog();
@@ -242,6 +253,7 @@ public class SettlePresenter extends SettleContract.Presenter {
 
     @Override
     public void payInTally() {
+        this.mPayType = C.PAY_CHANNEL.TALLY;
     }
 
     @Override
@@ -299,6 +311,7 @@ public class SettlePresenter extends SettleContract.Presenter {
      */
     private void paySucc(Saleorder saleorder) {
         mView.showPaySuccFragment(saleorder);
+        this.updateHandover(MainPresenter.handoverInfo);
     }
 
     /**
@@ -368,5 +381,42 @@ public class SettlePresenter extends SettleContract.Presenter {
         mSaleorder.settle();
         mView.loadSaleorder(mSaleorder);
     }
-
+    /**
+     * 更新交班信息
+     */
+    private void updateHandover(HandoverInfo handoverInfo) {
+        getRealm().beginTransaction();
+        handoverInfo.setSumOrder(handoverInfo.getSumOrder() + 1);
+        switch (mPayType) {
+            case C.PAY_CHANNEL.CASH:
+                handoverInfo.setCash(handoverInfo.getCash() + mSaleorder.getOrderPayAmt());
+                handoverInfo.setFinallyAmt(handoverInfo.getFinallyAmt() + mSaleorder
+                        .getOrderPayAmt());
+                break;
+            case C.PAY_CHANNEL.WECHAT:
+                handoverInfo.setWechat(handoverInfo.getWechat() + mSaleorder.getOrderPayAmt());
+                handoverInfo.setFinallyAmt(handoverInfo.getFinallyAmt() + mSaleorder
+                        .getOrderPayAmt());
+                break;
+            case C.PAY_CHANNEL.ALI:
+                handoverInfo.setAlipay(handoverInfo.getAlipay() + mSaleorder.getOrderPayAmt());
+                handoverInfo.setFinallyAmt(handoverInfo.getFinallyAmt() + mSaleorder
+                        .getOrderPayAmt());
+                break;
+            case C.PAY_CHANNEL.BANK:
+                handoverInfo.setPos(handoverInfo.getPos() + mSaleorder.getOrderPayAmt());
+                handoverInfo.setFinallyAmt(handoverInfo.getFinallyAmt() + mSaleorder
+                        .getOrderPayAmt());
+                break;
+            case C.PAY_CHANNEL.CARD:
+                handoverInfo.setVip(handoverInfo.getVip() + mSaleorder.getOrderPayAmt());
+                handoverInfo.setFinallyAmt(handoverInfo.getFinallyAmt() + mSaleorder
+                        .getOrderPayAmt());
+                break;
+            case C.PAY_CHANNEL.TALLY:
+                break;
+        }
+        getRealm().copyToRealmOrUpdate(handoverInfo);
+        getRealm().commitTransaction();
+    }
 }

app/src/main/java/com/xingdata/zzdpos/ui/statistics/fragment/StatisticsTitleFragment.java

@@ -95,11 +95,19 @@ public class StatisticsTitleFragment extends BaseFragment<StatisticsPresenter, F
             protected void myOnClickListener(View v) {
                 if (mViewBinding.icTitle.edTitle.isFocused()) {
                     mViewBinding.icTitle.edTitle.clearFocus();
-                    return;
+                    return ;
                 }
                 if (mOrderSearchFragment.isAdded()) {
                     FragmentUtils.remove(mOrderSearchFragment);
-                    return;
+                    return ;
+                }
+                if (mRechargeSearchFragment.isAdded()) {
+                    FragmentUtils.remove(mRechargeSearchFragment);
+                    return ;
+                }
+                if (mTicketSearchFragment.isAdded()) {
+                    FragmentUtils.remove(mRechargeSearchFragment);
+                    return ;
                 }
                 pop();
             }
@@ -168,6 +176,10 @@ public class StatisticsTitleFragment extends BaseFragment<StatisticsPresenter, F
             FragmentUtils.remove(mRechargeSearchFragment);
             return true;
         }
+        if (mTicketSearchFragment.isAdded()) {
+            FragmentUtils.remove(mRechargeSearchFragment);
+            return true;
+        }
         mViewBinding.icTitle.edTitle.setText("");
         return false;
 

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

@@ -18,6 +18,7 @@
             android:gravity="center_vertical|center_horizontal"
             android:orientation="horizontal"
             android:paddingTop="@dimen/all_padding"
+            app:tabIndicatorHeight="0dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:tabGravity="fill"
             app:tabSelectedTextColor="@color/red_guanyu"