ERP_override.git

			@@ -10,6 +10,8 @@
			import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
			import com.example.erp.dto.sd.DeliveryDetailDTO;
			import com.example.erp.dto.sd.DeliveryDetailProductDTO;
			import com.example.erp.dto.sd.DeliverySearchDTO;
			import com.example.erp.dto.sd.OrderSearchDTO;
			import com.example.erp.entity.mm.FinishedOperateLog;
			import com.example.erp.entity.sd.*;
			import com.example.erp.entity.userInfo.Log;
			@@ -28,6 +30,7 @@

			import java.math.BigDecimal;
			import java.math.RoundingMode;
			import java.text.DecimalFormat;
			import java.text.SimpleDateFormat;
			import java.time.LocalDate;
			import java.util.*;
			@@ -59,7 +62,7 @@
			FinishedGoodsInventoryService finishedGoodsInventoryService;


			public Map<String, Object> getSelectShippingOrder(Integer pageNum, Integer pageSize,List<String> selectDate, Delivery delivery) throws JsonProcessingException {
			public Map<String, Object> getSelectShippingOrder(Integer pageNum, Integer pageSize,List<String> selectDate, Map<String,Object> config) throws JsonProcessingException {
			Integer offset = (pageNum - 1) * pageSize;
			String endDate = LocalDate.now().toString();
			String startDate = LocalDate.now().minusDays(15).toString();
			@@ -71,8 +74,14 @@
			endDate = selectDate.get(1);
			}
			}
			JSONObject orderJson = new JSONObject(config);
			DeliverySearchDTO delivery = JSONObject.parseObject(JSONObject.toJSONString(orderJson.get("filter")), DeliverySearchDTO.class);
			Map<String,String> sortDate = (Map<String, String>) config.get("sort");
			String field = sortDate.get("field").replaceAll("(?<!^)([A-Z])", "_$1").toLowerCase();
			String orderBy = sortDate.get("order");

			Map<String, Object> map = new HashMap<>();
			map.put("data", deliveryMapper.getSelectShippingOrder(offset, pageSize,startDate,endDate, delivery));
			map.put("data", deliveryMapper.getSelectShippingOrder(offset, pageSize,startDate,endDate, delivery,field, orderBy));
			map.put("total", deliveryMapper.getSelectShippingOrderPageTotal(offset, pageSize,startDate,endDate, delivery));
			List<String> list = new ArrayList<>();
			list.add(startDate);
			@@ -985,10 +994,72 @@
			date.add(endDate);

			List<Delivery> deliveryList = deliveryMapper.selectByDate(startDate, endDate);
			Integer quantity = 0;
			Double area = 0.00;
			Double money = 0.00;
			for(Delivery delivery:deliveryList){
			quantity += Integer.parseInt(String.valueOf(delivery.getQuantity()));
			area += Double.parseDouble(String.valueOf(delivery.getArea()));
			money += delivery.getMoney();
			}
			Map<String, Object> totalSum = new HashMap<>();
			DecimalFormat df = new DecimalFormat("#.00");
			totalSum.put("quantity",quantity);
			totalSum.put("area", df.format(area));
			totalSum.put("perimeter", df.format(money));
			totalSum.put("count", deliveryList.size());

			Map<String,Object> map = new HashMap<>();
			map.put("data",deliveryList);
			map.put("date",date);

			map.put("totalSum",totalSum);
			return map;
			}

			public boolean updateDeliveryMoney(OrderDetail orderDetail,Order order) {
			List<Delivery> deliveryList=deliveryDetailMapper.getDeliverOrderNumber(orderDetail.getOrderId(),orderDetail.getOrderNumber());
			for (Delivery delivery : deliveryList) {
			if(delivery.getDeliveryState()==0){
			List<DeliveryDetail> deliveryDetailList=deliveryDetailMapper.getDeliverDetailOrderNumber(orderDetail.getOrderId(),orderDetail.getOrderNumber(),delivery.getDeliveryId());
			for (DeliveryDetail deliveryDetail : deliveryDetailList) {
			deliveryDetail = updateOrderMoneyComputeds(deliveryDetail,orderDetail,order.getCalculateType());
			deliveryDetailMapper.updateDeliveryDetailmonye(orderDetail.getPrice(),deliveryDetail);
			}
			BigDecimal money = new BigDecimal("0");
			List<DeliveryDetail> deliveryDetailListNew=deliveryDetailMapper.getIsNotDeliveryDetail(delivery.getDeliveryId());
			for (DeliveryDetail deliveryDetail : deliveryDetailListNew) {
			BigDecimal getMoney= BigDecimal.valueOf(deliveryDetail.getMoney());
			money=money.add(getMoney);
			}
			deliveryDetailMapper.updateDeliverymonye(delivery.getDeliveryId(), (double) Math.round(money.doubleValue()));

			}

			}
			return true;
			}

			private DeliveryDetail updateOrderMoneyComputeds(DeliveryDetail deliveryDetail,OrderDetail orderDetail, Integer calculateType) {
			BigDecimal getPrice= BigDecimal.valueOf(orderDetail.getPrice());
			BigDecimal getQuantity= BigDecimal.valueOf(deliveryDetail.getQuantity());
			BigDecimal getComputeGrossArea= BigDecimal.valueOf(deliveryDetail.getArea());
			BigDecimal getComputeArea= BigDecimal.valueOf(orderDetail.getComputeArea());
			BigDecimal getWidth= BigDecimal.valueOf(orderDetail.getWidth());
			BigDecimal getHeight= BigDecimal.valueOf(orderDetail.getHeight());
			if (calculateType == 3) {
			deliveryDetail.setMoney(getPrice.multiply(getQuantity).setScale(2, RoundingMode.HALF_UP).doubleValue());
			}else if (calculateType == 4) {
			if(Objects.equals(orderDetail.getArea(), orderDetail.getComputeArea())&&Objects.equals(orderDetail.getGrossArea(), orderDetail.getComputeGrossArea())){
			deliveryDetail.setMoney(getWidth.multiply(getHeight).multiply(getQuantity).multiply(getPrice).
			divide(BigDecimal.valueOf(1000000), 2, RoundingMode.HALF_UP).doubleValue());
			}else{
			deliveryDetail.setMoney(getPrice.multiply(getComputeGrossArea).setScale(2, RoundingMode.HALF_UP).doubleValue());
			}
			}else if (calculateType == 1){
			deliveryDetail.setMoney(getPrice.multiply(getComputeArea).multiply(getQuantity).setScale(2, RoundingMode.HALF_UP).doubleValue());
			}else{
			deliveryDetail.setMoney(getPrice.multiply(getComputeGrossArea).setScale(2, RoundingMode.HALF_UP).doubleValue());
			}
			return deliveryDetail;
			}
			}