抽取用户信息、支付、打印等的基础功能类，迁移至libcommon

app/src/main/java/com/miya/fastcashier/MiyaApplication.kt

@@ -14,12 +14,12 @@ import com.elvishew.xlog.printer.file.backup.NeverBackupStrategy
 import com.elvishew.xlog.printer.file.naming.DateFileNameGenerator
 import com.fastcashier.lib_common.BaseApplication
 import com.fastcashier.lib_common.function.account.AccountService
+import com.fastcashier.lib_common.function.pay.OrderRecordManageKit
+import com.fastcashier.lib_common.util.DateUtils
 import com.miya.fastcashier.utils.ContextUtils
-import com.miya.fastcashier.utils.DateUtils
 import com.miya.fastcashier.utils.DensityUtils
 import com.miya.fastcashier.utils.LogFileUtils
 import com.miya.fastcashier.utils.manage.LocalKeyDataMKManageKit
-import com.miya.fastcashier.utils.manage.OrderRecordManageKit
 import com.miya.print.PrinterManager
 import com.sdy.miya.moblie.component.pay.core.net.MiYaPayMobileApiClient
 import com.sdy.miya.moblie.component.pay.core.net.MiyaHttpLoggingInterceptor

app/src/main/java/com/miya/fastcashier/log/SystemParameterDialog.kt

@@ -9,6 +9,7 @@ import android.widget.TextView
 import com.fastcashier.lib_common.BuildConfig
 import com.fastcashier.lib_common.function.account.AccountService.getAccountInfo
 import com.fastcashier.lib_common.net.ApiConfig.baseUrl
+import com.fastcashier.lib_common.util.DateUtils
 import com.fastcashier.lib_common.util.getVersion
 import com.fastcashier.lib_common.util.getVersionCode
 import com.fastcashier.lib_common.util.getWifyName

app/src/main/java/com/miya/fastcashier/ui/AliPayCodeActivity.kt

@@ -8,11 +8,11 @@ import androidx.lifecycle.ViewModelProvider
 import com.alibaba.fastjson.JSON
 import com.blankj.utilcode.util.LogUtils
 import com.fastcashier.lib_common.config.IntentExtra
+import com.fastcashier.lib_common.function.pay.OrderRecordManageKit
+import com.fastcashier.lib_common.util.StringPriceFormatUtils
 import com.miya.fastcashier.databinding.ActivityAliPayCodeBinding
 import com.miya.fastcashier.utils.CenterToasty
-import com.miya.fastcashier.utils.StringPriceFormat
 import com.miya.fastcashier.utils.clickWithTrigger
-import com.miya.fastcashier.utils.manage.OrderRecordManageKit
 import com.miya.fastcashier.viewmodel.PayViewModel
 import com.miya.print.utils.BitmapUtils
 import com.sdy.miya.moblie.component.pay.platform.bean.PayServiceResponse
