wolter
							
						 | 
						
							
							
							
							
							
								
							
							
								0ae425e4bb
								
							
						 | 
						
							
							
								
								feat: 下单接口v2
							
							
							
							
							
						 | 
						
							2024-12-21 15:48:48 +08:00 | 
						
					
				
					
						
							
							
								 
								wolter
							
						 | 
						
							
							
							
							
							
								
							
							
								49ce121677
								
							
						 | 
						
							
							
								
								feat: 微信取消支付
							
							
							
							
							
						 | 
						
							2024-12-10 09:23:34 +08:00 | 
						
					
				
					
						
							
							
								 
								wolter
							
						 | 
						
							
							
							
							
							
								
							
							
								4c955e345b
								
							
						 | 
						
							
							
								
								feat: 微信取消支付
							
							
							
							
							
						 | 
						
							2024-12-10 09:09:58 +08:00 | 
						
					
				
					
						
							
							
								 
								wolter
							
						 | 
						
							
							
							
							
							
								
							
							
								cfec0f5fca
								
							
						 | 
						
							
							
								
								feat: 微信支付成功跳转return
							
							
							
							
							
						 | 
						
							2024-12-07 15:09:02 +08:00 | 
						
					
				
					
						
							
							
								 
								wolter
							
						 | 
						
							
							
							
							
							
								
							
							
								964a0808b9
								
							
						 | 
						
							
							
								
								feat: 微信支付错误提示,跳转return
							
							
							
							
							
						 | 
						
							2024-12-07 14:35:43 +08:00 | 
						
					
				
					
						
							
							
								 
								wolter
							
						 | 
						
							
							
							
							
							
								
							
							
								cacfbccbcf
								
							
						 | 
						
							
							
								
								feat: 微信退款fix
							
							
							
							
							
						 | 
						
							2024-12-06 22:06:05 +08:00 | 
						
					
				
					
						
							
							
								 
								wolter
							
						 | 
						
							
							
							
							
							
								
							
							
								24c0c6d36a
								
							
						 | 
						
							
							
								
								feat: 微信回调fix
							
							
							
							
							
						 | 
						
							2024-12-06 21:57:17 +08:00 | 
						
					
				
					
						
							
							
								 
								wolter
							
						 | 
						
							
							
							
							
							
								
							
							
								c2fd9e68f9
								
							
						 | 
						
							
							
								
								feat: 微信支付fix1
							
							
							
							
							
						 | 
						
							2024-12-06 21:30:45 +08:00 | 
						
					
				
					
						
							
							
								 
								wolter
							
						 | 
						
							
							
							
							
							
								
							
							
								ebcb3a9d7f
								
							
						 | 
						
							
							
								
								feat: 微信支付fix
							
							
							
							
							
						 | 
						
							2024-12-06 20:42:44 +08:00 | 
						
					
				
					
						
							
							
								 
								wolter
							
						 | 
						
							
							
							
							
							
								
							
							
								81dfd00cf9
								
							
						 | 
						
							
							
								
								feat: 微信支付2
							
							
							
							
							
						 | 
						
							2024-12-06 19:51:52 +08:00 | 
						
					
				
					
						
							
							
								 
								wolter
							
						 | 
						
							
							
							
							
							
								
							
							
								5c32d74165
								
							
						 | 
						
							
							
								
								feat: 微信支付fix1
							
							
							
							
							
						 | 
						
							2024-12-06 16:02:22 +08:00 | 
						
					
				
					
						
							
							
								 
								wolter
							
						 | 
						
							
							
							
							
							
								
							
							
								7588991d54
								
							
						 | 
						
							
							
								
								feat: 微信支付fix
							
							
							
							
							
						 | 
						
							2024-12-06 15:51:29 +08:00 | 
						
					
				
					
						
							
							
								 
								wolter
							
						 | 
						
							
							
							
							
							
								
							
							
								de1f1d01fc
								
							
						 | 
						
							
							
								
								feat: 微信支付
							
							
							
							
							
						 | 
						
							2024-12-06 15:23:57 +08:00 | 
						
					
				
					
						
							
							
								 
								wolter
							
						 | 
						
							
							
							
							
							
								
							
							
								a03d0947a5
								
							
						 | 
						
							
							
								
								feat: dockerfile
							
							
							
							
							
						 | 
						
							2024-12-06 09:29:15 +08:00 | 
						
					
				
					
						
							
							
								 
								wolter
							
						 | 
						
							
							
							
							
							
								
							
							
								1d3288acca
								
							
						 | 
						
							
							
								
								feat: 微信jsapi
							
							
							
							
							
						 | 
						
							2024-12-06 09:22:21 +08:00 | 
						
					
				
					
						
							
							
								 
								wolter
							
						 | 
						
							
							
							
							
							
								
							
							
								96aa3b16da
								
							
						 | 
						
							
							
								
								feat: 微信jsapi
							
							
							
							
							
						 | 
						
							2024-12-06 09:16:53 +08:00 | 
						
					
				
					
						
							
							
								 
								wolter
							
						 | 
						
							
							
							
							
							
								
							
							
								fd57130499
								
							
						 | 
						
							
							
								
								Merge branch 'refs/heads/dev/dev1.0' into feature/zhifu
							
							
							
							
							
						 | 
						
							2024-12-05 18:41:36 +08:00 | 
						
					
				
					
						
							
							
								 
								wolter
							
						 | 
						
							
							
							
							
							
								
							
							
								67265ef3fc
								
							
						 | 
						
							
							
								
								feat: sm2加密fix
							
							
							
							
							
						 | 
						
							2024-12-05 18:39:46 +08:00 | 
						
					
				
					
						
							
							
								 
								wolter
							
						 | 
						
							
							
							
							
							
								
							
							
								99aa763357
								
							
						 | 
						
							
							
								
								feat:ras加密fix
							
							
							
							
							
						 | 
						
							2024-12-05 18:19:13 +08:00 | 
						
					
				
					
						
							
							
								 
								wolter
							
						 | 
						
							
							
							
							
							
								
							
							
								2e938f241a
								
							
						 | 
						
							
							
								
								feat:ras加密fix
							
							
							
							
							
						 | 
						
							2024-12-04 14:45:34 +08:00 | 
						
					
				
					
						
							
							
								 
								wolter
							
						 | 
						
							
							
							
							
							
								
							
							
								d4fa337e3f
								
							
						 | 
						
							
							
								
								feat:调整数据库Id生成
							
							
							
							
							
						 | 
						
							2024-08-27 15:45:34 +08:00 | 
						
					
				
					
						
							
							
								 
								wolter
							
						 | 
						
							
							
							
							
							
								
							
							
								d2541661e9
								
							
						 | 
						
							
							
								
								fix:前台,预支付校验支付方式
							
							
							
							
							
						 | 
						
							2024-08-26 15:33:07 +08:00 | 
						
					
				
					
						
							
							
								 
								wolter
							
						 | 
						
							
							
							
							
							
								
							
							
								0be3db7a89
								
							
						 | 
						
							
							
								
								fix:前台,预支付校验支付方式
							
							
							
							
							
						 | 
						
							2024-08-26 14:59:18 +08:00 | 
						
					
				
					
						
							
							
								 
								wolter
							
						 | 
						
							
							
							
							
							
								
							
							
								2cb6a07362
								
							
						 | 
						
							
							
								
								feat:前台,returnUrl不必填
							
							
							
							
							
						 | 
						
							2024-08-26 09:34:28 +08:00 | 
						
					
				
					
						
							
							
								 
								wolter
							
						 | 
						
							
							
							
							
							
								
							
							
								e77a7622b1
								
							
						 | 
						
							
							
								
								feat:前台,api关闭的订单接口
							
							
							
							
							
						 | 
						
							2024-08-23 14:22:48 +08:00 | 
						
					
				
					
						
							
							
								 
								wolter
							
						 | 
						
							
							
							
							
							
								
							
							
								9dac2644d4
								
							
						 | 
						
							
							
								
								后台:商户列表名称和联系人搜索不区分大小写
							
							
							
							
							
						 | 
						
							2024-08-21 15:26:53 +08:00 | 
						
					
				
					
						
							
							
								 
								wolter
							
						 | 
						
							
							
							
							
							
								
							
							
								89b37a73c4
								
							
						 | 
						
							
							
								
								后台:处理时间为空
							
							
							
							
							
						 | 
						
							2024-08-21 15:19:36 +08:00 | 
						
					
				
					
						
							
							
								
								 陈俊宏
							
						 | 
						
							
							
							
							
							
								
							
							
								6db5f7d504
								
							
						 | 
						
							
							
								
								微信退款
							
							
							
							
							
						 | 
						
							2024-08-20 15:28:42 +08:00 | 
						
					
				
					
						
							
							
								
								 陈俊宏
							
						 | 
						
							
							
							
							
							
								
							
							
								c64c0d8f54
								
							
						 | 
						
							
							
								
								微信退款
							
							
							
							
							
						 | 
						
							2024-08-20 15:25:22 +08:00 | 
						
					
				
					
						
							
							
								
								 陈俊宏
							
						 | 
						
							
							
							
							
							
								
							
							
								2c88c0b019
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev/dev1.0' into dev/dev1.0
							
							
							
							
							
							
							
							# Conflicts:
#	app/third/paymentService/wechat_service.go 
							
						 | 
						
							2024-08-20 11:27:37 +08:00 | 
						
					
				
					
						
							
							
								
								 陈俊宏
							
						 | 
						
							
							
							
							
							
								
							
							
								c0724d3356
								
							
						 | 
						
							
							
								
								微信退款,需要原订单总额
							
							
							
							
							
						 | 
						
							2024-08-20 11:26:25 +08:00 | 
						
					
				
					
						
							
							
								 
								wolter
							
						 | 
						
							
							
							
							
							
								
							
							
								6ac8bd8710
								
							
						 | 
						
							
							
								
								feat:前台,增加支付完成后的跳转
							
							
							
							
							
						 | 
						
							2024-08-20 10:49:27 +08:00 | 
						
					
				
					
						
							
							
								 
								wolter
							
						 | 
						
							
							
							
							
							
								
							
							
								fe0fe5123f
								
							
						 | 
						
							
							
								
								退款fix
							
							
							
							
							
						 | 
						
							2024-08-14 18:52:25 +08:00 | 
						
					
				
					
						
							
							
								 
								wolter
							
						 | 
						
							
							
							
							
							
								
							
							
								39162a1750
								
							
						 | 
						
							
							
								
								修改回调
							
							
							
							
							
						 | 
						
							2024-08-14 16:40:24 +08:00 | 
						
					
				
					
						
							
							
								
								 renzhiyuan
							
						 | 
						
							
							
							
							
							
								
							
							
								921c40606b
								
							
						 | 
						
							
							
								
								<fix>修改回调
							
							
							
							
							
						 | 
						
							2024-08-14 14:01:10 +08:00 | 
						
					
				
					
						
							
							
								 
								wolter
							
						 | 
						
							
							
							
							
							
								
							
							
								2035af1580
								
							
						 | 
						
							
							
								
								前台,回调增加支付金额,记录回调日志
							
							
							
							
							
						 | 
						
							2024-08-14 13:37:27 +08:00 | 
						
					
				
					
						
							
							
								 
								wolter
							
						 | 
						
							
							
							
							
							
								
							
							
								6a977db12e
								
							
						 | 
						
							
							
								
								前台fix,回调
							
							
							
							
							
						 | 
						
							2024-08-13 18:30:44 +08:00 | 
						
					
				
					
						
							
							
								 
								wolter
							
						 | 
						
							
							
							
							
							
								
							
							
								2f88c1be58
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev/dev1.0' into dev/dev1.0
							
							
							
							
							
						 | 
						
							2024-08-12 18:27:59 +08:00 | 
						
					
				
					
						
							
							
								 
								wolter
							
						 | 
						
							
							
							
							
							
								
							
							
								54a93ef082
								
							
						 | 
						
							
							
								
								后台,应用加密取消必填
							
							
							
							
							
						 | 
						
							2024-08-12 18:27:22 +08:00 | 
						
					
				
					
						
							
							
								
								 Rzy
							
						 | 
						
							
							
							
							
							
								
							
							
								b34dd4f96f
								
							
						 | 
						
							
							
								
								修改bug
							
							
							
							
							
						 | 
						
							2024-08-12 18:09:24 +08:00 | 
						
					
				
					
						
							
							
								
								 陈俊宏
							
						 | 
						
							
							
							
							
							
								
							
							
								45bc1e9cf0
								
							
						 | 
						
							
							
								
								去除控制台错误打印
							
							
							
							
							
						 | 
						
							2024-08-12 15:56:31 +08:00 | 
						
					
				
					
						
							
							
								
								 陈俊宏
							
						 | 
						
							
							
							
							
							
								
							
							
								86af800c7c
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev/dev1.0' into dev/dev1.0
							
							
							
							
							
						 | 
						
							2024-08-12 14:55:02 +08:00 | 
						
					
				
					
						
							
							
								
								 陈俊宏
							
						 | 
						
							
							
							
							
							
								
							
							
								5247c2999f
								
							
						 | 
						
							
							
								
								微信回调APPID问题
							
							
							
							
							
						 | 
						
							2024-08-12 14:54:52 +08:00 | 
						
					
				
					
						
							
							
								
								 Rzy
							
						 | 
						
							
							
							
							
							
								
							
							
								37100eb589
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev/dev1.0' into dev/dev1.0
							
							
							
							
							
						 | 
						
							2024-08-12 14:38:27 +08:00 | 
						
					
				
					
						
							
							
								
								 Rzy
							
						 | 
						
							
							
							
							
							
								
							
							
								8549c0fbbd
								
							
						 | 
						
							
							
								
								<feat>调整结构,可以返回第三方消息
							
							
							
							
							
						 | 
						
							2024-08-12 14:37:48 +08:00 | 
						
					
				
					
						
							
							
								 
								wolter
							
						 | 
						
							
							
							
							
							
								
							
							
								553679efa5
								
							
						 | 
						
							
							
								
								测试:微信唤起支付
							
							
							
							
							
						 | 
						
							2024-08-12 14:37:36 +08:00 | 
						
					
				
					
						
							
							
								
								 Rzy
							
						 | 
						
							
							
							
							
							
								
							
							
								e2378b0a39
								
							
						 | 
						
							
							
								
								去掉第三方消息返回给接口
							
							
							
							
							
						 | 
						
							2024-08-12 14:33:09 +08:00 | 
						
					
				
					
						
							
							
								
								 Rzy
							
						 | 
						
							
							
							
							
							
								
							
							
								8fb2f52108
								
							
						 | 
						
							
							
								
								去掉第三方消息返回给接口
							
							
							
							
							
						 | 
						
							2024-08-12 14:32:46 +08:00 | 
						
					
				
					
						
							
							
								
								 Rzy
							
						 | 
						
							
							
							
							
							
								
							
							
								b3b782dfe6
								
							
						 | 
						
							
							
								
								去掉第三方消息返回给接口
							
							
							
							
							
						 | 
						
							2024-08-12 14:31:56 +08:00 | 
						
					
				
					
						
							
							
								
								 Rzy
							
						 | 
						
							
							
							
							
							
								
							
							
								7a45794fbc
								
							
						 | 
						
							
							
								
								<feat>退款单判重和第三方消息处理返回
							
							
							
							
							
						 | 
						
							2024-08-12 14:09:11 +08:00 |