YunaiV
|
314dee430e
|
bugfix:微信公众号登录报 access token 的问题
|
2023-09-11 11:06:42 +08:00 |
|
芋道源码
|
3b5215db21
|
!611 分销用户管理、Review代码修改
Merge pull request !611 from 疯狂的世界/brokerate
|
2023-09-09 00:48:00 +00:00 |
|
YunaiV
|
87c55784c4
|
code review:营销活动+订单
|
2023-09-09 01:27:55 +08:00 |
|
owen
|
ddcebb1986
|
common: MoneyUtils 移到 common 模块
|
2023-09-08 12:46:43 +08:00 |
|
puhui999
|
5d6bb84d25
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
|
2023-09-08 00:59:53 +08:00 |
|
YunaiV
|
5808f77ade
|
code review:订单分佣
|
2023-09-08 00:29:25 +08:00 |
|
YunaiV
|
eb342d5abf
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
# Conflicts:
# yudao-module-member/yudao-module-member-biz/src/test/resources/sql/create_tables.sql
|
2023-09-06 23:50:55 +08:00 |
|
YunaiV
|
bf92727b27
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
Conflicts:
yudao-module-member/yudao-module-member-biz/src/test/resources/sql/create_tables.sql
|
2023-09-06 21:40:53 +08:00 |
|
puhui999
|
2591ab5d36
|
订单中心+营销活动:完善部分 TODO 提到的问题
|
2023-09-06 11:29:51 +08:00 |
|
jason
|
4a0fa2a3a4
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-09-06 08:50:33 +08:00 |
|
jason
|
3f51be6a2d
|
钱包。删除不需要的类
|
2023-09-06 08:50:22 +08:00 |
|
YunaiV
|
e4b153a866
|
分佣:增加获得分销排行分页 API mock
|
2023-09-05 23:49:35 +08:00 |
|
YunaiV
|
5308e309ea
|
同步 https://gitee.com/zhijiantianya/yudao-cloud/pulls/51/files
|
2023-09-03 18:44:03 +08:00 |
|
YunaiV
|
4db3de8d86
|
Merge branch 'master' of https://github.com/YunaiV/ruoyi-vue-pro
|
2023-09-03 18:30:46 +08:00 |
|
芋道源码
|
a1f6826e14
|
Merge pull request #337 from freesme/fix-master-#319-wx-pay-client-error
修复:#319 微信支付初始化 client 客户端错误,导致发起支付报错
|
2023-09-03 18:30:32 +08:00 |
|
YunaiV
|
b69d4e0852
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
|
2023-09-03 17:59:50 +08:00 |
|
芋道源码
|
7870283bfa
|
!594 兼容spring web 配置上下文根路径的情况
Merge pull request !594 from suyh/master
|
2023-09-03 09:55:39 +00:00 |
|
owen
|
6a7be19d3a
|
common: 增加InEnumCollectionValidator,用于校验枚举值列表参数的取值范围是否有䇅
|
2023-09-02 08:44:02 +08:00 |
|
YunaiV
|
d982a95fdd
|
Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2023-08-31 20:38:59 +08:00 |
|
YunaiV
|
ba444c9538
|
code review:支付钱包
|
2023-08-31 20:13:12 +08:00 |
|
jason
|
457312d5aa
|
修改 PayClientFactory 创建 PayClient 方法
|
2023-08-31 14:30:12 +08:00 |
|
jason
|
7d4d3bea55
|
Revert "创建 PayClient 迁移到 PayChannelService"
This reverts commit 716727bfa7 .
|
2023-08-31 08:27:22 +08:00 |
|
jason
|
716727bfa7
|
创建 PayClient 迁移到 PayChannelService
|
2023-08-29 15:28:24 +08:00 |
|
Krane
|
e8662e35e1
|
修复:微信支付初始化 client 客户端错误,导致发起支付报错
|
2023-08-29 11:45:04 +08:00 |
|
YunaiV
|
6132443d26
|
code review:钱包实现
|
2023-08-28 18:54:40 +08:00 |
|
jason
|
7237bc07bb
|
钱包退款的实现
|
2023-08-28 10:25:50 +08:00 |
|
jason
|
c7f6f92159
|
钱包支付 Client 的实现
|
2023-08-28 07:39:03 +08:00 |
|
YunaiV
|
8b98d13d8b
|
Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2023-08-27 21:05:42 +08:00 |
|
YunaiV
|
1baa7f4aee
|
优化 AlipayPcPayClientTest 的方法命名,补全 assert 断言
|
2023-08-27 16:33:19 +08:00 |
|
YunaiV
|
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 |
|
YunaiV
|
3dd273a30d
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2023-08-27 11:10:57 +08:00 |
|
YunaiV
|
7d99c6dbe8
|
Merge branch 'master' of https://github.com/YunaiV/ruoyi-vue-pro
|
2023-08-27 10:52:37 +08:00 |
|
芋道源码
|
544e650e15
|
Merge pull request #326 from Lemon-cc-hang/base
fix: 在调用 selectList() 的时候 如果 Collection 参数为空会报错 sql 异常
|
2023-08-27 10:52:15 +08:00 |
|
YunaiV
|
acee734554
|
Merge branch 'master' of https://github.com/YunaiV/ruoyi-vue-pro
|
2023-08-27 10:44:48 +08:00 |
|
JUNHAO
|
5cc3e6510b
|
使用Parenthesis为原有表达式添加括号
|
2023-08-24 14:38:47 +08:00 |
|
jason
|
b119aadba5
|
支付宝 条码支付 Client 单元测试
|
2023-08-23 12:30:15 +08:00 |
|
shizhong
|
eb4434ecbc
|
解决MapStruct的时区问题
|
2023-08-23 12:11:47 +08:00 |
|
jason
|
c0ffaf8ea9
|
支付宝 PC 网站 Client 单元测试
|
2023-08-22 22:17:27 +08:00 |
|
jason
|
c7f0b5c73d
|
支付宝 H5 Client 单元测试
|
2023-08-22 22:17:27 +08:00 |
|
jason
|
eff9fafde8
|
创建支付宝 Client 抽象类测试类, 测试公共方法
|
2023-08-22 08:40:41 +08:00 |
|
YunaiV
|
e8c1bdde3d
|
会员中心:会员管理 50%
|
2023-08-19 14:12:03 +08:00 |
|
jason
|
6fbf7b261b
|
扫码支付统一退款单元测试, 修复退款失败,渠道错误未赋值bug
|
2023-08-17 21:52:53 +08:00 |
|
jason
|
1b03fdb08b
|
支付宝 扫码支付 统一下单 单元测试
|
2023-08-16 08:51:27 +08:00 |
|
YunaiV
|
e4a2c738b2
|
订单:
1. 增加查询物流接口
|
2023-08-15 20:18:22 +08:00 |
|
lemoncc
|
5b9106fdb5
|
fix: 在调用 selectList() 的时候 如果 Collection 参数为空会报错 sql 异常
|
2023-08-15 17:54:55 +08:00 |
|
YunaiV
|
5fcd0a21da
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
|
2023-08-11 22:44:20 +08:00 |
|
YunaiV
|
9ff67b479f
|
!562 优化 redisCache
|
2023-08-11 21:46:53 +08:00 |
|
芋道源码
|
8960a82978
|
!562 优化 redisCache
Merge pull request !562 from wanwan/feature/redis_cache_optimize_20230810
|
2023-08-11 12:09:10 +00:00 |
|
wanwan
|
134e5ca20f
|
feat: 将 redisCache 的扫描策略设置成 scan
|
2023-08-10 15:27:19 +08:00 |
|