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 | 
						
					
				
					
						
							
							
								
								 Rzy
							
						 | 
						
							
							
							
							
							
								
							
							
								848ebcc443
								
							
						 | 
						
							
							
								
								<feat>报错内容错误
							
							
							
							
							
						 | 
						
							2024-08-12 09:18:06 +08:00 | 
						
					
				
					
						
							
							
								
								 Rzy
							
						 | 
						
							
							
							
							
							
								
							
							
								c15044b862
								
							
						 | 
						
							
							
								
								<feat>修改细节
							
							
							
							
							
						 | 
						
							2024-08-09 18:13:16 +08:00 | 
						
					
				
					
						
							
							
								 
								wolter
							
						 | 
						
							
							
							
							
							
								
							
							
								78380d3a70
								
							
						 | 
						
							
							
								
								前台,订单查询fix
							
							
							
							
							
						 | 
						
							2024-08-09 17:14:30 +08:00 | 
						
					
				
					
						
							
							
								 
								wolter
							
						 | 
						
							
							
							
							
							
								
							
							
								966aba1dc4
								
							
						 | 
						
							
							
								
								调整api接口返回加密
							
							
							
							
							
						 | 
						
							2024-08-09 15:23:08 +08:00 | 
						
					
				
					
						
							
							
								
								 Rzy
							
						 | 
						
							
							
							
							
							
								
							
							
								ee912a204d
								
							
						 | 
						
							
							
								
								<feat>退款
							
							
							
							
							
						 | 
						
							2024-08-08 14:52:30 +08:00 | 
						
					
				
					
						
							
							
								
								 Rzy
							
						 | 
						
							
							
							
							
							
								
							
							
								cb14c35aa9
								
							
						 | 
						
							
							
								
								<feat>调整代码结构
							
							
							
							
							
						 | 
						
							2024-08-08 10:48:25 +08:00 | 
						
					
				
					
						
							
							
								
								 陈俊宏
							
						 | 
						
							
							
							
							
							
								
							
							
								30b83b3645
								
							
						 | 
						
							
							
								
								Merge branch 'feature_413_cjh' into dev/dev1.0
							
							
							
							
							
						 | 
						
							2024-08-08 09:20:49 +08:00 | 
						
					
				
					
						
							
							
								
								 陈俊宏
							
						 | 
						
							
							
							
							
							
								
							
							
								62d050c02f
								
							
						 | 
						
							
							
								
								回调log
							
							
							
							
							
						 | 
						
							2024-08-08 09:20:25 +08:00 | 
						
					
				
					
						
							
							
								 
								wolter
							
						 | 
						
							
							
							
							
							
								
							
							
								3d5e33fed0
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'refs/remotes/origin/feature/rzy/api_1.0' into dev/dev1.0
							
							
							
							
							
							
							
							# Conflicts:
#	app/constants/errorcode/error_code.go
#	app/services/thirdpay/notify/notify.go 
							
						 | 
						
							2024-08-08 09:14:08 +08:00 | 
						
					
				
					
						
							
							
								
								 Rzy
							
						 | 
						
							
							
							
							
							
								
							
							
								f85d6cc410
								
							
						 | 
						
							
							
								
								<feat>订单回调
							
							
							
							
							
						 | 
						
							2024-08-07 18:49:43 +08:00 | 
						
					
				
					
						
							
							
								
								 陈俊宏
							
						 | 
						
							
							
							
							
							
								
							
							
								ad56b5f0e5
								
							
						 | 
						
							
							
								
								Merge branch 'dev/dev1.0' into feature_413_cjh
							
							
							
							
							
						 | 
						
							2024-08-07 10:32:37 +08:00 | 
						
					
				
					
						
							
							
								
								 陈俊宏
							
						 | 
						
							
							
							
							
							
								
							
							
								75d68a3032
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/feature/rzy/api_1.0' into feature_413_cjh
							
							
							
							
							
						 | 
						
							2024-08-07 09:00:49 +08:00 | 
						
					
				
					
						
							
							
								
								 陈俊宏
							
						 | 
						
							
							
							
							
							
								
							
							
								68b9e16864
								
							
						 | 
						
							
							
								
								支付回调处理
							
							
							
							
							
						 | 
						
							2024-08-06 18:00:49 +08:00 | 
						
					
				
					
						
							
							
								 
								wolter
							
						 | 
						
							
							
							
							
							
								
							
							
								b19576089c
								
							
						 | 
						
							
							
								
								订单查询
							
							
							
							
							
						 | 
						
							2024-08-06 17:48:17 +08:00 | 
						
					
				
					
						
							
							
								
								 Rzy
							
						 | 
						
							
							
							
							
							
								
							
							
								4642ae73fe
								
							
						 | 
						
							
							
								
								Merge branch 'dev/dev1.0' into feature/rzy/api_1.0
							
							
							
							
							
							
							
							# Conflicts:
#	app/http/entities/backend/order.go 
							
						 | 
						
							2024-08-06 17:13:26 +08:00 | 
						
					
				
					
						
							
							
								
								 Rzy
							
						 | 
						
							
							
							
							
							
								
							
							
								fa6b385209
								
							
						 | 
						
							
							
								
								Merge branch 'dev/dev1.0' into feature/rzy/api_1.0
							
							
							
							
							
							
							
							# Conflicts:
