BUG修改,小件物流金额

xuhy

2024-02-23 b67bd52afe57c829fb68fdf5d3fdc3aa14ee3a75

 UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java

@@ -209,9 +209,6 @@
            Map<String, Object> data = price.getData();
            Double ordinary = Double.valueOf(data.get("ordinary").toString());
            Double precious = Double.valueOf(data.get("precious").toString());
            Double discount = Double.valueOf(data.get("discount").toString());
            Double discountMoney = Double.valueOf(data.get("discountMoney").toString());
            Integer activityId = Integer.valueOf(data.get("activityId").toString());
            data.put("ordinary", ordinary * number);
            data.put("precious", precious * number);
        }
@@ -219,9 +216,7 @@
            Map<String, Object> data = price.getData();
            Double ordinary = Double.valueOf(data.get("ordinary").toString());
            Double precious = Double.valueOf(data.get("precious").toString());
            Double discount = Double.valueOf(data.get("discount").toString());
            Double discountMoney = Double.valueOf(data.get("discountMoney").toString());
            Integer activityId = Integer.valueOf(data.get("activityId").toString());
            data.put("ordinary", ordinary - discountMoney);
            data.put("precious", precious - discountMoney);
        }
@@ -302,9 +297,15 @@
        Map<String, Object> data = price.getData();
        Double ordinary = Double.valueOf(data.get("ordinary").toString());
        Double precious = Double.valueOf(data.get("precious").toString());
        Double discount = Double.valueOf(data.get("discount").toString());
        Double discount = null;
        if(null != data.get("discount")){
            discount = Double.valueOf(data.get("discount").toString());
        }
        Double discountMoney = Double.valueOf(data.get("discountMoney").toString());
        Integer activityId = Integer.valueOf(data.get("activityId").toString());
        Integer activityId = null;
        if(null != data.get("activityId")){
            activityId = Integer.valueOf(data.get("activityId").toString());
        }
        orderLogistics.setOrderMoney((cargoType == 1 ? ordinary : precious) + tipMoney);
        orderLogistics.setTravelMoney((cargoType == 1 ? ordinary : precious));
        if(type == 5){
@@ -560,7 +561,7 @@
        }
        //折扣
        if(null != orderLogistics.getActivityId()){
            orderMoney = orderMoney - orderLogistics.getDiscount();
            orderMoney = orderMoney - orderLogistics.getDiscountMoney();
        }
        orderMoney=new BigDecimal(orderMoney).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();