From a63145ac1499a46cac039fc8aaba229e7156148f Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期六, 06 七月 2024 17:59:23 +0800
Subject: [PATCH] 提交发货单金额修改，订单打印次数统计
---
north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java b/north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java
index 7736752..34e4a71 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java
@@ -218,7 +218,8 @@
deliveryOtherMoneyList.forEach(deliveryOtherMoney -> {
deliveryOtherMoney.setQuantity(0.0);
});
-
+ double otherMoneys=0.0;
+ List <Map<String, Object>> moneryList=new ArrayList<Map<String, Object>>();//鏈�缁堢粨鏋�
//鑾峰彇瀵硅薄闆嗗悎寰幆杩涜鏂板淇敼
if (!orderDetaillist.isEmpty()) {
for (OrderDetail orderDetail : orderDetaillist) {
@@ -243,6 +244,23 @@
}
//鏍规嵁璁㈠崟璁＄畻鏂瑰紡杩涜閲戦璁＄畻
+
+
+ if(orderDetail.getOtherColumns()!="{}"&&orderDetail.getOtherColumns()!=null){
+ System.out.println(orderDetail.getOtherColumns());
+ JSONObject jsonObject = JSON.parseObject(orderDetail.getOtherColumns());
+ for(String key : jsonObject.keySet()){
+ boolean isnull = key.contains("M");
+ if(isnull) {
+ Map<String, Object> moneryItemmap = new HashMap<>();
+ Map<String, Object> deliveryDetailOtherMoney = deliveryDetailMapper.getSelectOrderotherMoney(orderDetail.getOrderId(),orderDetail.getOrderNumber(), key, jsonObject.get(key).toString());
+ otherMoneys=otherMoneys+Double.valueOf(deliveryDetailOtherMoney.get("monery").toString());
+ moneryItemmap.put("DeliveryDetailOtherMoney", deliveryDetailOtherMoney);
+ moneryList.add(moneryItemmap);
+ }
+ }
+
+ }
//瀵瑰惊鐜槑缁嗙殑鏁版嵁杩涜绱姞
@@ -284,7 +302,7 @@
deliveryOtherMoneyMapper.insertDeliveryOtherMoney(deliveryOtherMoney);
}
});
- int intMoney= (int) Math.floor(money);
+ int intMoney= (int) Math.floor(money+otherMoneys);
//淇敼鍙戣揣鏄庣粏绱姞闈㈢Н鏁伴噺閲戦
deliveryMapper.updatedelivery(Double.valueOf(String.format("%.2f", area)), quantity, Double.valueOf(intMoney), otherMoney.get(), oddNumber);
@@ -377,7 +395,7 @@
Map<String, Object> moneryItemmap = new HashMap<>();
Map<String, Object> deliveryDetailOtherMoney = deliveryDetailMapper.getSelectotherMoney(detail.getOrderDetail().getOrderId(),
detail.getDeliveryId(),Integer.parseInt(stringObjectMap.get("order_number").toString()), key, jsonObject.get(key).toString());
- otherMoney=otherMoney+Double.valueOf(deliveryDetailOtherMoney.get("monery").toString());
+
moneryItemmap.put("DeliveryDetailOtherMoney", deliveryDetailOtherMoney);
moneryList.add(moneryItemmap);
}
--
Gitblit v1.8.0