无码商品;

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

@@ -194,6 +194,11 @@ public class SettleActivity extends BaseActivity<SettlePresenter, ActivitySettle
         mPayingDialog.setType(payType).setResponse(response).show(this);
     }
 
+    @Override
+    public String getMark() {
+        return mSettleFragment.mViewBinding.etMark.getText().toString();
+    }
+
 
     @Override
     public void backToSettleFragment() {

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

@@ -132,6 +132,13 @@ interface SettleContract {
          */
         void showPayingDialog(int payType, com.xingdata.zzdpos.api.Pay.Response response);
 
+        /**
+         * 获取备注
+         *
+         * @return 备注信息
+         */
+        String getMark();
+
         /**
          * 返回结算主页面
          */
@@ -156,7 +163,6 @@ interface SettleContract {
          * 关闭密码页面
          */
         void dismissPasswordDialog();
-
     }
 
     abstract class Presenter extends BasePresenter<View> {

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

@@ -2,6 +2,7 @@ package com.xingdata.zzdpos.ui.settle;
 
 
 import com.alibaba.fastjson.JSON;
+import com.blankj.utilcode.util.StringUtils;
 import com.blankj.utilcode.util.ToastUtils;
 import com.xingdata.api.print.ZX_PrintPOS;
 import com.xingdata.zzdpos.C;
@@ -378,6 +379,9 @@ public class SettlePresenter extends SettleContract.Presenter {
     private Saleorder.Param createSaleorderParam() {
         Saleorder.Param saleorderParam = mSaleorder.setVip(mVip).param();
         for (int i = 0; i < mSaledetails.size(); i++) {
+            if (mSettleMode == C.SETTLE_MODE.PAYMENT && !StringUtils.isEmpty(mView.getMark())) {
+                mSaledetails.get(0).setSpuName(mView.getMark());
+            }
             saleorderParam.saleOrderParamDetailList.add(mSaledetails.get(i).param());
         }
         return saleorderParam;

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

@@ -95,12 +95,14 @@ public class SettleFragment extends BaseFragment<SettlePresenter, FragmentSettle
         switch (settleMode) {
             case C.SETTLE_MODE.PAYMENT:
                 mViewBinding.llStore.setVisibility(View.GONE);
+                mViewBinding.clMark.setVisibility(View.VISIBLE);
                 mPresenter.initPaymentInfo();
                 BottomSheetBehavior.from(mViewBinding.llSheet).setState(BottomSheetBehavior.STATE_EXPANDED);
                 mViewBinding.tvSettle.setAlpha(0);
                 break;
             case C.SETTLE_MODE.STORE:
                 mViewBinding.llStore.setVisibility(View.VISIBLE);
+                mViewBinding.clMark.setVisibility(View.GONE);
                 this.initStoreView();
                 break;
         }
@@ -225,7 +227,13 @@ public class SettleFragment extends BaseFragment<SettlePresenter, FragmentSettle
     }
 
 
-    List<Pay> getAvlPays(Vip vip) {
+    /**
+     * 获取可用支付方式
+     *
+     * @param vip 会员信息
+     * @return 支付方式
+     */
+    private 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())))

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

@@ -173,7 +173,6 @@
                     android:layout_height="@dimen/all_line_width"
                     android:background="@color/gray_huanggai" />
 
-
                 <LinearLayout
                     android:id="@+id/ll_store"
                     android:layout_width="match_parent"
@@ -370,12 +369,10 @@
                         android:background="@color/gray_huanggai" />
                 </LinearLayout>
 
-
                 <LinearLayout
                     android:id="@+id/ll_vip"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginBottom="@dimen/all_margin"
                     android:layout_marginTop="@dimen/all_margin"
                     android:background="@color/white_caocao"
                     android:orientation="vertical"
@@ -507,6 +504,57 @@
 
                 </LinearLayout>
 
+                <android.support.constraint.ConstraintLayout
+                    android:id="@+id/cl_mark"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/title_height"
+                    android:layout_marginTop="@dimen/all_margin"
+                    android:background="@color/white_caocao"
+                    android:orientation="vertical"
+                    android:visibility="gone">
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/all_line_width"
+                        android:background="@color/gray_huanggai"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+                    <TextView
+                        android:id="@+id/tv_mark_hint"
+                        android:layout_width="wrap_content"
+                        android:layout_height="0dp"
+                        android:layout_marginStart="@dimen/all_margin"
+                        android:gravity="center_vertical"
+                        android:text="@string/no_barcode_remark"
+                        android:textColor="@color/black_baozheng"
+                        android:textSize="@dimen/all_text_size"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintLeft_toLeftOf="parent"
+                        app:layout_constraintRight_toLeftOf="@id/et_mark"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+                    <EditText
+                        android:id="@+id/et_mark"
+                        android:layout_width="0dp"
+                        android:layout_height="0dp"
+                        android:layout_marginEnd="@dimen/all_margin"
+                        android:background="@color/transparent"
+                        android:gravity="end|center_vertical"
+                        android:hint="@string/no_barcode_remark_hint"
+                        android:textColor="@color/black_baozheng"
+                        android:textColorHint="@color/black_likui"
+                        android:textSize="@dimen/all_body_size"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintLeft_toRightOf="@id/tv_mark_hint"
+                        app:layout_constraintRight_toRightOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/all_line_width"
+                        android:background="@color/gray_huanggai"
+                        app:layout_constraintBottom_toBottomOf="parent" />
+                </android.support.constraint.ConstraintLayout>
             </LinearLayout>
 
         </android.support.v4.widget.NestedScrollView>

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

@@ -103,7 +103,7 @@
     <string name="no_barcode_title">无码商品</string>
     <string name="no_barcode_amt">金额:</string>
     <string name="no_barcode_amt_hint">请输入金额</string>
-    <string name="no_barcode_remark">备注:</string>
+    <string name="no_barcode_remark">备注</string>
     <string name="no_barcode_remark_hint">请输入备注内容</string>
 
     <!--会员页面-->