From 350e05dc3d4e08e0a2f9056e512275714d325181 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 10 七月 2024 17:20:31 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java | 71 +++++++++++++++++++++++++++--------
1 files changed, 55 insertions(+), 16 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 a7f156b..3cf1515 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
@@ -203,6 +203,7 @@
//鍒犻櫎璁㈠崟棰濆閲戦鐨勬暟鎹�
deliveryOtherMoneyMapper.deleteDeliveryOtherMoney(deliveryId);
oddNumber = deliveryId;
+ deliveryMapper.updateDelivery(delivery, oddNumber, orderDetaillist.get(0).getOrderId());
} else {
//鑾峰彇鍗曞彿
oddNumber = orderNumberSetting("鍙戣揣");
@@ -218,23 +219,50 @@
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) {
- //鏍规嵁璁㈠崟璁＄畻鏂瑰紡杩涜閲戦璁＄畻
+ Integer calculateType=0;
+
+ if (orderDetail.getOrder().getOrderId()==null){
+ Order order=deliveryMapper.selectOrderId(orderDetail.getOrderId());
+ calculateType=order.getCalculateType();
+ }else{
+ calculateType=orderDetail.getOrder().getCalculateType();
+ }
double deliveryDetailMoney = 0.0;
- if (orderDetail.getOrder().getCalculateType()==1){
- deliveryDetailMoney=Double.valueOf(String.format("%.2f",Double.valueOf(String.format("%.2f", (orderDetail.getWidth()*orderDetail.getHeight()/1000000)))
- *orderDetail.getDeliveryDetail().getQuantity()*orderDetail.getPrice()));
- }else if (orderDetail.getOrder().getCalculateType()==2){
+ if (calculateType==1){
deliveryDetailMoney=Double.valueOf(String.format("%.2f",Double.valueOf(
- String.format("%.2f", (orderDetail.getWidth()*orderDetail.getHeight()/1000000)*orderDetail.getDeliveryDetail().getQuantity())
- )*orderDetail.getPrice()));
- }else if (orderDetail.getOrder().getCalculateType()==3){
+ String.format("%.2f", orderDetail.getComputeArea()*orderDetail.getDeliveryDetail().getQuantity())
+ )*orderDetail.getPrice()));
+ }else if (calculateType==2){
+ deliveryDetailMoney=Double.valueOf(String.format("%.2f",Double.valueOf(
+ String.format("%.2f", orderDetail.getComputeArea()*orderDetail.getDeliveryDetail().getQuantity())
+ )*orderDetail.getPrice()));
+ }else if (calculateType==3){
deliveryDetailMoney=Double.valueOf(String.format("%.2f",orderDetail.getPrice() * orderDetail.getDeliveryDetail().getQuantity()));
}
+ //鏍规嵁璁㈠崟璁＄畻鏂瑰紡杩涜閲戦璁＄畻
+
+
+ if(orderDetail.getOtherColumns()!="{}"&&orderDetail.getOtherColumns()!=null){
+ 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);
+ }
+ }
+
+ }
+
//瀵瑰惊鐜槑缁嗙殑鏁版嵁杩涜绱姞
quantity += orderDetail.getDeliveryDetail().getQuantity();
@@ -243,13 +271,14 @@
Integer deliveryDetailmaximum = deliveryDetailMapper.getdeliveryDetailmaximum(oddNumber);
//棰濆閲戦淇敼
- Map<String,Double> otherColumns = JSON.parseObject(orderDetail.getOtherColumns(), new TypeReference<Map<String, Double>>(){});
+ Map<String,String> otherColumns = JSON.parseObject(orderDetail.getOtherColumns(), new TypeReference<Map<String, String>>(){});
if(otherColumns!=null){
otherColumns.forEach((key, value) ->{
- if(value!=null) {
+ boolean isnull = key.contains("M");
+ if(isnull){
deliveryOtherMoneyList.forEach(deliveryOtherMoney ->{
if(deliveryOtherMoney.getColumn().equals(key)){
- deliveryOtherMoney.setQuantity(deliveryOtherMoney.getQuantity()+(value * orderDetail.getDeliveryDetail().getQuantity()));
+ deliveryOtherMoney.setQuantity(deliveryOtherMoney.getQuantity()+( Double.valueOf(value)* orderDetail.getDeliveryDetail().getQuantity()));
}
});
@@ -275,8 +304,14 @@
deliveryOtherMoneyMapper.insertDeliveryOtherMoney(deliveryOtherMoney);
}
});
+ double freight=0.0;
+ if (delivery.getFreightPrice()!=null&&delivery.getFreightQuantity()!=null){
+ freight=delivery.getFreightPrice()*delivery.getFreightQuantity();
+ }
+
+ int intMoney= (int) Math.floor(money+freight+otherMoneys);
//淇敼鍙戣揣鏄庣粏绱姞闈㈢Н鏁伴噺閲戦
- deliveryMapper.updatedelivery(Double.valueOf(String.format("%.2f", area)), quantity, Double.valueOf(String.format("%.2f", money)), otherMoney.get(), oddNumber);
+ deliveryMapper.updatedelivery(Double.valueOf(String.format("%.2f", area)), quantity, Double.valueOf(intMoney), otherMoney.get(), oddNumber);
} else {
return false;
@@ -350,13 +385,14 @@
List <Map<String, Object>> moneryList=new ArrayList<Map<String, Object>>();//鏈�缁堢粨鏋�
List<DeliveryDetail> deliveryDetailList=deliveryDetailMapper.getSelectDeliveryPrinting(deliveryDetail);
String orderId="";
+ double otherMoney=0.0;
for (DeliveryDetail detail : deliveryDetailList) {
- System.out.println(detail);
orderId=detail.getOrderDetail().getOrderId();
Map<String, Object> itemmap = new HashMap<>();
List<Map<String, Object>> deliveryDetailList2 = deliveryDetailMapper.getSelectDeliveryDetailPrinting(detail.getDeliveryId(),
detail.getOrderDetail().getProductId(), detail.getOrderDetail().getOrderId());
+
for (Map<String, Object> stringObjectMap : deliveryDetailList2) {
if(stringObjectMap.get("other_columns")!=null){
JSONObject jsonObject = JSON.parseObject(stringObjectMap.get("other_columns").toString());
@@ -364,7 +400,9 @@
boolean isnull = key.contains("M");
if(isnull) {
Map<String, Object> moneryItemmap = new HashMap<>();
- List<Map<String, Object>> deliveryDetailOtherMoney = deliveryDetailMapper.getSelectotherMoney(detail.getOrderDetail().getOrderId(), detail.getDeliveryId(), key, jsonObject.get(key).toString());
+ Map<String, Object> deliveryDetailOtherMoney = deliveryDetailMapper.getSelectotherMoney(detail.getOrderDetail().getOrderId(),
+ detail.getDeliveryId(),Integer.parseInt(stringObjectMap.get("order_number").toString()), key, jsonObject.get(key).toString());
+
moneryItemmap.put("DeliveryDetailOtherMoney", deliveryDetailOtherMoney);
moneryList.add(moneryItemmap);
}
@@ -378,6 +416,7 @@
}
Delivery delivery=deliveryMapper.getSelectShippingOrderDetailDeliveryPrinting(deliveryDetail);
+ delivery.setMoney(delivery.getMoney()+otherMoney);
map.put("data", list);
map.put("otherMoney",moneryList);
map.put("delivery", deliveryMapper.getSelectShippingOrderDetailDeliveryPrinting(deliveryDetail));
@@ -404,7 +443,7 @@
boolean isnull = key.contains("M");
if(isnull){
Map<String, Object> moneryItemmap = new HashMap<>();
- List<Map<String, Object>> deliveryDetailOtherMoney = deliveryDetailMapper.getSelectOrderotherMoney(detail.getOrderId(),key,jsonObject.get(key).toString());
+ Map<String, Object> deliveryDetailOtherMoney = deliveryDetailMapper.getSelectOrderotherMoney(detail.getOrderId(),Integer.parseInt(stringObjectMap.get("order_number").toString()),key,jsonObject.get(key).toString());
moneryItemmap.put("DeliveryDetailOtherMoney", deliveryDetailOtherMoney);
moneryList.add(moneryItemmap);
}
--
Gitblit v1.8.0