新增现金舍分

app/build.gradle

@@ -15,8 +15,8 @@ android {
         applicationId "com.ypsx.yppos"
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 100010
-        versionName "1.00.010"
+        versionCode 100011
+        versionName "1.00.011"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

app/release/output-metadata.json

@@ -10,9 +10,9 @@
     {
       "type": "SINGLE",
       "filters": [],
-      "versionCode": 100010,
-      "versionName": "1.00.010",
-      "outputFile": "yppos_v100010-1.00.010-release-2021-11-16.apk"
+      "versionCode": 100011,
+      "versionName": "1.00.011",
+      "outputFile": "yppos_v100011-1.00.011-release-2021-11-26.apk"
     }
   ]
 }
\ No newline at end of file

app/src/main/java/com/ypsx/yppos/room/entity/PosConfig.kt

@@ -38,7 +38,7 @@ data class PosConfig(
     var deleteList:Int =0,
 //整单取消授权方式: 0: 全部允许， 1：需店长授权
     var cancelWholeOrder: Int =0,
-    //现金圆整方式: 0: 四舍五入
+    //现金圆整方式: 0: 四舍五入,1:舍分
     var cashRoundMode: Int=0,
     //锁屏时间，单位分钟, =0表示不锁屏，大于0表示锁屏时间(限制5-60)
     var lockScreen: Int=0,

app/src/main/java/com/ypsx/yppos/ui/activity/MainActivity.kt

@@ -361,10 +361,11 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),
                         "现金收款金额不能小于0.1元".toastFailed()
                         return@setPayClick
                     }
+                    val cashRoundMode = mViewModel.cashRoundMode.get()
 
                     val cashPayPopupWindow = CashPayPopupWindow(this@MainActivity)
                     cashPayPopupWindow.showPopupWindow()
