Rzy
							
						 | 
						
							
							
							
							
							
								
							
							
								8549c0fbbd
								
							
						 | 
						
							
							
								
								<feat>调整结构,可以返回第三方消息
							
							
							
							
							
						 | 
						
							2024-08-12 14:37:48 +08:00 | 
						
					
				
					
						
							
							
								
								 Rzy
							
						 | 
						
							
							
							
							
							
								
							
							
								7a45794fbc
								
							
						 | 
						
							
							
								
								<feat>退款单判重和第三方消息处理返回
							
							
							
							
							
						 | 
						
							2024-08-12 14:09:11 +08:00 | 
						
					
				
					
						
							
							
								 
								wolter
							
						 | 
						
							
							
							
							
							
								
							
							
								4032cbdd5b
								
							
						 | 
						
							
							
								
								后台,应用可不加密
							
							
							
							
							
						 | 
						
							2024-08-12 11:08:24 +08:00 | 
						
					
				
					
						
							
							
								 
								wolter
							
						 | 
						
							
							
							
							
							
								
							
							
								ef153770af
								
							
						 | 
						
							
							
								
								fix:退款
							
							
							
							
							
						 | 
						
							2024-08-12 10:47:40 +08:00 | 
						
					
				
					
						
							
							
								
								 Rzy
							
						 | 
						
							
							
							
							
							
								
							
							
								848ebcc443
								
							
						 | 
						
							
							
								
								<feat>报错内容错误
							
							
							
							
							
						 | 
						
							2024-08-12 09:18:06 +08:00 | 
						
					
				
					
						
							
							
								 
								wolter
							
						 | 
						
							
							
							
							
							
								
							
							
								595726bc60
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev/dev1.0' into dev/dev1.0
							
							
							
							
							
						 | 
						
							2024-08-09 17:51:58 +08:00 | 
						
					
				
					
						
							
							
								 
								wolter
							
						 | 
						
							
							
							
							
							
								
							
							
								413f312ef6
								
							
						 | 
						
							
							
								
								实际支付金额fix
							
							
							
							
							
						 | 
						
							2024-08-09 17:51:44 +08:00 | 
						
					
				
					
						
							
							
								
								 Rzy
							
						 | 
						
							
							
							
							
							
								
							
							
								c13634ed08
								
							
						 | 
						
							
							
								
								<feat>退款
							
							
							
							
							
						 | 
						
							2024-08-09 17:49:41 +08:00 | 
						
					
				
					
						
							
							
								
								 Rzy
							
						 | 
						
							
							
							
							
							
								
							
							
								a54212d38c
								
							
						 | 
						
							
							
								
								解决冲突
							
							
							
							
							
						 | 
						
							2024-08-09 17:26:50 +08:00 | 
						
					
				
					
						
							
							
								
								 Rzy
							
						 | 
						
							
							
							
							
							
								
							
							
								bb9ff190c3
								
							
						 | 
						
							
							
								
								<feat>退款
							
							
							
							
							
						 | 
						
							2024-08-09 17:24:03 +08:00 | 
						
					
				
					
						
							
							
								 
								wolter
							
						 | 
						
							
							
							
							
							
								
							
							
								9a413afa51
								
							
						 | 
						
							
							
								
								后台,订单日志列表增加查询条件
							
							
							
							
							
						 | 
						
							2024-08-09 16:40:21 +08:00 | 
						
					
				
					
						
							
							
								
								 Rzy
							
						 | 
						
							
							
							
							
							
								
							
							
								7ed9cb048d
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev/dev1.0' into dev/dev1.0
							
							
							
							
							
						 | 
						
							2024-08-09 16:12:31 +08:00 | 
						
					
				
					
						
							
							
								
								 Rzy
							
						 | 
						
							
							
							
							
							
								
							
							
								d76344573d
								
							
						 | 
						
							
							
								
								<feat>rsa加密长度限制改善
							
							
							
							
							
						 | 
						
							2024-08-09 16:12:13 +08:00 | 
						
					
				
					
						
							
							
								 
								wolter
							
						 | 
						
							
							
							
							
							
								
							
							
								b0be00741f
								
							
						 | 
						
							
							
								
								后台,订单日志列表
							
							
							
							
							
						 | 
						
							2024-08-09 16:05:34 +08:00 | 
						
					
				
					
						
							
							
								 
								wolter
							
						 | 
						
							
							
							
							
							
								
							
							
								966aba1dc4
								
							
						 | 
						
							
							
								
								调整api接口返回加密
							
							
							
							
							
						 | 
						
							2024-08-09 15:23:08 +08:00 | 
						
					
				
					
						
							
							
								
								 Rzy
							
						 | 
						
							
							
							
							
							
								
							
							
								92733acffa
								
							
						 | 
						
							
							
								
								<feat>订单重复创建问题
							
							
							
							
							
						 | 
						
							2024-08-09 11:20:33 +08:00 | 
						
					
				
					
						
							
							
								
								 Rzy
							
						 | 
						
							
							
							
							
							
								
							
							
								1630304f3d
								
							
						 | 
						
							
							
								
								<feat>解除pay和paycheck之间的强关联性
							
							
							
							
							
						 | 
						
							2024-08-09 10:43:00 +08:00 | 
						
					
				
					
						
							
							
								 
								wolter
							
						 | 
						
							
							
							
							
							
								
							
							
								b3d8acba93
								
							
						 | 
						
							
							
								
								前台,调整回调通知地址
							
							
							
							
							
						 | 
						
							2024-08-08 18:32:56 +08:00 | 
						
					
				
					
						
							
							
								 
								wolter
							
						 | 
						
							
							
							
							
							
								
							
							
								8c05e8ff06
								
							
						 | 
						
							
							
								
								后台,应用通知地址
							
							
							
							
							
						 | 
						
							2024-08-08 18:16:53 +08:00 | 
						
					
				
					
						
							
							
								 
								wolter
							
						 | 
						
							
							
							
							
							
								
							
							
								5e0627a0f3
								
							
						 | 
						
							
							
								
								增加下游回调日志记录
							
							
							
							
							
						 | 
						
							2024-08-08 17:55:26 +08:00 | 
						
					
				
					
						
							
							
								
								 Rzy
							
						 | 
						
							
							
							
							
							
								
							
							
								9b7f904108
								
							
						 | 
						
							
							
								
								回调判断
							
							
							
							
							
						 | 
						
							2024-08-08 17:00:22 +08:00 | 
						
					
				
					
						
							
							
								
								 Rzy
							
						 | 
						
							
							
							
							
							
								
							
							
								0755b14aa2
								
							
						 | 
						
							
							
								
								<feat>去掉删除判断
							
							
							
							
							
						 | 
						
							2024-08-08 16:37:23 +08:00 | 
						
					
				
					
						
							
							
								
								 Rzy
							
						 | 
						
							
							
							
							
							
								
							
							
								1f7d46c110
								
							
						 | 
						
							
							
								
								<feat>去掉删除判断
							
							
							
							
							
						 | 
						
							2024-08-08 16:20:36 +08:00 | 
						
					
				
					
						
							
							
								
								 Rzy
							
						 | 
						
							
							
							
							
							
								
							
							
								7f20bf6925
								
							
						 | 
						
							
							
								
								<feat>增加解密失败报错
							
							
							
							
							
						 | 
						
							2024-08-08 15:46:54 +08:00 | 
						
					
				
					
						
							
							
								
								 Rzy
							
						 | 
						
							
							
							
							
							
								
							
							
								9c725163c8
								
							
						 | 
						
							
							
								
								Merge branch 'feature/rzy/api_1.0' into dev/dev1.0
							
							
							
							
							
						 | 
						
							2024-08-08 14:53:39 +08:00 | 
						
					
				
					
						
							
							
								
								 Rzy
							
						 | 
						
							
							
							
							
							
								
							
							
								ee912a204d
								
							
						 | 
						
							
							
								
								<feat>退款
							
							
							
							
							
						 | 
						
							2024-08-08 14:52:30 +08:00 | 
						
					
				
					
						
							
							
								 
								wolter
							
						 | 
						
							
							
							
							
							
								
							
							
								342a247c67
								
							
						 | 
						
							
							
								
								后台,查询支付和退款回调,订单查询fix
							
							
							
							
							
						 | 
						
							2024-08-08 11:34:09 +08:00 | 
						
					
				
					
						
							
							
								
								 Rzy
							
						 | 
						
							
							
							
							
							
								
							
							
								aa43040aa2
								
							
						 | 
						
							
							
								
								<feat>调整代码结构
							
							
							
							
							
						 | 
						
							2024-08-08 11:15:50 +08:00 | 
						
					
				
					
						
							
							
								
								 Rzy
							
						 | 
						
							
							
							
							
							
								
							
							
								cb14c35aa9
								
							
						 | 
						
							
							
								
								<feat>调整代码结构
							
							
							
							
							
						 | 
						
							2024-08-08 10:48:25 +08:00 | 
						
					
				
					
						
							
							
								
								 Rzy
							
						 | 
						
							
							
							
							
							
								
							
							
								40dfffe31a
								
							
						 | 
						
							
							
								
								<fix>bug修改
							
							
							
							
							
						 | 
						
							2024-08-08 09:49:27 +08:00 | 
						
					
				
					
						
							
							
								
								 Rzy
							
						 | 
						
							
							
							
							
							
								
							
							
								f225fc0f8c
								
							
						 | 
						
							
							
								
								<feat>完善支付
							
							
							
							
							
						 | 
						
							2024-08-08 09:30:02 +08:00 | 
						
					
				
					
						
							
							
								
								 Rzy
							
						 | 
						
							
							
							
							
							
								
							
							
								f85d6cc410
								
							
						 | 
						
							
							
								
								<feat>订单回调
							
							
							
							
							
						 | 
						
							2024-08-07 18:49:43 +08:00 | 
						
					
				
					
						
							
							
								
								 Rzy
							
						 | 
						
							
							
							
							
							
								
							
							
								0834171ea3
								
							
						 | 
						
							
							
								
								<feat>订单回调
							
							
							
							
							
						 | 
						
							2024-08-07 11:12:06 +08:00 | 
						
					
				
					
						
							
							
								
								 Rzy
							
						 | 
						
							
							
							
							
							
								
							
							
								c8a188e362
								
							
						 | 
						
							
							
								
								回调修改
							
							
							
							
							
						 | 
						
							2024-08-07 10:01:38 +08:00 | 
						
					
				
					
						
							
							
								
								 Rzy
							
						 | 
						
							
							
							
							
							
								
							
							
								7a887833ad
								
							
						 | 
						
							
							
								
								回调
							
							
							
							
							
						 | 
						
							2024-08-06 18:46:05 +08:00 | 
						
					
				
					
						
							
							
								
								 Rzy
							
						 | 
						
							
							
							
							
							
								
							
							
								6cfc7c0c06
								
							
						 | 
						
							
							
								
								<feat>解决冲突
							
							
							
							
							
						 | 
						
							2024-08-06 17:12:18 +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 | 
						
					
				
					
						
							
							
								
								 Rzy
							
						 | 
						
							
							
							
							
							
								
							
							
								943c3401c6
								
							
						 | 
						
							
							
								
								<feat>支付接口
							
							
							
							
							
						 | 
						
							2024-08-06 16:53:59 +08:00 | 
						
					
				
					
						
							
							
								
								 Rzy
							
						 | 
						
							
							
							
							
							
								
							
							
								548491c1f1
								
							
						 | 
						
							
							
								
								<feat>支付部分
							
							
							
							
							
						 | 
						
							2024-08-05 18:45:01 +08:00 | 
						
					
				
					
						
							
							
								
								 Rzy
							
						 | 
						
							
							
							
							
							
								
							
							
								79723bd945
								
							
						 | 
						
							
							
								
								支付准备
							
							
							
							
							
						 | 
						
							2024-08-05 17:07:11 +08:00 | 
						
					
				
					
						
							
							
								 
								wolter
							
						 | 
						
							
							
							
							
							
								
							
							
								0ac4feb07a
								
							
						 | 
						
							
							
								
								后台,订单字段调整fix
							
							
							
							
							
						 | 
						
							2024-08-05 17:01:58 +08:00 | 
						
					
				
					
						
							
							
								
								 Rzy
							
						 | 
						
							
							
							
							
							
								
							
							
								7dc1f9ef08
								
							
						 | 
						
							
							
								
								Merge branch 'dev/dev1.0' into feature/rzy/api_1.0
							
							
							
							
							
						 | 
						
							2024-08-05 16:23:48 +08:00 | 
						
					
				
					
						
							
							
								
								 Rzy
							
						 | 
						
							
							
							
							
							
								
							
							
								50924acbc7
								
							
						 | 
						
							
							
								
								Merge branch 'dev/dev1.0' of https://gitea.cdlsxd.cn/BaseSystem/PaymentCenter into dev/dev1.0
							
							
							
							
							
							
							
							# Conflicts:
