Merge remote-tracking branch 'origin/master'

.idea/modules.xml

@@ -3,8 +3,8 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/TangKuPos.iml" filepath="$PROJECT_DIR$/TangKuPos.iml" />
-      <module fileurl="file://C:\Users\JM_DEV\AndroidStudioProjects\TangKuPos\TangKuPos.iml" filepath="C:\Users\JM_DEV\AndroidStudioProjects\TangKuPos\TangKuPos.iml" />
       <module fileurl="file://D:\Work\Android\AndroidProject\XingData\TangKuPos\.idea\TangKuPos.iml" filepath="D:\Work\Android\AndroidProject\XingData\TangKuPos\.idea\TangKuPos.iml" />
+      <module fileurl="file://C:\Users\JM_DEV\AndroidStudioProjects\TangKuPos\TangKuPos.iml" filepath="C:\Users\JM_DEV\AndroidStudioProjects\TangKuPos\TangKuPos.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
     </modules>
   </component>

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

@@ -960,7 +960,7 @@ public class Saleorder extends SectionEntity<MediaStore.Video> implements BaseMo
 
     @Override
     public String getPayAmt() {
-        return ConvertUtil.fenToYuan(orderPayAmt);
+        return ConvertUtil.fenToYuan(orderPayAmt, true);
     }
 
     @Override

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

@@ -33,6 +33,9 @@ public class Salepay {
 
     public String getPayName() {
         String payName = "";
+        if (payType==null){
+            payType=999;
+        }
         switch (payType) {
             case C.PAY_CHANNEL.CASH:
                 payName = "现金";
@@ -52,6 +55,8 @@ public class Salepay {
             case C.PAY_CHANNEL.TALLY:
                 payName = "赊账";
                 break;
+            default:
+                payName = "--";
         }
         return payName;
     }

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

@@ -26,6 +26,7 @@ import com.xingdata.zzdpos.databinding.ViewVipRechargeBinding;
 import com.xingdata.zzdpos.model.Cs;
 import com.xingdata.zzdpos.model.Saledetail;
 import com.xingdata.zzdpos.model.Saleorder;
+import com.xingdata.zzdpos.model.Salepay;
 import com.xingdata.zzdpos.model.Ticket;
 import com.xingdata.zzdpos.model.VipRechargeOrder;
 import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
@@ -34,6 +35,9 @@ import com.xingdata.zzdpos.ui.manage.inventory.adpter.InventoryDetailAdapter;
 import com.xingdata.zzdpos.util.ConvertUtil;
 import com.xingdata.zzdpos.util.OnClickListener;
 
+import java.util.ArrayList;
+import java.util.List;
+
 
 public class StatisticsDetailActivity extends BaseActivity<StatisticsDetailPresenter, ActivityStatisticsDetailBinding> implements StatisticsDetailContract.View {
 
@@ -121,7 +125,7 @@ public class StatisticsDetailActivity extends BaseActivity<StatisticsDetailPrese
         mViewBinding.btnReturn.setOnClickListener(new OnClickListener() {
             @Override
             protected void myOnClickListener(View v) {
-                ZX_PrintPOS.getInstance(MainActivity.mainActivity).print(1, cs);
+                ZX_PrintPOS.getInstance(MainActivity.mainActivity).printInventory(1, cs);
                 mViewBinding.btnReturn.setEnabled(false);
                 mViewBinding.btnReturn.setText("已打印");
 
@@ -233,7 +237,12 @@ 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);
+                    try {
+                        ZX_PrintPOS.getInstance(StatisticsDetailActivity.this).print(1, mSaleorder);
+                    } catch (Exception e) {
+                        ToastUtils.showShort("打印异常");
+                    }
+
                     mViewBinding.btnPrint.setEnabled(false);
                     mViewBinding.btnPrint.setText("已打印");
                 }

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

@@ -25,8 +25,8 @@ public final class SystemUtil {
      * @return 设备型号
      */
     public static String getDeviceModel() {
-//        return DeviceUtils.getModel();
-        return "AECRC10";
+        return DeviceUtils.getModel();
+
     }