-                    cashPayPopupWindow.setData(it, payment)
+                    cashPayPopupWindow.setData(it, payment, cashRoundMode)
                     cashPayPopupWindow.setCashPayClick { payMethod, receivablesMoney, roundMoney, changeMoney, payMoney ->
                         cashPayPopupWindow.dismiss()
                         var orderNo = mViewModel.orderNo.get()

app/src/main/java/com/ypsx/yppos/ui/popup/CashPayPopupWindow.kt

@@ -7,15 +7,18 @@ import android.view.inputmethod.EditorInfo
 import android.view.inputmethod.InputMethodManager
 import com.ypsx.base.base.appContext
 import com.ypsx.base.ext.util.screenWidth
+import com.ypsx.base.ext.util.toJson
 import com.ypsx.base.ext.view.afterTextChange
 import com.ypsx.base.util.dXLog
-import com.ypsx.common.app.ext.hideSoftKeyboard
 import com.ypsx.yppos.R
 import com.ypsx.yppos.databinding.PopupCashPayBinding
 import com.ypsx.yppos.http.data.entity.PosPayMethod
+import com.ypsx.yppos.room.entity.PosConfig
+import com.ypsx.yppos.room.repository.PosConfigRepository
 import com.ypsx.yppos.utils.CashierInputFilter
 import com.ypsx.yppos.utils.toastFailed
 import com.ypsx.yppos.viewmodel.state.CashPayViewModel
+import kotlinx.coroutines.*
 import razerdp.basepopup.BasePopupWindow
 import java.math.BigDecimal
 import java.math.RoundingMode
@@ -24,9 +27,11 @@ class CashPayPopupWindow(context: Context) : BasePopupWindow(context) {
     lateinit var bind: PopupCashPayBinding
     private var roundMoney: Double = 0.0
     lateinit var payMethod: PosPayMethod
+    private var loadConfig: PosConfig? = null
 
-     var payAction: (item: PosPayMethod, receivablesMoney: Double, roundMoney: Double, changeMoney: Double, payMoney: Double) -> Unit =
-        { _: PosPayMethod, _: Double, _: Double, _: Double, _: Double-> }
+
+    var payAction: (item: PosPayMethod, receivablesMoney: Double, roundMoney: Double, changeMoney: Double, payMoney: Double) -> Unit =
+        { _: PosPayMethod, _: Double, _: Double, _: Double, _: Double -> }
 
     init {
         setContentView(R.layout.popup_cash_pay)
@@ -44,9 +49,13 @@ class CashPayPopupWindow(context: Context) : BasePopupWindow(context) {
         bind = PopupCashPayBinding.bind(contentView)
         bind.vm = CashPayViewModel()
         bind.click = ProxyClick()
+        loadConfig = PosConfigRepository.getInstance().loadConfig()
+
+
         setAutoShowKeyboard(bind.textView20, true)
         setKeyboardAdaptive(true)
-        setKeyboardAdaptionMode(bind.textView23,
+        setKeyboardAdaptionMode(
+            bind.textView23,
             FLAG_KEYBOARD_ALIGN_TO_ROOT or FLAG_KEYBOARD_ANIMATE_ALIGN
         )
         bind.textView20.filters = arrayOf(CashierInputFilter())
@@ -61,7 +70,7 @@ class CashPayPopupWindow(context: Context) : BasePopupWindow(context) {
                         val scale = BigDecimal(it).minus(BigDecimal.valueOf(payMoney)).setScale(1)
                         bind.vm?.changeMoney?.set(scale.toDouble())
                         bind.vm?.change2?.set("¥${bind.vm?.changeMoney?.get()}")
-                    }else{
+                    } else {
                         bind.vm?.changeMoney?.set(0.0)
                         bind.vm?.change2?.set("¥${bind.vm?.changeMoney?.get()}")
                     }
@@ -72,17 +81,24 @@ class CashPayPopupWindow(context: Context) : BasePopupWindow(context) {
             if (actionId == EditorInfo.IME_ACTION_DONE) {
                 val imm: InputMethodManager =
                     context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
-                imm.hideSoftInputFromWindow(bind.textView20.windowToken, InputMethodManager.HIDE_NOT_ALWAYS)
+                imm.hideSoftInputFromWindow(
+                    bind.textView20.windowToken,
+                    InputMethodManager.HIDE_NOT_ALWAYS
+                )
                 return@setOnEditorActionListener true
             }
-             return@setOnEditorActionListener false
+            return@setOnEditorActionListener false
         }
     }
 
-    fun setData(payMethod: PosPayMethod, amount: String) {
+    fun setData(payMethod: PosPayMethod, amount: String,cashRoundMode:Int) {
         this.payMethod = payMethod
         val rawData = BigDecimal(amount)
-        val scale = rawData.setScale(1, RoundingMode.HALF_UP)
+        val scale = rawData.setScale(
+            1,
+            if (cashRoundMode == 0) RoundingMode.HALF_UP else RoundingMode.DOWN
+        )
+        loadConfig?.toJson()?.dXLog()
         roundMoney = (rawData - scale).toDouble()
         bind.vm?.receivables?.set(scale.toDouble())
         bind.vm?.receivables2?.set("¥$scale")
@@ -101,11 +117,11 @@ class CashPayPopupWindow(context: Context) : BasePopupWindow(context) {
         }
 
         fun confirm() {
-            var payMoney:String = bind.textView20.text.toString()
+            var payMoney: String = bind.textView20.text.toString()
             val receivables: Double? = bind.vm?.receivables?.get()
-            val changeMoney:Double? = bind.vm?.changeMoney?.get()
+            val changeMoney: Double? = bind.vm?.changeMoney?.get()
             if (payMoney.isEmpty()) {
-               payMoney =  receivables.toString()
+                payMoney = receivables.toString()
             }
             if (receivables != null && changeMoney != null) {
                 if (receivables > payMoney.toDouble()) {

app/src/main/java/com/ypsx/yppos/viewmodel/state/MainViewModel.kt

@@ -40,10 +40,14 @@ class MainViewModel : BaseViewModel() {
 
     var amount = DoubleObservableField(0.00)
 
+    var cashRoundMode = IntObservableField(0)
+
+
 
     init {
         val loadConfig = PosConfigRepository.getInstance().loadConfig()
         storeName.set(loadConfig?.storeName)
+        cashRoundMode.set(loadConfig?.cashRoundMode)
 
         code = loadConfig?.code!!
         val orderDate = DateUtil.getOrderDate()