| 
						
					 | 
					
						
						
						
						
							
						
						
							5a3878645b
							
						
					 | 
					
						
						
							
							订单详情
						
						
						
						
						
					 | 
					
						2025-02-26 08:55:39 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e10fb12fdd
							
						
					 | 
					
						
						
							
							首页调整、用户详情
						
						
						
						
						
					 | 
					
						2025-02-24 11:02:48 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d12ea9a4a8
							
						
					 | 
					
						
						
							
							111
						
						
						
						
						
					 | 
					
						2025-02-10 09:05:35 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b8c28c02a7
							
						
					 | 
					
						
						
							
							111
						
						
						
						
						
					 | 
					
						2025-01-27 00:05:45 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							fd28903b06
							
						
					 | 
					
						
						
							
							111
						
						
						
						
						
					 | 
					
						2025-01-21 23:51:50 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							fa7f3d2fb4
							
						
					 | 
					
						
						
							
							调整
						
						
						
						
						
					 | 
					
						2025-01-03 13:52:04 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4024a94338
							
						
					 | 
					
						
						
							
							调整
						
						
						
						
						
					 | 
					
						2024-12-26 20:28:12 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3edcc599e8
							
						
					 | 
					
						
						
							
							轨迹
						
						
						
						
						
					 | 
					
						2024-12-21 15:39:04 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a10fed78dc
							
						
					 | 
					
						
						
							
							支付宝支付
						
						
						
						
						
					 | 
					
						2024-12-20 17:06:39 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							75123b96a4
							
						
					 | 
					
						
						
							
							微调
						
						
						
						
						
					 | 
					
						2024-12-17 08:49:31 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							45e8c906f3
							
						
					 | 
					
						
						
							
							微调
						
						
						
						
						
					 | 
					
						2024-12-13 17:07:36 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							be0d51b403
							
						
					 | 
					
						
						
							
							区间收费调整
						
						
						
						
						
						
						
						超级密码功能
改价、押金抵扣加锁
小程序角色权限改造 
						
					 | 
					
						2024-12-07 22:07:04 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e405734501
							
						
					 | 
					
						
						
							
							处理发送命令后超时报错,但是车辆启动的问题
						
						
						
						
						
					 | 
					
						2024-11-21 16:14:38 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ef093e84c3
							
						
					 | 
					
						
						
							
							押金不足时先退押金,再充值
						
						
						
						
						
					 | 
					
						2024-11-21 10:05:08 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8c7a19377b
							
						
					 | 
					
						
						
							
							微调
						
						
						
						
						
					 | 
					
						2024-11-12 23:45:41 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c90ffe21e2
							
						
					 | 
					
						
						
							
							微调
						
						
						
						
						
					 | 
					
						2024-11-12 17:12:25 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e5c2b1a3cd
							
						
					 | 
					
						
						
							
							获取营收统计(按月份)
						
						
						
						
						
					 | 
					
						2024-11-05 17:27:57 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1dbfb4f59b
							
						
					 | 
					
						
						
							
							首页优化
						
						
						
						
						
						
						
						快速生成 
						
					 | 
					
						2024-11-05 13:54:18 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							5e453dfae6
							
						
					 | 
					
						
						
							
							微调
						
						
						
						
						
					 | 
					
						2024-10-31 15:37:32 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9b7a05ddf0
							
						
					 | 
					
						
						
							
							1.收费方式自定义排序
						
						
						
						
						
					 | 
					
						2024-10-24 21:33:56 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a4f1935475
							
						
					 | 
					
						
						
							
							1.收费方式和车型的新增和修改校验
						
						
						
						
						
					 | 
					
						2024-10-22 21:16:02 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1cf0151633
							
						
					 | 
					
						
						
							
							1.密码修改
						
						
						
						
						
						
						
						2.gettoken 
						
					 | 
					
						2024-10-22 20:50:36 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ae3cea85b4
							
						
					 | 
					
						
						
							
							1.合伙人分账功能
						
						
						
						
						
					 | 
					
						2024-10-18 10:18:17 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							40249eef4e
							
						
					 | 
					
						
						
							
							1.关联收费模式发短信提示
						
						
						
						
						
						
						
						2.缓存的key改成mac 
						
					 | 
					
						2024-10-07 09:51:22 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6555e10eab
							
						
					 | 
					
						
						
							
							1.对账功能
						
						
						
						
						
						
						
						2.订单改价关闭订单 
						
					 | 
					
						2024-10-04 16:07:44 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							5f50bf6b0b
							
						
					 | 
					
						
						
							
							1.修复bug
						
						
						
						
						
					 | 
					
						2024-09-29 16:21:48 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							11b1992029
							
						
					 | 
					
						
						
							
							1.押金充值权限问题
						
						
						
						
						
					 | 
					
						2024-09-28 08:48:58 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8cf4a61856
							
						
					 | 
					
						
						
							
							1.更新设备的在线状态
						
						
						
						
						
					 | 
					
						2024-09-27 17:28:47 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c1dcf956e2
							
						
					 | 
					
						
						
							
							1.根据mac数据查询设备信息
						
						
						
						
						
					 | 
					
						2024-09-27 15:23:10 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							5ebc4be0a4
							
						
					 | 
					
						
						
							
							1.太米支付调试
						
						
						
						
						
					 | 
					
						2024-09-27 10:12:44 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4b3b0f1b42
							
						
					 | 
					
						
						
							
							1.太米支付调试
						
						
						
						
						
					 | 
					
						2024-09-26 21:40:38 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ec2fbe5d51
							
						
					 | 
					
						
						
							
							1.太米支付
						
						
						
						
						
					 | 
					
						2024-09-24 21:37:25 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							028376d221
							
						
					 | 
					
						
						
							
							1.太米支付
						
						
						
						
						
					 | 
					
						2024-09-24 11:10:29 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ab0170316a
							
						
					 | 
					
						
						
							
							1.上传收款码
						
						
						
						
						
					 | 
					
						2024-09-20 14:07:40 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f1de90a6b4
							
						
					 | 
					
						
						
							
							1.消息推送去掉锁
						
						
						
						
						
					 | 
					
						2024-09-16 16:17:23 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							483a1e2595
							
						
					 | 
					
						
						
							
							Merge branch 'new-pay'
						
						
						
						
						
						
						
						# Conflicts:
