无码商品收款;

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

@@ -428,6 +428,7 @@ public class C {
 
     public final class SP_KEY {
         public static final String IS_SHOW_SIGNUP_BTN = "showbtn";
+        public static final String SETTLE_MODE = "settle.mode";
     }
 
     public final class RETURN_CODE {
@@ -467,6 +468,9 @@ public class C {
 
         //共享fragment功能确定
         public static final String STARTOBJECT = "startobject";
+
+        //添加无码商品
+        public static final String ADD_NO_BARCODE_SKU = "add.no.barcode.sku";
     }
 
     public final class EXTRA_KEY {

app/src/main/java/com/xingdata/zzdpos/ui/payment/PaymentActivity.java

@@ -5,6 +5,7 @@ import android.view.MotionEvent;
 
 import com.blankj.utilcode.util.ActivityUtils;
 import com.blankj.utilcode.util.ToastUtils;
+import com.hwangjr.rxbus.RxBus;
 import com.xingdata.zzdpos.C;
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseActivity;
@@ -24,7 +25,7 @@ public class PaymentActivity extends BaseActivity<PaymentPresenter, ActivityPaym
 
     @Override
     public void initView() {
-        loadRootFragment(R.id.f_payment, mPaymentFragment);
+        loadRootFragment(R.id.f_payment, mPaymentFragment, false, false);
         mViewBinding.btnBack.setOnClickListener(view -> onBackPressedSupport());
     }
 
@@ -42,6 +43,12 @@ public class PaymentActivity extends BaseActivity<PaymentPresenter, ActivityPaym
         ActivityUtils.startActivity(intent);
     }
 
+    @Override
+    public void addNoBarcodeSku(Long amt) {
+        RxBus.get().post(C.EVENT_TAGS.ADD_NO_BARCODE_SKU, amt);
+        this.finish();
+    }
+
     @Override
     public boolean dispatchTouchEvent(MotionEvent ev) {
         Global.clickHideKeyboard(ev, this);

app/src/main/java/com/xingdata/zzdpos/ui/payment/PaymentContract.java

@@ -17,8 +17,17 @@ interface PaymentContract {
 
         /**
          * 显示结算页面
+         *
+         * @param amt 金额
          */
         void showSettle(Long amt);
+
+        /**
+         * 添加无码商品
+         *
+         * @param amt 金额
+         */
+        void addNoBarcodeSku(Long amt);
     }
 
     abstract class Presenter extends BasePresenter<View> {

app/src/main/java/com/xingdata/zzdpos/ui/payment/PaymentPresenter.java

 package com.xingdata.zzdpos.ui.payment;
 
 
+import com.xingdata.zzdpos.C;
+
 public class PaymentPresenter extends PaymentContract.Presenter {
+
+    private int mSettleMode;
+
     @Override
     public void onAttached() {
+        mSettleMode = getIntent().getIntExtra(C.SP_KEY.SETTLE_MODE, C.SETTLE_MODE.PAYMENT);
     }
 
     @Override
@@ -11,7 +17,14 @@ public class PaymentPresenter extends PaymentContract.Presenter {
         if (amt > 99999999999L || amt <= 0) {
             mView.showMsg("您填写的金额超出范围");
         } else {
-            mView.showSettle(amt);
+            switch (mSettleMode) {
+                case C.SETTLE_MODE.PAYMENT:
+                    mView.showSettle(amt);
+                    break;
+                case C.SETTLE_MODE.STORE:
+                    mView.addNoBarcodeSku(amt);
+                    break;
+            }
         }
     }
 }

app/src/main/java/com/xingdata/zzdpos/ui/store/StoreActivity.java

@@ -12,6 +12,9 @@ import com.blankj.utilcode.constant.PermissionConstants;
 import com.blankj.utilcode.util.ActivityUtils;
 import com.blankj.utilcode.util.PermissionUtils;
 import com.blankj.utilcode.util.ToastUtils;
+import com.hwangjr.rxbus.annotation.Subscribe;
+import com.hwangjr.rxbus.annotation.Tag;
+import com.hwangjr.rxbus.thread.EventThread;
 import com.xingdata.zzdpos.C;
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseActivity;
@@ -22,6 +25,7 @@ import com.xingdata.zzdpos.model.Pager;
 import com.xingdata.zzdpos.model.Saledetail;
 import com.xingdata.zzdpos.model.Saleorder;
 import com.xingdata.zzdpos.model.Sskugrp;
+import com.xingdata.zzdpos.ui.payment.PaymentActivity;
 import com.xingdata.zzdpos.ui.scan.ScanFragment;
 import com.xingdata.zzdpos.ui.settle.SettleActivity;
 import com.xingdata.zzdpos.ui.store.dialog.CartDialog;
@@ -57,8 +61,7 @@ public class StoreActivity extends BaseActivity<StorePresenter, ActivityStoreBin
 
         mViewBinding.vSearch.setOnSearchListener(keyword -> mPresenter.searchSku(keyword));
 
-        mViewBinding.btnScan.setOnClickListener(view -> PermissionUtils.permission(PermissionConstants.CAMERA)
-                .callback(new PermissionUtils.FullCallback() {
+        mViewBinding.btnScan.setOnClickListener(view -> PermissionUtils.permission(PermissionConstants.CAMERA).callback(new PermissionUtils.FullCallback() {
                     @Override
                     public void onGranted(List<String> permissionsGranted) {
                         mPresenter.clickScan();
@@ -67,9 +70,15 @@ public class StoreActivity extends BaseActivity<StorePresenter, ActivityStoreBin
                     @Override
                     public void onDenied(List<String> permissionsDeniedForever, List<String> permissionsDenied) {
                     }
-                })
-                .request()
+                }).request()
         );
+
+        mViewBinding.btnPayment.setOnClickListener(view -> {
+            Intent intent = new Intent(StoreActivity.this, PaymentActivity.class);
+            intent.putExtra(C.SP_KEY.SETTLE_MODE, C.SETTLE_MODE.STORE);
+            ActivityUtils.startActivity(intent);
+        });
+
         mScanFragment.setOnScanCompletedListener(barcode -> mPresenter.scanComplete(barcode));
     }
 
@@ -227,4 +236,14 @@ public class StoreActivity extends BaseActivity<StorePresenter, ActivityStoreBin
         return super.dispatchTouchEvent(ev);
     }
 
+
+    @Subscribe(
+            thread = EventThread.MAIN_THREAD,
+            tags = {@Tag(C.EVENT_TAGS.ADD_NO_BARCODE_SKU)}
+    )
+    public void addNoBarcodeSku(Long amt) {
+        mPresenter.addNoBarcodeSku(amt);
+    }
+
+
 }

app/src/main/java/com/xingdata/zzdpos/ui/store/StorePresenter.java

@@ -140,6 +140,7 @@ public class StorePresenter extends StoreContract.Presenter {
         mView.showMsDialog(mMss);
     }
 
+
     @Override
     public <Sku extends BaseSku> void clickAddSku(Sku sku, int value) {
         //更新购物车信息
@@ -160,7 +161,6 @@ public class StorePresenter extends StoreContract.Presenter {
         this.cartChanged();
     }
 
-
     @Override
     public void cartChanged() {
         //设置订单信息
@@ -343,13 +343,11 @@ public class StorePresenter extends StoreContract.Presenter {
      */
     private void getProductByBarcode(String barcode) {
         mView.showLoadingDialog();
-        List<Sssku> ssskus = DBFactory.getList(DB.getInstance().get(MainPresenter.class).where
-                (Sssku.class)
+        List<Sssku> ssskus = DBFactory.getList(DB.getInstance().get(MainPresenter.class).where(Sssku.class)
                 .equalTo("spuBarcode", StringUtil.strToLong(barcode))
                 .equalTo("skuStatus", 0)
                 .findAll());
-        List<Ussku> usskus = DBFactory.getList(DB.getInstance().get(MainPresenter.class).where
-                (Ussku.class)
+        List<Ussku> usskus = DBFactory.getList(DB.getInstance().get(MainPresenter.class).where(Ussku.class)
                 .equalTo("spuBarcode", StringUtil.strToLong(barcode))
                 .equalTo("skuStatus", 0)
                 .findAll());
@@ -366,4 +364,17 @@ public class StorePresenter extends StoreContract.Presenter {
         mView.dismissLoadingDialog();
     }
 
+
+    /**
+     * 添加无码商品
+     *
+     * @param amt 无码商品价格
+     */
+    void addNoBarcodeSku(Long amt) {
+        mSaledetails.add(0, Saledetail.create("无码商品", amt, mVip));
+        //发送购物车信息
+        mView.loadSaledetails(mSaledetails, true);
+        //购物车发生变化
+        this.cartChanged();
+    }
 }

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

@@ -79,13 +79,27 @@
                 app:layout_constraintRight_toLeftOf="parent" />
 
             <ImageButton
-                android:id="@+id/btn_scan"
+                android:id="@+id/btn_payment"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:layout_marginStart="@dimen/all_spacing"
                 android:background="@color/transparent"
+                android:contentDescription="@string/store_scan"
+                android:foreground="?android:attr/actionBarItemBackground"
+                android:paddingEnd="@dimen/all_padding"
+                android:paddingStart="@dimen/all_bounced_padding"
+                android:src="@mipmap/but_collection"
+                android:visibility="@{titleMode>1?View.GONE:View.VISIBLE}"
+                app:layout_constraintBottom_toTopOf="parent"
+                app:layout_constraintRight_toLeftOf="@id/btn_scan"
+                app:layout_constraintTop_toBottomOf="parent" />
 
-
+            <ImageButton
+                android:id="@+id/btn_scan"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_marginStart="@dimen/all_spacing"
+                android:background="@color/transparent"
                 android:contentDescription="@string/store_scan"
                 android:foreground="?android:attr/actionBarItemBackground"
                 android:paddingEnd="@dimen/all_padding"