| 
						
					 | 
					
						
						
						
						
							
						
						
							5f50bf6b0b
							
						
					 | 
					
						
						
							
							1.修复bug
						
						
						
						
						
					 | 
					
						2024-09-29 16:21:48 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3a7c23aa15
							
						
					 | 
					
						
						
							
							1.调整
						
						
						
						
						
					 | 
					
						2024-09-28 11:24:01 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9ff822a270
							
						
					 | 
					
						
						
							
							1.调整
						
						
						
						
						
					 | 
					
						2024-09-28 09:09:27 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							11b1992029
							
						
					 | 
					
						
						
							
							1.押金充值权限问题
						
						
						
						
						
					 | 
					
						2024-09-28 08:48:58 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							cb7b167593
							
						
					 | 
					
						
						
							
							1.成本计算
						
						
						
						
						
					 | 
					
						2024-09-27 21:24:24 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8cf4a61856
							
						
					 | 
					
						
						
							
							1.更新设备的在线状态
						
						
						
						
						
					 | 
					
						2024-09-27 17:28:47 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c1dcf956e2
							
						
					 | 
					
						
						
							
							1.根据mac数据查询设备信息
						
						
						
						
						
					 | 
					
						2024-09-27 15:23:10 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							49f9a34979
							
						
					 | 
					
						
						
							
							Merge branch 'new'
						
						
						
						
						
					 | 
					
						2024-09-27 10:13:14 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							5ebc4be0a4
							
						
					 | 
					
						
						
							
							1.太米支付调试
						
						
						
						
						
					 | 
					
						2024-09-27 10:12:44 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4b3b0f1b42
							
						
					 | 
					
						
						
							
							1.太米支付调试
						
						
						
						
						
					 | 
					
						2024-09-26 21:40:38 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							7d2d80e89e
							
						
					 | 
					
						
						
							
							1.太米支付
						
						
						
						
						
					 | 
					
						2024-09-24 22:24:58 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							985abf1fad
							
						
					 | 
					
						
						
							
							1.太米支付
						
						
						
						
						
					 | 
					
						2024-09-24 22:10:33 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							589c0b3435
							
						
					 | 
					
						
						
							
							1.太米支付
						
						
						
						
						
					 | 
					
						2024-09-24 21:54:33 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ec2fbe5d51
							
						
					 | 
					
						
						
							
							1.太米支付
						
						
						
						
						
					 | 
					
						2024-09-24 21:37:25 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							276ff65520
							
						
					 | 
					
						
						
							
							1.资金流水手机号
						
						
						
						
						
					 | 
					
						2024-09-24 16:24:24 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							78177caf37
							
						
					 | 
					
						
						
							
							1.支付
						
						
						
						
						
					 | 
					
						2024-09-24 15:12:03 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							418b358b06
							
						
					 | 
					
						
						
							
							1.运营数据调整
						
						
						
						
						
					 | 
					
						2024-09-24 14:51:04 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0d621037df
							
						
					 | 
					
						
						
							
							1.运营数据调整
						
						
						
						
						
					 | 
					
						2024-09-24 11:38:02 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							028376d221
							
						
					 | 
					
						
						
							
							1.太米支付
						
						
						
						
						
					 | 
					
						2024-09-24 11:10:29 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							596359030c
							
						
					 | 
					
						
						
							
							1.运营数据统计扣除退款手续费
						
						
						
						
						
					 | 
					
						2024-09-21 16:23:57 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							81e48c1df4
							
						
					 | 
					
						
						
							
							1.调整
						
						
						
						
						
					 | 
					
						2024-09-20 22:20:52 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							aad9c90002
							
						
					 | 
					
						
						
							
							1.新建运营商默认角色改成运营商
						
						
						
						
						
					 | 
					
						2024-09-20 17:14:33 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ab0170316a
							
						
					 | 
					
						
						
							
							1.上传收款码
						
						
						
						
						
					 | 
					
						2024-09-20 14:07:40 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f1de90a6b4
							
						
					 | 
					
						
						
							
							1.消息推送去掉锁
						
						
						
						
						
					 | 
					
						2024-09-16 16:17:23 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f3567b07aa
							
						
					 | 
					
						
						
							
							1.优化
						
						
						
						
						
					 | 
					
						2024-09-16 14:43:08 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							62d3dfbe3f
							
						
					 | 
					
						
						
							
							1.首页排行扣掉退款金额
						
						
						
						
						
					 | 
					
						2024-09-15 16:05:13 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							2143506db9
							
						
					 | 
					
						
						
							
							1.支付渠道--调整
						
						
						
						
						
					 | 
					
						2024-09-14 16:11:35 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							db628d6797
							
						
					 | 
					
						
						
							
							1.支付渠道(编码完成)
						
						
						
						
						
					 | 
					
						2024-09-14 15:45:45 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							be2091afa7
							
						
					 | 
					
						
						
							
							1.支付
						
						
						
						
						
					 | 
					
						2024-09-14 11:24:58 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0aba990c02
							
						
					 | 
					
						
						
							
							1. 获取最新的定位信息
						
						
						
						
						
					 | 
					
						2024-09-13 09:27:48 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4a1b01e3fe
							
						
					 | 
					
						
						
							
							1. 订单列表修改
						
						
						
						
						
					 | 
					
						2024-09-09 08:43:13 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a09cec2993
							
						
					 | 
					
						
						
							
							1. 支付完成之后再减次数
						
						
						
						
						
					 | 
					
						2024-09-06 20:01:45 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							2ae3c8e279
							
						
					 | 
					
						
						
							
							1. 渠道类改名
						
						
						
						
						
					 | 
					
						2024-09-06 17:10:37 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f4fecd8827
							
						
					 | 
					
						
						
							
							1. 使用优惠券
						
						
						
						
						
					 | 
					
						2024-09-06 17:01:59 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ab5cab863d
							
						
					 | 
					
						
						
							
							1. 使用优惠券
						
						
						
						
						
					 | 
					
						2024-09-06 17:00:13 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a6aebd38bb
							
						
					 | 
					
						
						
							
							1. 支付渠道
						
						
						
						
						
					 | 
					
						2024-09-06 16:10:45 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							99ef46526b
							
						
					 | 
					
						
						
							
							1. 调整
						
						
						
						
						
					 | 
					
						2024-09-06 11:13:14 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0e90db14f2
							
						
					 | 
					
						
						
							
							1. 调整
						
						
						
						
						
					 | 
					
						2024-09-06 11:11:11 +08:00 | 
					
					
						
						
							
							
							
						
					 |