#	electripper-system/src/main/java/com/ruoyi/system/service/impl/CallbackServiceImpl.java
#	electripper-system/src/main/java/com/ruoyi/system/service/impl/EtOrderServiceImpl.java
#	electripper-system/src/main/java/com/ruoyi/system/service/impl/WxPayService.java 
						
					 | 
					
						2024-09-16 14:28:36 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ca95ea298f
							
						
					 | 
					
						
						
							
							1.优化
						
						
						
						
						
					 | 
					
						2024-09-16 14:14:46 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4afc12d842
							
						
					 | 
					
						
						
							
							1.支付渠道--调整
						
						
						
						
						
					 | 
					
						2024-09-15 15:26:33 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							04a03eae69
							
						
					 | 
					
						
						
							
							Merge branch 'master' into new-pay
						
						
						
						
						
					 | 
					
						2024-09-14 16:12:09 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							db628d6797
							
						
					 | 
					
						
						
							
							1.支付渠道(编码完成)
						
						
						
						
						
					 | 
					
						2024-09-14 15:45:45 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a0fb0b4ea0
							
						
					 | 
					
						
						
							
							1. 客服电话根据用户的最后一个订单的运营区
						
						
						
						
						
					 | 
					
						2024-09-14 10:15:41 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							2c6a7a3869
							
						
					 | 
					
						
						
							
							1. 调整
						
						
						
						
						
					 | 
					
						2024-09-13 22:23:23 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9517fffcd8
							
						
					 | 
					
						
						
							
							1. 通联支付
						
						
						
						
						
					 | 
					
						2024-09-13 20:27:36 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9dcaa811f6
							
						
					 | 
					
						
						
							
							1. 支付
						
						
						
						
						
					 | 
					
						2024-09-13 09:20:41 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							fb772973e0
							
						
					 | 
					
						
						
							
							1. 定位日志
						
						
						
						
						
						
						
						2. 低电量警报开关 
						
					 | 
					
						2024-09-12 16:54:56 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8bc7c4c95d
							
						
					 | 
					
						
						
							
							1. 车型关联收费方式
						
						
						
						
						
					 | 
					
						2024-09-10 09:56:47 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							13ea20b61a
							
						
					 | 
					
						
						
							
							Merge branch 'pay-channel'
						
						
						
						
						
						
						
						# Conflicts:
#	electripper-system/src/main/java/com/ruoyi/system/domain/EtOrder.java 
						
					 | 
					
						2024-09-09 15:55:33 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							95b7dcd2a2
							
						
					 | 
					
						
						
							
							1. 根据mac修改sn
						
						
						
						
						
						
						
						2. 还车时保存手机定位 
						
					 | 
					
						2024-09-09 15:49:35 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a09cec2993
							
						
					 | 
					
						
						
							
							1. 支付完成之后再减次数
						
						
						
						
						
					 | 
					
						2024-09-06 20:01:45 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							2ae3c8e279
							
						
					 | 
					
						
						
							
							1. 渠道类改名
						
						
						
						
						
					 | 
					
						2024-09-06 17:10:37 +08:00 | 
					
					
						
						
							
							
							
						
					 |