#	app/constants/common/common.go
#	app/constants/errorcode/error_code.go
#	app/http/entities/backend/order.go 
							
						 | 
						
							2024-08-06 17:02:25 +08:00 | 
						
					
				
					
						
							
							
								
								 陈俊宏
							
						 | 
						
							
							
							
							
							
								
							
							
								38f3e04352
								
							
						 | 
						
							
							
								
								支付宝证书
							
							
							
							
							
						 | 
						
							2024-08-06 16:55:18 +08:00 | 
						
					
				
					
						
							
							
								
								 Rzy
							
						 | 
						
							
							
							
							
							
								
							
							
								943c3401c6
								
							
						 | 
						
							
							
								
								<feat>支付接口
							
							
							
							
							
						 | 
						
							2024-08-06 16:53:59 +08:00 | 
						
					
				
					
						
							
							
								
								 陈俊宏
							
						 | 
						
							
							
							
							
							
								
							
							
								6adcce1480
								
							
						 | 
						
							
							
								
								回调接口
							
							
							
							
							
						 | 
						
							2024-08-06 11:19:13 +08:00 | 
						
					
				
					
						
							
							
								
								 Rzy
							
						 | 
						
							
							
							
							
							
								
							
							
								548491c1f1
								
							
						 | 
						
							
							
								
								<feat>支付部分
							
							
							
							
							
						 | 
						
							2024-08-05 18:45:01 +08:00 | 
						
					
				
					
						
							
							
								
								 Rzy
							
						 | 
						
							
							
							
							
							
								
							
							
								71ccc46f23
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/feature_413_cjh' into feature/rzy/api_1.0
							
							
							
							
							
						 | 
						
							2024-08-05 17:07:35 +08:00 | 
						
					
				
					
						
							
							
								
								 陈俊宏
							
						 | 
						
							
							
							
							
							
								
							
							
								a7cf191437
								
							
						 | 
						
							
							
								
								Merge branch 'dev/dev1.0' into feature_413_cjh
							
							
							
							
							
						 | 
						
							2024-08-05 16:42:44 +08:00 | 
						
					
				
					
						
							
							
								
								 陈俊宏
							
						 | 
						
							
							
							
							
							
								
							
							
								0f747c2578
								
							
						 | 
						
							
							
								
								支付回调
							
							
							
							
							
						 | 
						
							2024-08-05 16:42:25 +08:00 | 
						
					
				
					
						
							
							
								
								 Rzy
							
						 | 
						
							
							
							
							
							
								
							
							
								3e7df62375
								
							
						 | 
						
							
							
								
								<feat>网页支付
							
							
							
							
							
						 | 
						
							2024-08-05 16:20:01 +08:00 | 
						
					
				
					
						
							
							
								
								 陈俊宏
							
						 | 
						
							
							
							
							
							
								
							
							
								39fb6d4d93
								
							
						 | 
						
							
							
								
								支付回调
							
							
							
							
							
						 | 
						
							2024-08-05 15:30:02 +08:00 | 
						
					
				
					
						
							
							
								
								 Rzy
							
						 | 
						
							
							
							
							
							
								
							
							
								b1a1a4cd50
								
							
						 | 
						
							
							
								
								<feat>api表单验证
							
							
							
							
							
						 | 
						
							2024-08-05 14:05:46 +08:00 | 
						
					
				
					
						
							
							
								
								 Rzy
							
						 | 
						
							
							
							
							
							
								
							
							
								b781a61f21
								
							
						 | 
						
							
							
								
								Merge branch 'feature/rzy/api_1.0' into dev/dev1.0
							
							
							
							
							
							
							
							# Conflicts:
#	app/constants/common/common.go
#	app/constants/errorcode/error_code.go
#	app/data/app.go
#	app/http/controllers/base.go
#	app/http/requestmapping/front.go
#	app/http/routes/route.go
#	app/services/app.go
#	app/utils/util.go
#	go.mod
#	go.sum 
							
						 | 
						
							2024-08-02 18:34:37 +08:00 | 
						
					
				
					
						
							
							
								
								 陈俊宏
							
						 | 
						
							
							
							
							
							
								
							
							
								fb5c0e458b
								
							
						 | 
						
							
							
								
								回调查询
							
							
							
							
							
						 | 
						
							2024-08-02 18:14:04 +08:00 | 
						
					
				
					
						
							
							
								
								 陈俊宏
							
						 | 
						
							
							
							
							
							
								
							
							
								f1ee9b4196
								
							
						 | 
						
							
							
								
								支付退款+退款单查询+订单关闭
							
							
							
							
							
						 | 
						
							2024-08-02 16:37:07 +08:00 | 
						
					
				
					
						
							
							
								
								 陈俊宏
							
						 | 
						
							
							
							
							
							
								
							
							
								c1e354e4ab
								
							
						 | 
						
							
							
								
								支付调起+订单查询
							
							
							
							
							
						 | 
						
							2024-08-02 13:47:52 +08:00 | 
						
					
				
					
						
							
							
								
								 Rzy
							
						 | 
						
							
							
							
							
							
								
							
							
								a056e2b26a
								
							
						 | 
						
							
							
								
								api中间件
							
							
							
							
							
						 | 
						
							2024-08-02 11:41:54 +08:00 | 
						
					
				
					
						
							
							
								
								 Rzy
							
						 | 
						
							
							
							
							
							
								
							
							
								4be80f228e
								
							
						 | 
						
							
							
								
								<fix>(解决冲突):之后会另起分支
							
							
							
							
							
						 | 
						
							2024-08-01 14:53:22 +08:00 | 
						
					
				
					
						
							
							
								 
								qiyunfanbo126.com
							
						 | 
						
							
							
							
							
							
								
							
							
								2f268160bb
								
							
						 | 
						
							
							
								
								初始化,修复trace
							
							
							
							
							
						 | 
						
							2024-04-30 14:58:30 +08:00 |