@@ -54,7 +54,7 @@ class AliPayCodeActivity : AppCompatActivity() {
         extra?.let {
             val payServiceResponse = it as PayServiceResponse
             LogUtils.e(JSON.toJSONString(payServiceResponse))
-            tvPrice.text = "¥".plus(StringPriceFormat.transStringPriceToDecimalString( payServiceResponse.tradPrice))
+            tvPrice.text = "¥".plus(StringPriceFormatUtils.transStringPriceToDecimalString( payServiceResponse.tradPrice))
             runBlocking(Dispatchers.IO) {
                 val qrcode = BitmapUtils.createBarcodeBitmap(payServiceResponse.payQrCode, 9, 453, 453)
                 runOnUiThread {

app/src/main/java/com/miya/fastcashier/ui/MainActivity.kt

@@ -8,15 +8,16 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.FragmentManager
 import androidx.lifecycle.ViewModelProvider
 import com.fastcashier.lib_common.function.account.AccountService
+import com.fastcashier.lib_common.function.pay.OrderRecordManageKit
+import com.fastcashier.lib_common.function.print.PrintService
+import com.fastcashier.lib_common.util.DateUtils
 import com.miya.fastcashier.R
 import com.miya.fastcashier.databinding.ActivityMainBinding
-import com.miya.fastcashier.service.PrintService
 import com.miya.fastcashier.ui.dialog.AuthorizePasswordInputDialog
 import com.miya.fastcashier.ui.dialog.CommonDialog
 import com.miya.fastcashier.utils.*
 import com.miya.fastcashier.utils.manage.AccountPasswordManageKit
 import com.miya.fastcashier.utils.manage.LocalKeyDataMKManageKit
-import com.miya.fastcashier.utils.manage.OrderRecordManageKit
 import com.miya.fastcashier.viewmodel.MainViewModel
 import java.util.*
 

app/src/main/java/com/miya/fastcashier/ui/PayActivity.kt

@@ -6,11 +6,11 @@ import android.view.KeyEvent
 import android.widget.Toast
 import androidx.lifecycle.ViewModelProvider
 import com.fastcashier.lib_common.config.IntentExtra
+import com.fastcashier.lib_common.function.pay.OrderRecordManageKit
 import com.miya.fastcashier.databinding.ActivityPayBinding
 import com.miya.fastcashier.utils.CenterToasty
 import com.miya.fastcashier.utils.ScanGunKeyEventHelper
 import com.miya.fastcashier.utils.clickWithTrigger
-import com.miya.fastcashier.utils.manage.OrderRecordManageKit
 import com.miya.fastcashier.viewmodel.PayViewModel
 import java.util.*
 

app/src/main/java/com/miya/fastcashier/ui/PayCodeActivity.kt

@@ -8,12 +8,12 @@ import androidx.lifecycle.ViewModelProvider
 import com.alibaba.fastjson.JSON
 import com.blankj.utilcode.util.LogUtils
 import com.fastcashier.lib_common.config.IntentExtra
+import com.fastcashier.lib_common.util.StringPriceFormatUtils
 import com.miya.fastcashier.R
 import com.miya.fastcashier.R.mipmap.ic_alipay
 import com.miya.fastcashier.R.mipmap.ic_wxpay
 import com.miya.fastcashier.databinding.ActivityPayCodeBinding
 import com.miya.fastcashier.utils.CenterToasty
-import com.miya.fastcashier.utils.StringPriceFormat
 import com.miya.fastcashier.utils.clickWithTrigger
 import com.miya.fastcashier.viewmodel.PayViewModel
 import com.miya.print.utils.BitmapUtils
@@ -47,7 +47,7 @@ class PayCodeActivity : AppCompatActivity() {
         extra?.let {
             val payServiceResponse = it as PayServiceResponse
             LogUtils.e(JSON.toJSONString(payServiceResponse))
-            tvPrice.text = "¥".plus(StringPriceFormat.transStringPriceToDecimalString( payServiceResponse.tradPrice))
+            tvPrice.text = "¥".plus(StringPriceFormatUtils.transStringPriceToDecimalString( payServiceResponse.tradPrice))
             if(payServiceResponse.chanelTag == "1"){
                 //初始化微信皮肤
                 setTheme(R.style.Theme_MiYaFastCashier_Green)

app/src/main/java/com/miya/fastcashier/ui/PayResultActivity.kt

@@ -6,9 +6,9 @@ import android.view.View
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.ViewModelProvider
 import com.fastcashier.lib_common.config.IntentExtra
+import com.fastcashier.lib_common.function.pay.MiYaPayPlantformPayWayEnum
+import com.fastcashier.lib_common.util.StringPriceFormatUtils
 import com.miya.fastcashier.databinding.ActivityPayResultBinding
-import com.miya.fastcashier.utils.MiYaPayPlantformPayWayEnum
-import com.miya.fastcashier.utils.StringPriceFormat
 import com.miya.fastcashier.utils.clickWithTrigger
 import com.miya.fastcashier.viewmodel.PrintViewModel
 import com.sdy.miya.moblie.component.pay.platform.bean.PayServiceResponse
@@ -45,7 +45,8 @@ class PayResultActivity : AppCompatActivity() {
         val extra = intent.getSerializableExtra(IntentExtra.KEY_EXTRA_PAYSERVICERESPONSE)
         extra?.let {
             val payServiceResponse = it as PayServiceResponse
-            tvPayPrice.text = "￥".plus(StringPriceFormat.transStringPriceToDecimalString(
+            tvPayPrice.text = "￥".plus(
+                StringPriceFormatUtils.transStringPriceToDecimalString(
                 payServiceResponse.tradPrice))
             tvOrderNo.text = payServiceResponse.shopTradeNo
             tvPayWay.text = MiYaPayPlantformPayWayEnum.MiyaPayType.find(

app/src/main/java/com/miya/fastcashier/ui/PriceInputActivity.kt

@@ -7,13 +7,13 @@ import android.view.View
 import android.widget.Toast
 import androidx.lifecycle.ViewModelProvider
 import com.fastcashier.lib_common.config.IntentExtra
+import com.fastcashier.lib_common.util.StringPriceFormatUtils
 import com.miya.fastcashier.R
 import com.miya.fastcashier.databinding.ActivityPriceInputBinding
 import com.miya.fastcashier.ui.dialog.CommonDialog
 import com.miya.fastcashier.ui.dialog.PayChooseDialog
 import com.miya.fastcashier.ui.dialog.PayChooseDialog.GeneratePayCodeClickListener
 import com.miya.fastcashier.utils.CenterToasty
-import com.miya.fastcashier.utils.StringPriceFormat
 import com.miya.fastcashier.utils.WordUtil
 import com.miya.fastcashier.utils.clickWithTrigger
 import com.miya.fastcashier.viewmodel.PayViewModel
@@ -78,7 +78,7 @@ class PriceInputActivity : BaseActivity() {
                 this.payServiceResponse =
                     intent.getSerializableExtra(IntentExtra.KEY_EXTRA_DATA) as PayServiceResponse
                 binding.tvRefundPriceTotal.text =
-                    "¥${StringPriceFormat.transStringPriceToDecimalString(payServiceResponse.tradPrice)}"
+                    "¥${StringPriceFormatUtils.transStringPriceToDecimalString(payServiceResponse.tradPrice)}"
                 binding.tvScanPayCode.visibility = View.GONE
                 binding.tvGeneratePayCode.visibility = View.GONE
                 binding.tvRefund.visibility = View.VISIBLE
@@ -224,7 +224,7 @@ class PriceInputActivity : BaseActivity() {
                 return@clickWithTrigger
             }
 
-            val priceYuan2Fen = StringPriceFormat.transStringYuan2Fen(price)
+            val priceYuan2Fen = StringPriceFormatUtils.transStringYuan2Fen(price)
             if (priceYuan2Fen.toDouble() > payServiceResponse.tradPrice.toDouble()) {
                 binding.tvInvalidRefundPrice.visibility = View.VISIBLE
                 return@clickWithTrigger
@@ -263,7 +263,7 @@ class PriceInputActivity : BaseActivity() {
                         showProgressDialog("退款中")
                         viewModel.refund(
                             payServiceResponse,
-                            StringPriceFormat.getPayPriceFenStringFromYuan(refundPrice, "0")
+                            StringPriceFormatUtils.getPayPriceFenStringFromYuan(refundPrice, "0")
                         )
                     }
                 }

app/src/main/java/com/miya/fastcashier/ui/SearchOrderActivity.kt

@@ -16,6 +16,9 @@ import androidx.recyclerview.widget.RecyclerView
 import androidx.viewpager2.adapter.FragmentStateAdapter
 import com.elvishew.xlog.XLog
 import com.fastcashier.lib_common.function.account.AccountService
+import com.fastcashier.lib_common.function.pay.MiYaPayPlantformPayWayEnum
+import com.fastcashier.lib_common.function.print.PrintService
+import com.fastcashier.lib_common.util.StringPriceFormatUtils
 import com.fastcashier.lib_common.util.dp2px
 import com.google.android.material.tabs.TabLayoutMediator
 import com.miya.fastcashier.R
@@ -24,10 +27,7 @@ import com.miya.fastcashier.dao.ViewPayOrderData
 import com.miya.fastcashier.databinding.ActivitySearchOrderBinding
 import com.miya.fastcashier.databinding.FragmentSearchOrderBinding
 import com.miya.fastcashier.databinding.ItemSearchOrderListBinding
-import com.miya.fastcashier.service.PrintService
 import com.miya.fastcashier.utils.CenterToasty
-import com.miya.fastcashier.utils.MiYaPayPlantformPayWayEnum
-import com.miya.fastcashier.utils.StringPriceFormat
 import com.miya.fastcashier.utils.clickWithTrigger
 import com.miya.fastcashier.utils.manage.LocalKeyDataMKManageKit
 import com.miya.fastcashier.viewmodel.SearchOrderViewModel
@@ -240,7 +240,7 @@ class SearchOrderViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView)
         binding.tvDateTitle.text = "下单时间"
         if (data.refundOrderNo != null && data.refundPrice != null) {
             binding.tvPrice.text =
-                "¥" + StringPriceFormat.transStringPriceToDecimalString(data.refundPrice)
+                "¥" + StringPriceFormatUtils.transStringPriceToDecimalString(data.refundPrice)
             binding.tvOrderNo.text = data.refundOrderNo
             binding.tvSerialNo.text = data.tradeNo
             binding.tvOrderNoTitle.text = "退款订单号"
@@ -254,7 +254,7 @@ class SearchOrderViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView)
             )
         } else {
             binding.tvPrice.text =
-                "¥" + StringPriceFormat.transStringPriceToDecimalString(data.tradPrice)
+                "¥" + StringPriceFormatUtils.transStringPriceToDecimalString(data.tradPrice)
             binding.tvOrderNo.text = data.orderNo
             binding.tvOrderNoTitle.text = "订单号"
             binding.tvSerialNoTitle.text = "流水号"

app/src/main/java/com/miya/fastcashier/ui/WxPayCodeActivity.kt

@@ -8,11 +8,11 @@ import androidx.lifecycle.ViewModelProvider
 import com.alibaba.fastjson.JSON
 import com.blankj.utilcode.util.LogUtils
 import com.fastcashier.lib_common.config.IntentExtra
+import com.fastcashier.lib_common.function.pay.OrderRecordManageKit
+import com.fastcashier.lib_common.util.StringPriceFormatUtils
 import com.miya.fastcashier.databinding.ActivityWxPayCodeBinding
 import com.miya.fastcashier.utils.CenterToasty
-import com.miya.fastcashier.utils.StringPriceFormat
 import com.miya.fastcashier.utils.clickWithTrigger
-import com.miya.fastcashier.utils.manage.OrderRecordManageKit
 import com.miya.fastcashier.viewmodel.PayViewModel
 import com.miya.print.utils.BitmapUtils
 import com.sdy.miya.moblie.component.pay.platform.bean.PayServiceResponse
@@ -53,7 +53,7 @@ class WxPayCodeActivity : AppCompatActivity() {
         extra?.let {
             val payServiceResponse = it as PayServiceResponse
             LogUtils.e(JSON.toJSONString(payServiceResponse))
-            tvPrice.text = "¥".plus(StringPriceFormat.transStringPriceToDecimalString( payServiceResponse.tradPrice))
+            tvPrice.text = "¥".plus(StringPriceFormatUtils.transStringPriceToDecimalString( payServiceResponse.tradPrice))
             runBlocking(Dispatchers.IO) {
                 val qrcode = BitmapUtils.createBarcodeBitmap(payServiceResponse.payQrCode, 9, 453, 453)
                 runOnUiThread {

app/src/main/java/com/miya/fastcashier/ui/dialog/NumberManualDialog.kt

@@ -9,15 +9,8 @@ import android.view.WindowManager
 import android.widget.Button
 import android.widget.ImageView
 import android.widget.TextView
-import android.widget.Toast
 import com.miya.fastcashier.R
-import com.miya.fastcashier.utils.CenterToasty
-import com.miya.fastcashier.utils.StringPriceFormat
-import com.miya.fastcashier.widget.DecimalKeyboard
 import com.miya.fastcashier.widget.NumKeyboard
-import com.rengwuxian.materialedittext.MaterialEditText
-import com.sdy.miya.moblie.component.pay.platform.bean.PayServiceResponse
-import java.math.BigDecimal
 
 /**
  * 手动输入数字

app/src/main/java/com/miya/fastcashier/ui/dialog/RefundInfoDialog.kt

 package com.miya.fastcashier.ui.dialog
 
-import android.app.AlertDialog
 import android.app.Dialog
 import android.content.Context
 import android.view.Gravity
 import android.view.WindowManager
-import android.widget.ImageButton
 import android.widget.ImageView
 import android.widget.TextView
-import androidx.constraintlayout.widget.ConstraintLayout
+import com.fastcashier.lib_common.util.StringPriceFormatUtils
 import com.miya.fastcashier.R
-import com.miya.fastcashier.utils.StringPriceFormat
 import com.miya.fastcashier.utils.clickWithTrigger
 import com.sdy.miya.moblie.component.pay.platform.bean.PayServiceResponse
 
@@ -48,7 +45,7 @@ class RefundInfoDialog(context: Context) : Dialog(context) {
     fun setData(payServiceResponse: PayServiceResponse, action: (PayServiceResponse) -> Unit) {
         this.payServiceResponse = payServiceResponse
         tvPrice.text =
-            "¥${StringPriceFormat.transStringPriceToDecimalString(payServiceResponse.tradPrice)}"
+            "¥${StringPriceFormatUtils.transStringPriceToDecimalString(payServiceResponse.tradPrice)}"
         tvRefund.clickWithTrigger {
             action.invoke(payServiceResponse)
         }

app/src/main/java/com/miya/fastcashier/utils/LogFileUtils.kt

@@ -2,14 +2,13 @@ package com.miya.fastcashier.utils
 
 import android.content.Context
 import android.content.pm.PackageInfo
-import com.miya.fastcashier.utils.LogFileUtils
 import android.content.pm.PackageManager
-import com.miya.fastcashier.utils.LogFileUtils.DeleteLogTask
 import android.os.AsyncTask
 import android.os.Environment
 import android.util.Log
+import com.fastcashier.lib_common.util.DateUtils
+import com.fastcashier.lib_common.util.DateUtils.*
 import java.io.*
-import java.lang.Exception
 import java.nio.charset.Charset
 import java.text.ParseException
 import java.text.SimpleDateFormat
@@ -52,7 +51,7 @@ object LogFileUtils {
                 logFiles!!.mkdirs()
             }
             val logPath = (CACHE_FILE_PATH + getVersionCode(context)
-                    + "_" + DateUtils.format8(Date()) + ".txt")
+                    + "_" + format8(Date()) + ".txt")
             logFile = File(logPath)
             fos = FileOutputStream(logFile, true)
             writer = OutputStreamWriter(fos, Charset.forName("utf-8"))
@@ -162,7 +161,7 @@ object LogFileUtils {
                         ) + 1
                     )
                     val fileNameLongTimes =
-                        DateUtils.stringToLong(fileNameDate, DateUtils.DF_YYYYMMDD)
+                        stringToLong(fileNameDate, DF_YYYYMMDD)
                     if (currentLongTimes - fileNameLongTimes >= days * 24L * 60L * 60L * 1000L) { //符合要求，加入删除列表
                         deleteFilePathList!!.add(File(fileBean.filePath))
                     }

app/src/main/java/com/miya/fastcashier/viewmodel/MainViewModel.kt

@@ -4,10 +4,10 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.fastcashier.lib_common.function.account.AccountService
-import com.miya.fastcashier.net.bean.ViewOrderStatisticsInfo
-import com.miya.fastcashier.repository.PayRepository
-import com.miya.fastcashier.service.PrintService
-import com.miya.fastcashier.utils.DateUtils
+import com.fastcashier.lib_common.function.pay.PayRepository
+import com.fastcashier.lib_common.function.print.PrintService
+import com.fastcashier.lib_common.function.print.ViewOrderStatisticsInfo
+import com.fastcashier.lib_common.util.DateUtils
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
 import kotlinx.coroutines.launch

app/src/main/java/com/miya/fastcashier/viewmodel/PayViewModel.kt

@@ -7,9 +7,9 @@ import androidx.lifecycle.viewModelScope
 import com.alibaba.fastjson.JSON
 import com.elvishew.xlog.XLog
 import com.fastcashier.lib_common.function.account.AccountService
+import com.fastcashier.lib_common.function.pay.PayRepository
+import com.fastcashier.lib_common.function.print.PrintService
 import com.miya.fastcashier.dao.ViewPayOrderData
-import com.miya.fastcashier.repository.PayRepository
-import com.miya.fastcashier.service.PrintService
 import com.sdy.miya.moblie.component.pay.platform.bean.PayServiceResponse
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job

app/src/main/java/com/miya/fastcashier/viewmodel/PrintViewModel.kt

@@ -4,7 +4,7 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.fastcashier.lib_common.function.account.AccountService
-import com.miya.fastcashier.service.PrintService
+import com.fastcashier.lib_common.function.print.PrintService
 import com.sdy.miya.moblie.component.pay.platform.bean.PayServiceResponse
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch

app/src/main/java/com/miya/fastcashier/viewmodel/SearchOrderViewModel.kt

@@ -4,10 +4,10 @@ import android.text.TextUtils
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import com.fastcashier.lib_common.function.pay.MiYaPayPlantformPayWayEnum
+import com.fastcashier.lib_common.util.DateUtils
 import com.fastcashier.lib_common.util.isEmpty
 import com.miya.fastcashier.dao.DatabaseKeeper
-import com.miya.fastcashier.utils.DateUtils
-import com.miya.fastcashier.utils.MiYaPayPlantformPayWayEnum
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import com.miya.fastcashier.dao.ViewPayOrderData as ViewPayOrderData1

lib_common/src/main/java/com/fastcashier/lib_common/function/account/SelfCashierAccountInfo.java

@@ -4,7 +4,6 @@ import android.text.TextUtils;
 
 import com.fastcashier.lib_common.base.BaseBean;
 import com.google.gson.annotations.SerializedName;
-
 import java.util.ArrayList;
 import java.util.List;
 

app/src/main/java/com/miya/fastcashier/utils/MiYaPayPlantformPayWayEnum.java → lib_common/src/main/java/com/fastcashier/lib_common/function/pay/MiYaPayPlantformPayWayEnum.java

-package com.miya.fastcashier.utils;
+package com.fastcashier.lib_common.function.pay;
 
 public class MiYaPayPlantformPayWayEnum {
 

app/src/main/java/com/miya/fastcashier/utils/manage/OrderRecordManageKit.kt → lib_common/src/main/java/com/fastcashier/lib_common/function/pay/OrderRecordManageKit.kt

-package com.miya.fastcashier.utils.manage
+package com.fastcashier.lib_common.function.pay
 
-import com.miya.fastcashier.utils.DateUtils
+import com.fastcashier.lib_common.util.DateUtils
 import com.tencent.mmkv.MMKV
 import java.util.*
 
 /**
  * 类描述：订单流水记录MMKV管理
+ * 属于基础功能-支付功能的数据处理部分
  */
 class OrderRecordManageKit {
     companion object {

app/src/main/java/com/miya/fastcashier/repository/PayRepository.kt → lib_common/src/main/java/com/fastcashier/lib_common/function/pay/PayRepository.kt

-package com.miya.fastcashier.repository
+package com.fastcashier.lib_common.function.pay
 
 import android.text.TextUtils
 import androidx.annotation.WorkerThread
 import com.fastcashier.lib_common.function.account.AccountService
-import com.miya.fastcashier.utils.DateUtils
+import com.fastcashier.lib_common.util.DateUtils
 import com.sdy.miya.moblie.component.pay.core.constance.AppTagConstance
 import com.sdy.miya.moblie.component.pay.core.result.ResultBuilder
 import com.sdy.miya.moblie.component.pay.platform.MiYaPlatformPayService

app/src/main/java/com/miya/fastcashier/service/PrintService.kt → lib_common/src/main/java/com/fastcashier/lib_common/function/print/PrintService.kt

-package com.miya.fastcashier.service
+package com.fastcashier.lib_common.function.print
 
 import android.text.TextUtils
 import com.fastcashier.lib_common.function.account.AccountService
 import com.fastcashier.lib_common.function.account.SelfCashierAccountInfo
+import com.fastcashier.lib_common.function.pay.MiYaPayPlantformPayWayEnum
+import com.fastcashier.lib_common.function.pay.OrderRecordManageKit
+import com.fastcashier.lib_common.util.DateUtils
+import com.fastcashier.lib_common.util.StringPriceFormatUtils
 import com.fastcashier.lib_common.util.isEmpty
-import com.miya.fastcashier.net.bean.ViewOrderStatisticsInfo
-import com.miya.fastcashier.utils.DateUtils
-import com.miya.fastcashier.utils.MiYaPayPlantformPayWayEnum
-import com.miya.fastcashier.utils.StringPriceFormat
-import com.miya.fastcashier.utils.manage.OrderRecordManageKit
 import com.miya.print.IPrinter
 import com.miya.print.PrinterManager
 import com.miya.print.utils.Page58MmPrintUtils
@@ -116,7 +115,7 @@ object PrintService {
         printer.printText(
             IPrinter.ALIGN_LEFT,
             3,
-            "    RMB${StringPriceFormat.transStringPriceToDecimalString(payServiceResponse.tradPrice)}",
+            "    RMB${StringPriceFormatUtils.transStringPriceToDecimalString(payServiceResponse.tradPrice)}",
             true
         )
         printer.printText(Page58MmPrintUtils.printDivideLineString())
@@ -126,7 +125,7 @@ object PrintService {
         if (couponDetail.size >= 2 && !TextUtils.isEmpty(couponDetail[1]) && couponDetail[1] != "0" && couponDetail[1] != "0.00") {
             val shopCoupon = couponDetail[1]
             //打印商家优惠
-            printer.printText("商家优惠：${StringPriceFormat.transStringPriceToDecimalString(shopCoupon)}元")
+            printer.printText("商家优惠：${StringPriceFormatUtils.transStringPriceToDecimalString(shopCoupon)}元")
         }
         if (couponDetail.size >= 3 && !TextUtils.isEmpty(couponDetail[2]) && couponDetail[2] != "0" && couponDetail[2] != "0.00") {
             //平台优惠
@@ -135,7 +134,7 @@ object PrintService {
                 MiYaPayPlantformPayWayEnum.MiyaPayType.find(payServiceResponse.chanelTag).desc
             printer.printText(
                 "$channel 优惠：${
-                    StringPriceFormat.transStringPriceToDecimalString(
+                    StringPriceFormatUtils.transStringPriceToDecimalString(
                         platformCoupon
                     )
                 }元"
@@ -143,7 +142,7 @@ object PrintService {
         }
         if (couponDetail.isNotEmpty() && !TextUtils.isEmpty(couponDetail[0])) {
             val payPrice = couponDetail[0]
-            printer.printText("客户支付：${StringPriceFormat.transStringPriceToDecimalString(payPrice)}元")
+            printer.printText("客户支付：${StringPriceFormatUtils.transStringPriceToDecimalString(payPrice)}元")
         }
 
         printer.printText("持卡人签名：")
@@ -188,7 +187,7 @@ object PrintService {
         printer.printText(
             IPrinter.ALIGN_LEFT,
             3,
-            "    RMB${StringPriceFormat.transStringPriceToDecimalString(payServiceResponse.tradPrice)}",
+            "    RMB${StringPriceFormatUtils.transStringPriceToDecimalString(payServiceResponse.tradPrice)}",
             true
         )
         printer.printText(Page58MmPrintUtils.printDivideLineString())
@@ -198,7 +197,7 @@ object PrintService {
         if (couponDetail.size >= 2 && !TextUtils.isEmpty(couponDetail[1]) && couponDetail[1] != "0" && couponDetail[1] != "0.00") {
             val shopCoupon = couponDetail[1]
             //打印商家优惠
-            printer.printText("商家优惠：${StringPriceFormat.transStringPriceToDecimalString(shopCoupon)}元")
+            printer.printText("商家优惠：${StringPriceFormatUtils.transStringPriceToDecimalString(shopCoupon)}元")
         }
         if (couponDetail.size >= 3 && !TextUtils.isEmpty(couponDetail[2]) && couponDetail[2] != "0" && couponDetail[2] != "0.00") {
             //平台优惠
@@ -207,7 +206,7 @@ object PrintService {
                 MiYaPayPlantformPayWayEnum.MiyaPayType.find(payServiceResponse.chanelTag).desc
             printer.printText(
                 "$channel 优惠：${
-                    StringPriceFormat.transStringPriceToDecimalString(
+                    StringPriceFormatUtils.transStringPriceToDecimalString(
                         platformCoupon
                     )
                 }元"
@@ -215,7 +214,7 @@ object PrintService {
         }
         if (couponDetail.isNotEmpty() && !TextUtils.isEmpty(couponDetail[0])) {
             val payPrice = couponDetail[0]
-            printer.printText("客户支付：${StringPriceFormat.transStringPriceToDecimalString(payPrice)}元")
+            printer.printText("客户支付：${StringPriceFormatUtils.transStringPriceToDecimalString(payPrice)}元")
         }
         printer.printText("\n\n")
     }
@@ -318,7 +317,7 @@ object PrintService {
         printer.printText(
             IPrinter.ALIGN_LEFT,
             3,
-            "    RMB${StringPriceFormat.transStringPriceToDecimalString(payServiceResponse.refundPrice)}",
+            "    RMB${StringPriceFormatUtils.transStringPriceToDecimalString(payServiceResponse.refundPrice)}",
             true
         )
         printer.printText("原订单号：")
@@ -330,7 +329,7 @@ object PrintService {
         if (couponDetail.size >= 2 && !TextUtils.isEmpty(couponDetail[1]) && couponDetail[1] != "0" && couponDetail[1] != "0.00") {
             val shopCoupon = couponDetail[1]
             //打印商家优惠
-            printer.printText("商家优惠：${StringPriceFormat.transStringPriceToDecimalString(shopCoupon)}元")
+            printer.printText("商家优惠：${StringPriceFormatUtils.transStringPriceToDecimalString(shopCoupon)}元")
         }
         if (couponDetail.size >= 3 && !TextUtils.isEmpty(couponDetail[2]) && couponDetail[2] != "0" && couponDetail[2] != "0.00") {
             //平台优惠
@@ -339,7 +338,7 @@ object PrintService {
                 MiYaPayPlantformPayWayEnum.MiyaPayType.find(payServiceResponse.chanelTag).desc
             printer.printText(
                 "$channel 优惠：${
-                    StringPriceFormat.transStringPriceToDecimalString(
+                    StringPriceFormatUtils.transStringPriceToDecimalString(
                         platformCoupon
                     )
                 }元"
@@ -347,7 +346,7 @@ object PrintService {
         }
         if (couponDetail.isNotEmpty() && !TextUtils.isEmpty(couponDetail[0])) {
             val payPrice = couponDetail[0]
-            printer.printText("客户支付：${StringPriceFormat.transStringPriceToDecimalString(payPrice)}元")
+            printer.printText("客户支付：${StringPriceFormatUtils.transStringPriceToDecimalString(payPrice)}元")
         }
 
         printer.printText("持卡人签名：")
@@ -391,7 +390,7 @@ object PrintService {
         printer.printText(
             IPrinter.ALIGN_LEFT,
             3,
-            "    RMB${StringPriceFormat.transStringPriceToDecimalString(payServiceResponse.refundPrice)}",
+            "    RMB${StringPriceFormatUtils.transStringPriceToDecimalString(payServiceResponse.refundPrice)}",
             true
         )
         printer.printText("原订单号：")
@@ -403,7 +402,7 @@ object PrintService {
         if (couponDetail.size >= 2 && !TextUtils.isEmpty(couponDetail[1]) && couponDetail[1] != "0" && couponDetail[1] != "0.00") {
             val shopCoupon = couponDetail[1]
             //打印商家优惠
-            printer.printText("商家优惠：${StringPriceFormat.transStringPriceToDecimalString(shopCoupon)}元")
+            printer.printText("商家优惠：${StringPriceFormatUtils.transStringPriceToDecimalString(shopCoupon)}元")
         }
         if (couponDetail.size >= 3 && !TextUtils.isEmpty(couponDetail[2]) && couponDetail[2] != "0" && couponDetail[2] != "0.00") {
             //平台优惠
@@ -412,7 +411,7 @@ object PrintService {
                 MiYaPayPlantformPayWayEnum.MiyaPayType.find(payServiceResponse.chanelTag).desc
             printer.printText(
                 "$channel 优惠：${
-                    StringPriceFormat.transStringPriceToDecimalString(
+                    StringPriceFormatUtils.transStringPriceToDecimalString(
                         platformCoupon
                     )
                 }元"
@@ -420,7 +419,7 @@ object PrintService {
         }
         if (couponDetail.isNotEmpty() && !TextUtils.isEmpty(couponDetail[0])) {
             val payPrice = couponDetail[0]
-            printer.printText("客户支付：${StringPriceFormat.transStringPriceToDecimalString(payPrice)}元")
+            printer.printText("客户支付：${StringPriceFormatUtils.transStringPriceToDecimalString(payPrice)}元")
         }
         printer.printText("\n\n")
     }
@@ -490,7 +489,7 @@ object PrintService {
             printer.printText(
                 Page58MmPrintUtils.printTwoData(
                     "总交易金额",
-                    "" + StringPriceFormat.transStringPriceToDecimalString(tradeTotalAmount.toString())
+                    "" + StringPriceFormatUtils.transStringPriceToDecimalString(tradeTotalAmount.toString())
                 )
             )
         }
@@ -520,7 +519,7 @@ object PrintService {
                 printer.printText(
                     Page58MmPrintUtils.printTwoData(
                         "交易金额",
-                        "" + StringPriceFormat.transStringPriceToDecimalString(statisticBean.tradeTotalAmount.toString())
+                        "" + StringPriceFormatUtils.transStringPriceToDecimalString(statisticBean.tradeTotalAmount.toString())
                     )
                 )
 
@@ -537,7 +536,7 @@ object PrintService {
                     printer.printText(
                         Page58MmPrintUtils.printTwoData(
                             "退款金额",
-                            "" + StringPriceFormat.transStringPriceToDecimalString(statisticBean.refundTotalAmount.toString())
+                            "" + StringPriceFormatUtils.transStringPriceToDecimalString(statisticBean.refundTotalAmount.toString())
                         )
                     )
                 }

app/src/main/java/com/miya/fastcashier/net/bean/ViewOrderStatisticsInfo.java → lib_common/src/main/java/com/fastcashier/lib_common/function/print/ViewOrderStatisticsInfo.java

-package com.miya.fastcashier.net.bean;
+package com.fastcashier.lib_common.function.print;
 
 import android.text.TextUtils;
 
@@ -10,6 +10,14 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
+/**
+ * 类描述：基础统计数据类
+ * 概述：仅用于打印的数据信息模型
+ * 创建人：zpxiang
+ * 创建时间：2022/6/1
+ * 修改人：
+ * 修改时间：
+ */
 public class ViewOrderStatisticsInfo extends BaseBean {
 
     private String beginDate;

app/src/main/java/com/miya/fastcashier/utils/DateUtils.java → lib_common/src/main/java/com/fastcashier/lib_common/util/DateUtils.java

-package com.miya.fastcashier.utils;
+package com.fastcashier.lib_common.util;
 
 
 import com.blankj.utilcode.util.StringUtils;

app/src/main/java/com/miya/fastcashier/utils/StringPriceFormat.java → lib_common/src/main/java/com/fastcashier/lib_common/util/StringPriceFormatUtils.java

-package com.miya.fastcashier.utils;
+package com.fastcashier.lib_common.util;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.text.DecimalFormat;
 
-/**
- * Created by fengyu on 2018/4/17.
- */
-public class StringPriceFormat {
+public class StringPriceFormatUtils {
 
     /**
      * 分转元