Merge remote-tracking branch 'origin/master-v2'

gongzuming

2024-09-19 a768dc3daa04d35fedfbe75c0a59b9b2545b85c4

 src/main/java/com/mzl/flower/schedule/WarehouseScheduleService.java

@@ -85,8 +85,8 @@
                        }
                    }
                    if(customerOrders!=null && customerOrders.size()>0){ //散户订单
                        Map<String, WarehouseLocationDTO> customerLocationMap = new HashMap<>();
                        for (Order order : customerOrders) {
                            Map<String, WarehouseLocationDTO> customerLocationMap = new HashMap<>();
                            if(locations!=null && locations.size()>0){
                                String key = order.getCreateBy()+"||"+order.getCustomerAddress();
                                WarehouseLocationDTO location = null;
@@ -110,7 +110,7 @@
    /**
     * 每天凌晨2点，合伙人发货
     */
    @Scheduled(cron = "0 0 2 * * ?")
    @Scheduled(cron = "0 0 4 * * ?")
    public void clearWarehouseLocation() {
        log.info("定时合伙人发货开始：" + DateFormatUtils.format(System.currentTimeMillis(), "yyyy-MM-dd HH:mm:ss"));
        orderService.setPartnerOrderSend();