| 
						
					 | 
					
						
						
							
						
						57e88d185d
					 | 
					
						
						
							
							修改统计接口。超出当前时间为空问题
						
						
						
						
						
						
					 | 
					
						2024-11-06 16:41:23 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1d4f78a0d4
					 | 
					
						
						
							
							修改统计接口
						
						
						
						
						
						
					 | 
					
						2024-11-06 16:09:21 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0d5a00bc9d
					 | 
					
						
						
							
							优化代码
						
						
						
						
						
						
					 | 
					
						2024-11-06 15:37:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0820fa5e04
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/支付优化测试' into 支付优化测试
						
						
						
						
						
						
					 | 
					
						2024-11-06 15:02:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a56643250d
					 | 
					
						
						
							
							小程序统计11
						
						
						
						
						
						
					 | 
					
						2024-11-06 15:02:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6cdade6d99
					 | 
					
						
						
							
							导入充值
						
						
						
						
						
						
					 | 
					
						2024-11-06 14:27:07 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						88cfbd9253
					 | 
					
						
						
							
							根据时间排序
						
						
						
						
						
						
					 | 
					
						2024-11-05 16:36:55 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5ff25b9b8f
					 | 
					
						
						
							
							bug 修改
						
						
						
						
						
						
					 | 
					
						2024-11-05 15:04:37 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5cd95b77c2
					 | 
					
						
						
							
							太空舱订单报表生成。定时检测订单完成状态
						
						
						
						
						
						
					 | 
					
						2024-11-05 14:44:37 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7acf116100
					 | 
					
						
						
							
							超市小程序统计
						
						
						
						
						
						
					 | 
					
						2024-11-05 11:45:23 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9f46db9565
					 | 
					
						
						
							
							太空舱开门动作cmd 生成
						
						
						
						
						
						
					 | 
					
						2024-11-04 15:41:48 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						215af32d9e
					 | 
					
						
						
							
							自定义超市订单
						
						
						
						
						
						
					 | 
					
						2024-11-04 12:26:06 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						fd3b919ba9
					 | 
					
						
						
							
							自定义订单
						
						
						
						
						
						
					 | 
					
						2024-11-04 12:05:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3bdac7fa5e
					 | 
					
						
						
							
							自定义订单
						
						
						
						
						
						
					 | 
					
						2024-11-04 12:02:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						575f163e36
					 | 
					
						
						
							
							商品库存
						
						
						
						
						
						
					 | 
					
						2024-11-04 11:05:37 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8a65561970
					 | 
					
						
						
							
							太空舱订单状态修改
						
						
						
						
						
						
					 | 
					
						2024-11-01 16:48:09 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0102132901
					 | 
					
						
						
							
							商品库存、导出
						
						
						
						
						
						
					 | 
					
						2024-11-01 15:55:40 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a0e4df77f5
					 | 
					
						
						
							
							购物车
						
						
						
						
						
						
					 | 
					
						2024-11-01 14:26:42 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						81850f6fd2
					 | 
					
						
						
							
							太空舱订单逻辑处理1
						
						
						
						
						
						
					 | 
					
						2024-11-01 11:54:55 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3ed04be004
					 | 
					
						
						
							
							太空舱订单逻辑处理
						
						
						
						
						
						
					 | 
					
						2024-11-01 10:15:20 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						75d5f513d5
					 | 
					
						
						
							
							订单添加状态
						
						
						
						
						
						
					 | 
					
						2024-10-31 17:02:42 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b08f0e2cd7
					 | 
					
						
						
							
							自定义订单
						
						
						
						
						
						
					 | 
					
						2024-10-31 14:51:17 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						edcb776750
					 | 
					
						
						
							
							超市订单统计
						
						
						
						
						
						
					 | 
					
						2024-10-31 14:06:35 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ac31e708ef
					 | 
					
						
						
							
							自定义订单
						
						
						
						
						
						
					 | 
					
						2024-10-31 11:24:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						709db0a1b7
					 | 
					
						
						
							
							现金支付
						
						
						
						
						
						
					 | 
					
						2024-10-31 10:30:36 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						df3afb74b3
					 | 
					
						
						
							
							现金支付
						
						
						
						
						
						
					 | 
					
						2024-10-31 10:29:36 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						cfce1b121f
					 | 
					
						
						
							
							订单修改
						
						
						
						
						
						
					 | 
					
						2024-10-30 17:41:19 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d7212197dc
					 | 
					
						
						
							
							修改文件名
						
						
						
						
						
						
					 | 
					
						2024-10-30 17:13:55 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						690378aa3e
					 | 
					
						
						
							
							太空舱,套餐,太空舱订单 生成crud1
						
						
						
						
						
						
					 | 
					
						2024-10-30 17:13:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e0c73bde69
					 | 
					
						
						
							
							Merge branch 'master' into 支付优化测试
						
						
						
						
						
						
					 | 
					
						2024-10-30 17:09:32 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7e5c88a4f0
					 | 
					
						
						
							
							太空舱,套餐,太空舱订单 生成crud
						
						
						
						
						
						
					 | 
					
						2024-10-30 16:53:52 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0a0f44c297
					 | 
					
						
						
							
							订单修改
						
						
						
						
						
						
					 | 
					
						2024-10-30 15:43:32 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b17e85469f
					 | 
					
						
						
							
							批量上下架
						
						
						
						
						
						
					 | 
					
						2024-10-30 13:59:21 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a4fa53440b
					 | 
					
						
						
							
							售卖商品
						
						
						
						
						
						
					 | 
					
						2024-10-30 10:22:11 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3bff7c906a
					 | 
					
						
						
							
							超市售卖商品绑定门店
						
						
						
						
						
						
					 | 
					
						2024-10-29 18:00:28 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7b6e1913db
					 | 
					
						
						
							
							超市订单
						
						
						
						
						
						
					 | 
					
						2024-10-29 16:21:05 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						28afb0d881
					 | 
					
						
						
							
							超市订单、早中午订单统计
						
						
						
						
						
						
					 | 
					
						2024-10-29 14:10:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						620981d836
					 | 
					
						
						
							
							大屏与收银机
						
						
						
						
						
						
					 | 
					
						2024-10-25 09:27:52 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3467180f8f
					 | 
					
						
						
							
							大屏
						
						
						
						
						
						
					 | 
					
						2024-10-24 14:59:55 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d42c1ffea4
					 | 
					
						
						
							
							支付优化
						
						
						
						
						
						
					 | 
					
						2024-10-23 14:45:39 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						919c151247
					 | 
					
						
						
							
							支付优化
						
						
						
						
						
						
					 | 
					
						2024-10-23 14:42:55 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2dc526dbcc
					 | 
					
						
						
							
							支付优化
						
						
						
						
						
						
					 | 
					
						2024-10-23 14:02:47 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d3bc8cc6aa
					 | 
					
						
						
							
							Merge branch 'refs/heads/master' into 支付优化测试
						
						
						
						
						
						
					 | 
					
						2024-10-23 11:58:29 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						09027a1a64
					 | 
					
						
						
							
							大屏
						
						
						
						
						
						
					 | 
					
						2024-10-23 11:57:14 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						930a56fe3a
					 | 
					
						
						
							
							Merge branch 'refs/heads/master' into 支付优化测试
						
						
						
						
						
						
					 | 
					
						2024-10-23 11:36:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e003cd1d3a
					 | 
					
						
						
							
							大屏
						
						
						
						
						
						
					 | 
					
						2024-10-23 11:33:31 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						fdb66108ab
					 | 
					
						
						
							
							Merge branch 'refs/heads/master' into 支付优化测试
						
						
						
						
						
						
					 | 
					
						2024-10-23 10:38:51 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						824527fbc3
					 | 
					
						
						
							
							二维码
						
						
						
						
						
						
					 | 
					
						2024-10-23 10:37:47 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a52f6bffc0
					 | 
					
						
						
							
							二维码
						
						
						
						
						
						
					 | 
					
						2024-10-23 10:11:28 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3c3751223b
					 | 
					
						
						
							
							Merge branch 'refs/heads/master' into 支付优化测试
						
						
						
						
						
						
						
						# Conflicts:
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/storeorder/StoreOrderServiceImpl.java 
						
						
					 | 
					
						2024-10-23 09:54:23 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |