|
|
b3fcefa677
|
trade: 会员取消订单
|
2023-09-01 20:37:20 +08:00 |
|
|
|
af0771a175
|
!597 优惠券
Merge pull request !597 from 疯狂的世界/owen_dev
|
2023-09-01 12:12:02 +00:00 |
|
|
|
28adfff10e
|
code review：订单逻辑
|
2023-09-01 20:00:04 +08:00 |
|
|
|
8dd600a300
|
!600 订单中心：修改获取售后订单详情接口，修改订单管理后台物流获取接口
Merge pull request !600 from puhui999/feature/mall_product
|
2023-09-01 11:49:23 +00:00 |
|
|
|
dd6adb8ee6
|
code review order
|
2023-09-01 19:08:27 +08:00 |
|
|
|
e26814be31
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
|
2023-09-01 12:13:11 +08:00 |
|
|
|
1f9968d784
|
订单中心：修改获取售后订单详情接口，修改订单管理后台物流获取接口
|
2023-09-01 12:12:15 +08:00 |
|
|
|
1ca5dd7e93
|
Crontab组件radio的label类型不一致
|
2023-09-01 08:48:07 +08:00 |
|
|
|
891ed3d055
|
Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2023-09-01 00:34:06 +08:00 |
|
|
|
361ad2e22a
|
同步最新商城演示图
|
2023-09-01 00:33:17 +08:00 |
|
|
|
e6f1e5d968
|
同步最新商城演示图
|
2023-09-01 00:28:39 +08:00 |
|
|
|
26129b52a8
|
同步最新 SQL 脚本
|
2023-08-31 20:47:30 +08:00 |
|
|
|
d982a95fdd
|
Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2023-08-31 20:38:59 +08:00 |
|
|
|
ba444c9538
|
code review：支付钱包
|
2023-08-31 20:13:12 +08:00 |
|
|
|
bca6fb4698
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-08-31 20:06:10 +08:00 |
|
|
|
f28b960319
|
调整最新图片 url
|
2023-08-31 20:06:02 +08:00 |
|
|
|
457312d5aa
|
修改 PayClientFactory 创建 PayClient 方法
|
2023-08-31 14:30:12 +08:00 |
|
|
|
7d4d3bea55
|
Revert "创建 PayClient 迁移到 PayChannelService"
This reverts commit 716727bfa7.
|
2023-08-31 08:27:22 +08:00 |
|
|
|
60d4aa97fb
|
code review：售后详情接口
|
2023-08-30 20:18:40 +08:00 |
|
|
|
059202a588
|
购物车：调整购物车接口
|
2023-08-30 19:14:28 +08:00 |
|
|
|
73f1636daa
|
售后日志添加售前售后状态
|
2023-08-30 10:58:37 +08:00 |
|
|
|
3e4b1c0552
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-08-30 08:43:13 +08:00 |
|
|
|
5a788af084
|
购物车：简化 cart 表命名
|
2023-08-30 08:43:07 +08:00 |
|
|
|
278f2af8f8
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-08-29 15:29:02 +08:00 |
|
|
|
716727bfa7
|
创建 PayClient 迁移到 PayChannelService
|
2023-08-29 15:28:24 +08:00 |
|
|
|
e8662e35e1
|
修复：微信支付初始化 client 客户端错误，导致发起支付报错
|
2023-08-29 11:45:04 +08:00 |
|
|
|
dac0d2d693
|
修复：微信公众号菜单添加跳转小程序失败
|
2023-08-29 11:03:55 +08:00 |
|
|
|
3e488d4308
|
!595 订单售后退款：添加获取售后订单详情接口
Merge pull request !595 from puhui999/feature/mall_product
|
2023-08-29 02:00:41 +00:00 |
|
|
|
9507b6d800
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
|
2023-08-29 09:54:39 +08:00 |
|
|
|
d5fe7708ce
|
订单售后退款：添加获取售后订单详情接口
|
2023-08-29 09:54:14 +08:00 |
|
|
|
cc71aabd3d
|
钱包：钱包流水 api
|
2023-08-29 00:31:54 +08:00 |
|
|
|
ddcb3e69f9
|
会员等级 app 接口
|
2023-08-28 21:01:46 +08:00 |
|
|
|
6132443d26
|
code review：钱包实现
|
2023-08-28 18:54:40 +08:00 |
|
|
|
0411b3464a
|
订单售后退款：添加获取售后订单详情接口
|
2023-08-28 17:21:29 +08:00 |
|
|
|
9077f14bae
|
钱包支付 Client 失败问题修改
|
2023-08-28 13:54:25 +08:00 |
|
|
|
3d894ca7f5
|
修复：#320 支付手续费计算不正确，超过付款金额
(cherry picked from commit 0df2d7191f7a467f2eeeb5bd19217a4a039395db)
|
2023-08-28 11:20:19 +08:00 |
|
|
|
7237bc07bb
|
钱包退款的实现
|
2023-08-28 10:25:50 +08:00 |
|
|
|
498edfffb1
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
|
2023-08-28 09:24:04 +08:00 |
|
|
|
655eefc340
|
订单管理：完善订单管理提到的一些问题
|
2023-08-28 09:23:30 +08:00 |
|
|
|
c7f6f92159
|
钱包支付 Client 的实现
|
2023-08-28 07:39:03 +08:00 |
|
|
|
d82729e4c6
|
同步最新会员中心 SQL
|
2023-08-27 21:15:44 +08:00 |
|
|
|
8b98d13d8b
|
Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2023-08-27 21:05:42 +08:00 |
|
|
|
1baa7f4aee
|
优化 AlipayPcPayClientTest 的方法命名，补全 assert 断言
|
2023-08-27 16:33:19 +08:00 |
|
|
|
35c1ba44d3
|
优化 AbstractAlipayClientTest、AlipayBarPayClientTest 的方法命名，补全 assert 断言
|
2023-08-27 16:15:41 +08:00 |
|
|
|
2acf5c878f
|
兼容spring boot web 提供的上下文根路径的匹配
spring.servlet.content-path
|
2023-08-27 11:59:38 +08:00 |
|
|
|
02bc9d28de
|
解决 MapStruct 的时区问题
|
2023-08-27 11:19:48 +08:00 |
|
|
|
3dd273a30d
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2023-08-27 11:10:57 +08:00 |
|
|
|
6696bb8943
|
!586 解决MapStruct进行LocalDateTime和Date转换时的时区问题，使用Mapper注解的uses参数
Merge pull request !586 from clockdotnet/master_pr
|
2023-08-27 03:10:48 +00:00 |
|
|
|
40560f9618
|
!569 fix: posgres sql
Merge pull request !569 from 天天写BUG/master
|
2023-08-27 03:07:44 +00:00 |
|
|
|
7d99c6dbe8
|
Merge branch 'master' of https://github.com/YunaiV/ruoyi-vue-pro
|
2023-08-27 10:52:37 +08:00 |
|
