惠尔丰打印~

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

@@ -58,7 +58,7 @@ public class Saledetail implements BaseModel, BaseBean,BaseGoodPrint {
 
     @Override
     public String getPrice() {
-        return ConvertUtil.fenToYuan(skuPrice, false);
+        return ConvertUtil.fenToYuan(skuPricePay, false);
     }
 
     @Override

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

@@ -977,7 +977,7 @@ public class Saleorder extends SectionEntity<MediaStore.Video> implements BaseMo
 
     @Override
     public String getGoodsAmtSum() {
-        return ConvertUtil.fenToYuan(orderAuthAmt, true);
+        return ConvertUtil.fenToYuan(orderPayAmt, true);
     }
 
     @Override
@@ -987,7 +987,7 @@ public class Saleorder extends SectionEntity<MediaStore.Video> implements BaseMo
 
     @Override
     public String getGoodsReduAmt() {
-        return null;
+        return ConvertUtil.fenToYuan(orderReduAmt, true);
     }
 
     @Override

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

@@ -34,6 +34,7 @@ import io.reactivex.schedulers.Schedulers;
 
 
 public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBinding> implements MainContract.View {
+    public static MainActivity mainActivity;
     private int[] titleInts = {R.string.menu_cashier, R.string.menu_service, R.string.menu_myself};
     private int[] iconList = {R.mipmap.icon_menu_cashier_1, R.mipmap.icon_menu_service_0, R.mipmap.icon_menu_myself_0};
     private FragmentViewAdapter mFragmentPagerAdapter;
@@ -48,6 +49,7 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
 
     @Override
     public void initView() {
+        mainActivity=this;
         mPresenter.initHandoverInfo();
         List<BaseFragment> fragments = new ArrayList<>();
         fragments.add(new CasherFragment());

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

 package com.xingdata.zzdpos.ui.settle;
 
 
+import android.content.Context;
+
 import com.blankj.utilcode.util.StringUtils;
+import com.xingdata.api.print.ZX_PrintPOS;
+import com.xingdata.zzdpos.App;
 import com.xingdata.zzdpos.C;
 import com.xingdata.zzdpos.api.ApiFactory;
 import com.xingdata.zzdpos.db.DBFactory;
@@ -11,6 +15,7 @@ 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.MainActivity;
 import com.xingdata.zzdpos.ui.main.MainPresenter;
 
 import java.util.ArrayList;
@@ -301,6 +306,7 @@ public class SettlePresenter extends SettleContract.Presenter {
     private void paySucc(Saleorder saleorder) {
         mView.showPaySuccFragment(saleorder);
         this.updateHandover(MainPresenter.handoverInfo);
+        ZX_PrintPOS.getInstance(MainActivity.mainActivity).print(1, saleorder);
     }
 
     /**

app/src/main/java/com/xingdata/zzdpos/ui/statistics/StatisticsDetailActivity.java

@@ -4,6 +4,7 @@ package com.xingdata.zzdpos.ui.statistics;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.databinding.DataBindingUtil;
+import android.graphics.Paint;
 import android.util.TimeUtils;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -11,6 +12,7 @@ import android.view.View;
 import com.alibaba.fastjson.JSON;
 import com.blankj.utilcode.util.ToastUtils;
 import com.google.gson.Gson;
+import com.xingdata.api.print.ZX_PrintPOS;
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseActivity;
 import com.xingdata.zzdpos.databinding.ActivityStatisticsDetailBinding;
@@ -23,6 +25,7 @@ import com.xingdata.zzdpos.model.Saleorder;
 import com.xingdata.zzdpos.model.Ticket;
 import com.xingdata.zzdpos.model.VipRechargeOrder;
 import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
+import com.xingdata.zzdpos.ui.main.MainActivity;
 import com.xingdata.zzdpos.util.ConvertUtil;
 import com.xingdata.zzdpos.util.OnClickListener;
 
@@ -128,6 +131,8 @@ public class StatisticsDetailActivity extends BaseActivity<StatisticsDetailPrese
         viewOrderDetailBinding.setSumAmt(ConvertUtil.fenToYuan(mSaleorder.getOrderAuthAmt(), false));
         viewOrderDetailBinding.setOperName(mSaleorder.getOperName());
         viewOrderDetailBinding.setGoodsNum(mSaleorder.getOrderCnt() + "");
+
+
         if (mSaleorder.getCutAmt() == null || mSaleorder.getCutAmt() == 0) {
             viewOrderDetailBinding.setCutAmtShow(false);
         } else {
@@ -145,7 +150,14 @@ public class StatisticsDetailActivity extends BaseActivity<StatisticsDetailPrese
                 itemSettleSaledetailBinding.tvCount.setText(saledetail.getCnt());
                 itemSettleSaledetailBinding.tvPrice.setText("￥" + saledetail.getPrice());
                 itemSettleSaledetailBinding.tvName.setText(saledetail.getName());
-//              itemSettleSaledetailBinding.tvInitialPrice.setText(saledetail.getpr);
+
+                if (saledetail.isDiscount()) {
+                    itemSettleSaledetailBinding.tvInitialPrice.setText(ConvertUtil.fenToYuan(saledetail.getSkuPrice(), true));
+                    itemSettleSaledetailBinding.tvInitialPrice.setVisibility(View.VISIBLE);
+                    itemSettleSaledetailBinding.tvInitialPrice.setPaintFlags(itemSettleSaledetailBinding.tvInitialPrice.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG);
+                } else {
+                    itemSettleSaledetailBinding.tvInitialPrice.setVisibility(View.GONE);
+                }
                 viewOrderDetailBinding.llGoodsList.addView(view);
 
             }
@@ -169,6 +181,14 @@ public class StatisticsDetailActivity extends BaseActivity<StatisticsDetailPrese
 
                 }
             });
+            mViewBinding.btnPrint.setOnClickListener(new OnClickListener() {
+                @Override
+                protected void myOnClickListener(View v) {
+                    ZX_PrintPOS.getInstance(MainActivity.mainActivity).print(1, mSaleorder);
+                    mViewBinding.btnPrint.setEnabled(false);
+                    mViewBinding.btnPrint.setText("已打印");
+                }
+            });
         }
     }
 

app/src/main/res/drawable/shape_gray_round_rectangle_stroke.xml

 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <corners android:radius="@dimen/all_shape_radius"/>
+    <corners android:radius="@dimen/all_radius"/>
     <stroke
         android:width="@dimen/edit_border"
         android:color="@color/gary"/>

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

@@ -53,7 +53,7 @@
             app:layout_constraintBottom_toBottomOf="parent">
 
             <Button
-                android:id="@+id/btn_cancel"
+                android:id="@+id/btn_print"
                 style="@style/button_passive"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"