Merge remote-tracking branch 'origin/dev' into dev

peng

2025-08-05 6d95ff17f7d0de0b3efafe033ba1e3b4487d4f2e

 lmk-job/src/main/java/cn/lili/handler/impl/order/OrderEveryDayTaskExecute.java

@@ -269,7 +269,9 @@
        int day = DateUtil.date().dayOfMonth();

        //获取待结算商家列表
        List<StoreSettlementDay> storeList = storeDetailService.getSettlementStore(day);
//        List<StoreSettlementDay> storeList = storeDetailService.getSettlementStore(day);
        //直接从所有商家中去结算不在根据天数去结算
        List<StoreSettlementDay> storeList = storeDetailService.getAllSettlementStore();

        //获取当前时间
        DateTime endTime = DateUtil.date();