Commit Graph

Select branches

Hide Pull Requests

dev/dev1.0

dev/dev2.0

feature/rzy/api_1.0

feature/zhifu

feature/zxp

feature_413_cjh

master

prod/prod1.0

prod/prod2.0

Mono Color

• 3f26ffa8cb feat: 收银台只有一个支付方式默认唤起 prod/prod2.0 dev/dev2.0 wolter 2025-02-18 10:47:17 +0800
• d634ca7d22 feat: v2预支付fix wolter 2024-12-25 14:36:08 +0800
• 9397b72a2e feat: 微信jsapi支付成功修复跳转链接为空fix wolter 2024-12-25 14:07:48 +0800
• 74c1039d1c feat: 请求写日志fix wolter 2024-12-25 13:39:07 +0800
• 888fb18165 feat: 支付回调通知下游状态fix wolter 2024-12-24 15:58:50 +0800
• 9a2c47ec0d feat: 收银台页面调整展示内容，付款模板页面调整展示内容，接口错误提示修改 wolter 2024-12-24 14:57:33 +0800
• 2a21f854e1 feat: 收银台 wolter 2024-12-23 15:42:16 +0800
• 64973f683d feat: 付款链接接口 wolter 2024-12-21 17:26:26 +0800
• 0ae425e4bb feat: 下单接口v2 wolter 2024-12-21 15:48:48 +0800
• 49ce121677 feat: 微信取消支付 prod/prod1.0 dev/dev1.0 wolter 2024-12-10 09:23:34 +0800
• 4c955e345b feat: 微信取消支付 wolter 2024-12-10 09:09:58 +0800
• cfec0f5fca feat: 微信支付成功跳转return feature/zhifu wolter 2024-12-07 15:09:02 +0800
• 964a0808b9 feat: 微信支付错误提示，跳转return wolter 2024-12-07 14:35:43 +0800
• cacfbccbcf feat: 微信退款fix wolter 2024-12-06 22:06:05 +0800
• 24c0c6d36a feat: 微信回调fix wolter 2024-12-06 21:57:17 +0800
• c2fd9e68f9 feat: 微信支付fix1 wolter 2024-12-06 21:30:45 +0800
• ebcb3a9d7f feat: 微信支付fix wolter 2024-12-06 20:42:44 +0800
• 81dfd00cf9 feat: 微信支付2 wolter 2024-12-06 19:51:52 +0800
• 5c32d74165 feat: 微信支付fix1 wolter 2024-12-06 16:02:22 +0800
• 7588991d54 feat: 微信支付fix wolter 2024-12-06 15:51:29 +0800
• de1f1d01fc feat: 微信支付 wolter 2024-12-06 15:23:57 +0800
• a03d0947a5 feat: dockerfile wolter 2024-12-06 09:29:15 +0800
• 1d3288acca feat: 微信jsapi wolter 2024-12-06 09:22:21 +0800
• 96aa3b16da feat: 微信jsapi wolter 2024-12-06 09:16:53 +0800
• fd57130499 Merge branch 'refs/heads/dev/dev1.0' into feature/zhifu wolter 2024-12-05 18:41:36 +0800
• 67265ef3fc feat: sm2加密fix wolter 2024-12-05 18:39:46 +0800
• 99aa763357 feat:ras加密fix wolter 2024-12-05 18:19:13 +0800
• 2e938f241a feat:ras加密fix wolter 2024-12-04 14:45:34 +0800
• d4fa337e3f feat:调整数据库Id生成 wolter 2024-08-27 15:45:34 +0800
• d2541661e9 fix:前台，预支付校验支付方式 wolter 2024-08-26 15:33:07 +0800
• 0be3db7a89 fix:前台，预支付校验支付方式 wolter 2024-08-26 14:59:18 +0800
• 2cb6a07362 feat:前台，returnUrl不必填 wolter 2024-08-26 09:34:28 +0800
• e77a7622b1 feat:前台，api关闭的订单接口 wolter 2024-08-23 14:22:48 +0800
• 9dac2644d4 后台：商户列表名称和联系人搜索不区分大小写 wolter 2024-08-21 15:26:53 +0800
• 89b37a73c4 后台：处理时间为空 wolter 2024-08-21 15:19:36 +0800
• 6db5f7d504 微信退款 陈俊宏 2024-08-20 15:28:42 +0800
• c64c0d8f54 微信退款 陈俊宏 2024-08-20 15:25:22 +0800
• 2c88c0b019 Merge remote-tracking branch 'origin/dev/dev1.0' into dev/dev1.0 陈俊宏 2024-08-20 11:27:37 +0800
• c0724d3356 微信退款，需要原订单总额 陈俊宏 2024-08-20 11:26:25 +0800
• 6ac8bd8710 feat:前台,增加支付完成后的跳转 wolter 2024-08-20 10:49:27 +0800
• fe0fe5123f 退款fix wolter 2024-08-14 18:52:25 +0800
• 39162a1750 修改回调 wolter 2024-08-14 16:40:24 +0800
• 921c40606b <fix>修改回调 renzhiyuan 2024-08-14 14:01:10 +0800
• 2035af1580 前台，回调增加支付金额,记录回调日志 wolter 2024-08-14 13:37:27 +0800
• 6a977db12e 前台fix，回调 wolter 2024-08-13 18:30:44 +0800
• 2f88c1be58 Merge remote-tracking branch 'origin/dev/dev1.0' into dev/dev1.0 wolter 2024-08-12 18:27:59 +0800
• 54a93ef082 后台，应用加密取消必填 wolter 2024-08-12 18:27:22 +0800
• b34dd4f96f 修改bug Rzy 2024-08-12 18:09:24 +0800
• 45bc1e9cf0 去除控制台错误打印 陈俊宏 2024-08-12 15:56:31 +0800
• 86af800c7c Merge remote-tracking branch 'origin/dev/dev1.0' into dev/dev1.0 陈俊宏 2024-08-12 14:55:02 +0800
• 5247c2999f 微信回调APPID问题 陈俊宏 2024-08-12 14:54:52 +0800
• 37100eb589 Merge remote-tracking branch 'origin/dev/dev1.0' into dev/dev1.0 Rzy 2024-08-12 14:38:27 +0800
• 8549c0fbbd <feat>调整结构，可以返回第三方消息 Rzy 2024-08-12 14:37:48 +0800
• 553679efa5 测试：微信唤起支付 wolter 2024-08-12 14:37:36 +0800
• e2378b0a39 去掉第三方消息返回给接口 Rzy 2024-08-12 14:33:09 +0800
• 8fb2f52108 去掉第三方消息返回给接口 Rzy 2024-08-12 14:32:46 +0800
• b3b782dfe6 去掉第三方消息返回给接口 Rzy 2024-08-12 14:31:56 +0800
• 7a45794fbc <feat>退款单判重和第三方消息处理返回 Rzy 2024-08-12 14:09:11 +0800
• 05b0663c21 后台，生成密钥对rsa加密去掉换行 wolter 2024-08-12 13:44:11 +0800
• e1bd366989 前台，响应fix wolter 2024-08-12 13:42:22 +0800
• 4032cbdd5b 后台，应用可不加密 wolter 2024-08-12 11:08:24 +0800
• 18d5f96096 Merge remote-tracking branch 'origin/dev/dev1.0' into dev/dev1.0 Rzy 2024-08-12 10:51:20 +0800
• 1d5303a4d1 <feat>不加密类型 Rzy 2024-08-12 10:50:55 +0800
• ef153770af fix:退款 wolter 2024-08-12 10:47:40 +0800
• e760d92332 fix:记录请求日志 wolter 2024-08-12 09:52:05 +0800
• 848ebcc443 <feat>报错内容错误 Rzy 2024-08-12 09:18:06 +0800
• c15044b862 <feat>修改细节 Rzy 2024-08-09 18:13:16 +0800
• f24a725cef Merge branch 'dev/dev1.0' into feature_413_cjh feature_413_cjh 陈俊宏 2024-08-09 17:59:41 +0800
• bdfd4c6b9c 支付服务 陈俊宏 2024-08-09 17:59:19 +0800
• 595726bc60 Merge remote-tracking branch 'origin/dev/dev1.0' into dev/dev1.0 wolter 2024-08-09 17:51:58 +0800
• 413f312ef6 实际支付金额fix wolter 2024-08-09 17:51:44 +0800
• c13634ed08 <feat>退款 Rzy 2024-08-09 17:49:41 +0800
• a54212d38c 解决冲突 Rzy 2024-08-09 17:26:50 +0800
• bb9ff190c3 <feat>退款 Rzy 2024-08-09 17:24:03 +0800
• 78380d3a70 前台,订单查询fix wolter 2024-08-09 17:14:30 +0800
• 9a413afa51 后台,订单日志列表增加查询条件 wolter 2024-08-09 16:40:21 +0800
• 7ed9cb048d Merge remote-tracking branch 'origin/dev/dev1.0' into dev/dev1.0 Rzy 2024-08-09 16:12:31 +0800
• d76344573d <feat>rsa加密长度限制改善 Rzy 2024-08-09 16:12:13 +0800
• b0be00741f 后台,订单日志列表 wolter 2024-08-09 16:05:34 +0800
• 966aba1dc4 调整api接口返回加密 wolter 2024-08-09 15:23:08 +0800
• a6e8412654 Merge branch 'feature_413_cjh' into dev/dev1.0 陈俊宏 2024-08-09 11:42:14 +0800
• 583aee88e2 支付服务 陈俊宏 2024-08-09 11:41:08 +0800
• 92733acffa <feat>订单重复创建问题 Rzy 2024-08-09 11:20:33 +0800
• 1630304f3d <feat>解除pay和paycheck之间的强关联性 Rzy 2024-08-09 10:43:00 +0800
• 50ef2fd13a <feat>区分是否需要记录日志 Rzy 2024-08-09 10:08:30 +0800
• b3d8acba93 前台,调整回调通知地址 wolter 2024-08-08 18:32:56 +0800
• 8c05e8ff06 后台,应用通知地址 wolter 2024-08-08 18:16:53 +0800
• 5e0627a0f3 增加下游回调日志记录 wolter 2024-08-08 17:55:26 +0800
• f6bdfdf84c Merge remote-tracking branch 'origin/dev/dev1.0' into dev/dev1.0 陈俊宏 2024-08-08 17:25:58 +0800
• 6357d6706d 记录third表的日志信息 陈俊宏 2024-08-08 17:25:42 +0800
• 9b7f904108 回调判断 Rzy 2024-08-08 17:00:22 +0800
• 0755b14aa2 <feat>去掉删除判断 Rzy 2024-08-08 16:37:23 +0800
• 1f7d46c110 <feat>去掉删除判断 feature/rzy/api_1.0 Rzy 2024-08-08 16:20:36 +0800
• 7f20bf6925 <feat>增加解密失败报错 Rzy 2024-08-08 15:46:54 +0800
• 39e64c8a22 后台，rsa生成密钥调整,关闭订单fix wolter 2024-08-08 15:44:02 +0800
• e5f50423ad Merge branch 'dev/dev1.0' into feature_413_cjh 陈俊宏 2024-08-08 15:06:28 +0800
• 222522dc76 记录third表 陈俊宏 2024-08-08 14:59:15 +0800
• 9c725163c8 Merge branch 'feature/rzy/api_1.0' into dev/dev1.0 Rzy 2024-08-08 14:53:39 +0800
• ee912a204d <feat>退款 Rzy 2024-08-08 14:52:30 +0800
• 627e1c852c 后台，密钥对和api接口对应 wolter 2024-08-08 14:19:07 +0800