基本流程走通;

app/src/main/java/com/xingdata/zzdpos/model/Saledetail.java

@@ -12,7 +12,7 @@ import com.xingdata.zzdpos.util.ConvertUtil;
 /**
  * 订单详情(购物车商品明细)
  */
-public class Saledetail implements BaseModel, BaseBean,BaseGoodPrint {
+public class Saledetail implements BaseModel, BaseBean, BaseGoodPrint {
 
     public boolean isDiscount() {
         return skuPrice.longValue() != skuPricePay.longValue();
@@ -58,12 +58,12 @@ public class Saledetail implements BaseModel, BaseBean,BaseGoodPrint {
 
     @Override
     public String getPrice() {
-        return ConvertUtil.fenToYuan(skuPrice,false);
+        return ConvertUtil.fenToYuan(skuPrice, false);
     }
 
     @Override
     public String getSubtotal() {
-        return ConvertUtil.fenToYuan(detailAmt,false);
+        return ConvertUtil.fenToYuan(detailAmt, false);
     }
 
     @Override
@@ -217,8 +217,7 @@ public class Saledetail implements BaseModel, BaseBean,BaseGoodPrint {
      */
     public void setVip(Vip vip) {
         this.vip = vip;
-        skuPricePay = skuOffFlag > 0 ? skuPrice * (vip.getVipDefDiscount() > 0 ? vip
-                .getVipDefDiscount() : 100) / 100 : skuPrice;
+        skuPricePay = skuOffFlag > 0 ? skuPrice * (vip.getVipDefDiscount() > 0 ? vip.getVipDefDiscount() : 100) / 100 : skuPrice;
         detailAmt = skuPricePay * detailCnt;
     }
 

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

@@ -86,7 +86,8 @@ public class SettlePresenter extends SettleContract.Presenter {
      * 获取开单信息
      */
     private void getStoreIntent() {
-
+        mSaledetails.addAll((ArrayList) getIntent().getSerializableExtra(C.EXTRA_KEY.SETTLE_EXTRA));
+        mSaleorder.setSaledetails(mSaledetails);
     }
 
 
@@ -123,6 +124,8 @@ public class SettlePresenter extends SettleContract.Presenter {
     public void selectVip(Vip vip) {
         // 设置会员
         this.setVip(vip);
+        // 重新设置购物车
+        mSaleorder.setSaledetails(mSaledetails);
         // 计算价格
         this.reprice();
 

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

 package com.xingdata.zzdpos.ui.store;
 
+import android.content.Intent;
+import android.os.Bundle;
 import android.view.inputmethod.EditorInfo;
 
+import com.blankj.utilcode.util.ActivityUtils;
 import com.blankj.utilcode.util.KeyboardUtils;
+import com.xingdata.zzdpos.C;
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseActivity;
 import com.xingdata.zzdpos.base.BaseSku;
@@ -12,12 +16,14 @@ import com.xingdata.zzdpos.model.Saledetail;
 import com.xingdata.zzdpos.model.Saleorder;
 import com.xingdata.zzdpos.model.Sskugrp;
 import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
+import com.xingdata.zzdpos.ui.settle.SettleActivity;
 import com.xingdata.zzdpos.ui.store.dialog.CartDialog;
 import com.xingdata.zzdpos.ui.store.dialog.MsDialog;
 import com.xingdata.zzdpos.ui.store.fragment.ScanFragment;
 import com.xingdata.zzdpos.ui.store.fragment.SearchFragment;
 import com.xingdata.zzdpos.ui.store.fragment.StoreFragment;
 
+import java.util.ArrayList;
 import java.util.List;
 
 
@@ -109,4 +115,14 @@ public class StoreActivity extends BaseActivity<StorePresenter, ActivityStoreBin
         mCartDialog.setSaleorder(saleorder).setSaledetails(saledetails).show(this);
     }
 
+    @Override
+    public void showSettle(List<Saledetail> saledetails) {
+        Intent intent = new Intent(StoreActivity.this, SettleActivity.class);
+        intent.putExtra(C.EXTRA_KEY.SETTLE_MODE, C.SETTLE_MODE.STORE);
+        Bundle bundle = new Bundle();
+        bundle.putSerializable(C.EXTRA_KEY.SETTLE_EXTRA, new ArrayList(saledetails));
+        intent.putExtras(bundle);
+        ActivityUtils.startActivity(intent);
+    }
+
 }

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

@@ -85,6 +85,14 @@ interface StoreContract {
          * @param saledetails 购物车信息
          */
         void showCartDialog(Saleorder saleorder, List<Saledetail> saledetails);
+
+
+        /**
+         * 显示结算页面
+         *
+         * @param saledetails 购物车详情列表
+         */
+        void showSettle(List<Saledetail> saledetails);
     }
 
     abstract class Presenter extends BasePresenter<View> {
@@ -152,11 +160,15 @@ interface StoreContract {
          */
         public abstract void cartChanged();
 
-
         /**
-         * 购物车列表 - 关闭
+         * 购物车界面 - 关闭
          */
         public abstract void onCartDialogCancel();
+
+        /**
+         * 购物车界面 - 清空购物车
+         */
+        public abstract void clearCart();
     }
 
 }

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

@@ -49,6 +49,7 @@ public class StorePresenter extends StoreContract.Presenter {
 
     @Override
     public void clickSettle() {
+        mView.showSettle(mSaledetails);
     }
 
     @Override
@@ -131,6 +132,16 @@ public class StorePresenter extends StoreContract.Presenter {
         mView.loadSaledetails(mSaledetails, true);
     }
 
+    @Override
+    public void clearCart() {
+        //清空购物车
+        this.mSaledetails = new ArrayList<>();
+        //设置订单信息
+        mSaleorder.setSaledetails(mSaledetails);
+        //统计订单信息
+        this.reprice();
+    }
+
 
     /**
      * 获取商品分组

app/src/main/java/com/xingdata/zzdpos/ui/store/dialog/CartDialog.java

@@ -50,13 +50,18 @@ public class CartDialog extends BaseSheetDialog<StorePresenter, DialogStoreCartB
                     if (count > 0) {
                         mSaledetails.get(i).setCount(mSaledetails.get(i).getDetailCnt() + value);
                     } else {
-                        mSaledetailAdapter.remove(i);
+                        mSaledetailAdapter.getData().remove(i);
+                        mSaledetailAdapter.notifyDataSetChanged();
                     }
                     mPresenter.cartChanged();
                     break;
                 }
             }
         });
+
+        // set Other listener
+        mViewBinding.tvSettle.setOnClickListener(view -> mPresenter.clickSettle());
+        mViewBinding.tvClear.setOnClickListener(view -> mPresenter.clearCart());
     }
 
 

app/src/main/java/com/xingdata/zzdpos/util/SystemUtil.java

@@ -55,7 +55,7 @@ public final class SystemUtil {
             }
         }
 //        return deviceSN;
-        return "92209325";
+        return "548496";
     }
 
 

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

@@ -26,7 +26,6 @@
     <android.support.constraint.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/transparent"
         android:gravity="center"
         android:orientation="vertical">
 
@@ -52,8 +51,8 @@
                 android:paddingEnd="@dimen/all_margin_big"
                 android:paddingStart="@dimen/all_margin_big"
                 android:paddingTop="@dimen/all_spacing"
-                android:text="@string/store_btn_settle"
-                android:textColor="@color/white_caocao" />
+                android:text="@string/store_clear_all"
+                android:textColor="@color/black_baozheng" />
 
         </LinearLayout>
 

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

@@ -296,7 +296,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginEnd="@dimen/all_spacing"
-                            android:text="@{@string/settle_point_vip_text + avlPoints + @string/settle_point_amt_text + pointDisAmt}"
+                            android:text="@{@string/settle_point_vip_text + avlPoints + @string/settle_point_amt_text + pointDisAmt +@string/unit_rmb_yuan}"
                             android:textColor="@color/black_likui" />
 
                         <CheckBox

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

@@ -42,7 +42,8 @@
                 android:id="@+id/srl_sku"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:layout_weight="3">
+                android:layout_weight="3"
+                android:background="@color/white_caocao">
 
                 <android.support.v7.widget.RecyclerView
                     android:id="@+id/rl_sku"

app/src/main/res/values/strings.xml

@@ -535,6 +535,7 @@
     <string name="store_pay_amt">合计:</string>
     <string name="store_cart">购物车</string>
     <string name="store_btn_settle">选好了</string>
+    <string name="store_clear_all">全部清空</string>
     <string name="store_ms_dis">已减</string>
     <string name="store_scan">扫描</string>
     <string name="store_search_hint">请输入商品名称/助记码/条码</string>