huangge1199/vue-pro
1
0
Fork 0
mirror of https://gitee.com/huangge1199_admin/vue-pro.git synced 2024-11-24 08:11:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
5,729 Commits 1 Branch 0 Tags 176 MiB
2dd835893a
Commit Graph

5729 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
owen
643602d038 trade: 分销业务后台功能：修改上级推广人 2023-09-09 19:20:12 +08:00
jason
5858f57fe9 钱包 review 修改 2023-09-09 18:32:53 +08:00
YunaiV
5a940b1d2c 修复 knife4j get 参数无法正确展示的问题 2023-09-09 15:04:22 +08:00
YunaiV
a5e33f6d3a 引入 mybatis plus join 作为基类 2023-09-09 14:56:30 +08:00
owen
ca55e61dd2 trade: 分销业务后台功能：清除推广员、修改推广资格 2023-09-09 14:38:47 +08:00
YunaiV
65d7b30011 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2023-09-09 10:35:14 +08:00
YunaiV
55f8585ea8 同步 2023-09-09 10:34:58 +08:00
芋道源码
fcf8ec98a0
!608 Date转localDateTime 
Merge pull request !608 from GamePlayer-Joker/master
 2023-09-09 02:22:13 +00:00
芋道源码
5719b7df06
!612 使用下划线分隔ErrorCodeConstants的ErrorCode 
Merge pull request !612 from dhb52/master
 2023-09-09 02:20:55 +00:00
芋道源码
5d4a750dfb
!609 ID列存在换行符造成SQL Server建库时列名异常，并造成后续相关命令执行失败 
Merge pull request !609 from samisgod/master
 2023-09-09 02:20:03 +00:00
YunaiV
7bf21fb02d Merge branch 'master' of https://github.com/YunaiV/ruoyi-vue-pro 2023-09-09 10:14:11 +08:00
芋道源码
57d2b7e3be
Merge pull request #342 from Lemon-cc-hang/social 
🌈 style: 描述错误, 社交类型的枚举为 SocialTypeEnum 而不是 SysUserSocialTypeEnum
 2023-09-09 10:13:54 +08:00
YunaiV
557b09a157 code review：分销逻辑 2023-09-09 09:41:57 +08:00
芋道源码
3b5215db21
!611 分销用户管理、Review代码修改 
Merge pull request !611 from 疯狂的世界/brokerate
 2023-09-09 00:48:00 +00:00
owen
4e9be7a181 trade: 分销业务后台功能：修改推广资格 2023-09-09 01:58:46 +08:00
owen
259734964d trade: 分销业务后台功能：清除推广员、修改推广员 2023-09-09 01:54:48 +08:00
owen
f97c7a0f6e trade: 分销业务绑定推广员 2023-09-09 01:46:42 +08:00
dhb52
d7488e70b0 使用下划线分割ErrorCodeConstants的ErrorCode 2023-09-09 01:30:51 +08:00
YunaiV
87c55784c4 code review：营销活动+订单 2023-09-09 01:27:55 +08:00
芋道源码
5235aff8ad
!610 营销活动+订单：完善大部分 TODO 提到的问题 
Merge pull request !610 from puhui999/feature/mall_product
 2023-09-08 15:36:51 +00:00
owen
6ef36d5ca6 trade: 增加分销 API 2023-09-08 23:33:02 +08:00
owen
1ead368595 trade: 优化分销用户佣金字段名称 2023-09-08 23:10:04 +08:00
owen
4b43304c76 trade: 优化分销用户绑定用户编号、绑定时间字段名称 2023-09-08 22:51:05 +08:00
YunaiV
3e09da0128 code review：支付钱包 2023-09-08 22:47:00 +08:00
owen
f36a6c5d6c trade: 优化修改推广员接口字段名称 2023-09-08 22:40:49 +08:00
owen
b85d660a5c trade: 分销业务完善校验 2023-09-08 22:33:44 +08:00
lemoncc
2fd201c7fa
🌈 style: 描述错误, 社交类型的枚举为 SocialTypeEnum 而不是 SysUserSocialTypeEnum 2023-09-08 16:33:49 +08:00
owen
0a0c3c0ede trade: 分销业务相关类型移除Trade前缀 2023-09-08 12:56:34 +08:00
owen
ddcebb1986 common: MoneyUtils 移到 common 模块 2023-09-08 12:46:43 +08:00
owen
1cc2dfc963 trade: 分销Review代码修改 2023-09-08 12:29:38 +08:00
owen
166b1b31c0 trade: 分销用户管理 2023-09-08 11:03:57 +08:00
puhui999
5d6bb84d25 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 2023-09-08 00:59:53 +08:00
puhui999
0e8755972c 营销活动+订单：完善大部分 TODO 提到的问题 2023-09-08 00:35:54 +08:00
YunaiV
5808f77ade code review：订单分佣 2023-09-08 00:29:25 +08:00
samisgod
a4d6d5e6c3 fix db creation error 2023-09-07 16:18:24 +08:00
YunaiV
b3d3efc8c4 升级 springdoc、knife4j 版本 2023-09-07 12:59:36 +08:00
YunaiV
b8a4d8cab2 分销：避免报错 2023-09-07 12:29:50 +08:00
GamePlayer-Joker
1bf182c341
补充 
Signed-off-by: GamePlayer-Joker <13317488+gameplayer-joker@user.noreply.gitee.com>
 2023-09-07 02:18:41 +00:00
GamePlayer-Joker
76a8fb8a0a
AppCombinationRecordRespVO中的expireTime过期时间是LocalDateTime, 现在用的是new Date() 2023-09-07 01:41:46 +00: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
62a4e8242b 分销：增加提现接口 2023-09-06 23:50:23 +08:00
芋道源码
ea26691967
!607 member: 佣金解冻 
Merge pull request !607 from 疯狂的世界/brokerate_unfreeze
 2023-09-06 15:49:39 +00: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
YunaiV
fcca69d243 修复 revision 在 Maven install、deploy 时，不替换为版本号的问题 2023-09-06 20:41:52 +08:00
zhijiantianya@gmail.com
beb385aab4 修复 revision 在 Maven install、deploy 时，不替换为版本号的问题 2023-09-06 20:04:29 +08:00
puhui999
2591ab5d36 订单中心+营销活动：完善部分 TODO 提到的问题 2023-09-06 11:29:51 +08:00
jason
9074312fe3 后台接入钱包支付 2023-09-06 10:34:24 +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
owen
fa53a3b15e trade: MemberBrokerageRecord 重命名为 TradeBrokerageRecord 2023-09-06 00:35:40 +08:00