#	app/models/appmodel/app.go 
							
						 | 
						
							2024-08-05 16:22:09 +08:00 | 
						
					
				
					
						
							
							
								
								 Rzy
							
						 | 
						
							
							
							
							
							
								
							
							
								3e7df62375
								
							
						 | 
						
							
							
								
								<feat>网页支付
							
							
							
							
							
						 | 
						
							2024-08-05 16:20:01 +08:00 | 
						
					
				
					
						
							
							
								 
								wolter
							
						 | 
						
							
							
							
							
							
								
							
							
								65621d439b
								
							
						 | 
						
							
							
								
								后台,更新请求日志和回调日志data
							
							
							
							
							
						 | 
						
							2024-08-05 15:42:20 +08:00 | 
						
					
				
					
						
							
							
								
								 Rzy
							
						 | 
						
							
							
							
							
							
								
							
							
								b1a1a4cd50
								
							
						 | 
						
							
							
								
								<feat>api表单验证
							
							
							
							
							
						 | 
						
							2024-08-05 14:05:46 +08:00 | 
						
					
				
					
						
							
							
								
								 Rzy
							
						 | 
						
							
							
							
							
							
								
							
							
								4d28483087
								
							
						 | 
						
							
							
								
								Merge branch 'dev/dev1.0' into feature/rzy/api_1.0
							
							
							
							
							
							
							
							# Conflicts:
#	app/constants/errorcode/error_code.go 
							
						 | 
						
							2024-08-05 10:56:30 +08:00 | 
						
					
				
					
						
							
							
								
								 Rzy
							
						 | 
						
							
							
							
							
							
								
							
							
								13dce2d1c3
								
							
						 | 
						
							
							
								
								加密解密
							
							
							
							
							
						 | 
						
							2024-08-05 10:55:35 +08:00 | 
						
					
				
					
						
							
							
								
								 Rzy
							
						 | 
						
							
							
							
							
							
								
							
							
								aa1481b923
								
							
						 | 
						
							
							
								
								合并代码
							
							
							
							
							
						 | 
						
							2024-08-02 18:38:51 +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 |