From 4dbf61c9189796ec46d39ac4b839cfc064e70411 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 12 八月 2021 16:11:16 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-api/src/main/java/com/java110/api/listener/ownerRepair/RepairFinishListener.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/listener/ownerRepair/RepairFinishListener.java b/service-api/src/main/java/com/java110/api/listener/ownerRepair/RepairFinishListener.java
index d1406a7..f9d740c 100755
--- a/service-api/src/main/java/com/java110/api/listener/ownerRepair/RepairFinishListener.java
+++ b/service-api/src/main/java/com/java110/api/listener/ownerRepair/RepairFinishListener.java
@@ -265,14 +265,20 @@
if (unitCode.equals(miniUnitCode)) { //濡傛灉鏈�灏忚閲忓崟浣嶄笌鐗╁搧鍗曚綅鐩稿悓锛屽氨涓嶅悜涓婂彇鏁�
BigDecimal num3 = new BigDecimal(miniUnitStock);
double newStock = surplusStock.divide(num3, 2, BigDecimal.ROUND_HALF_UP).doubleValue();
- userStorehousePo.setStock(String.valueOf(newStock));
+ int remainingInventory = new Double(newStock).intValue();
+ userStorehousePo.setStock(String.valueOf(remainingInventory));
} else { //濡傛灉涓嶇浉鍚屽氨鍚戜笂鍙栨暣
BigDecimal num3 = new BigDecimal(miniUnitStock);
double newStock = surplusStock.divide(num3, 2, BigDecimal.ROUND_HALF_UP).doubleValue();
double ceil = Math.ceil(newStock);
- userStorehousePo.setStock(String.valueOf(ceil));
+ int remainingInventory = new Double(ceil).intValue();
+ userStorehousePo.setStock(String.valueOf(remainingInventory));
}
- userStorehousePo.setMiniStock(String.valueOf(surplusStock.doubleValue()));
+ if (useNumber.contains(".") || nowStock.contains(".")) { //濡傛灉浼犺繃鏉ョ殑浣跨敤鏁伴噺涓哄皬鏁帮紝鎴栧師鏈夊簱瀛樻暟閲忔湁灏忔暟锛屽氨淇濈暀灏忔暟
+ userStorehousePo.setMiniStock(String.valueOf(surplusStock.doubleValue()));
+ } else { //濡傛灉浼犳潵鐨勪娇鐢ㄦ暟閲忎负鏁存暟锛屼笖鍘熸湁搴撳瓨鏁伴噺涓烘暣鏁帮紝灏卞彇鏁�
+ userStorehousePo.setMiniStock(String.valueOf(surplusStock.intValue()));
+ }
userStorehousePo.setUsId(userStorehouseDtoList.get(0).getUsId());
userStorehousePo.setResId(resId);
userStorehousePo.setUserId(userId);
--
Gitblit v1.8.0