p38192567
/
ruoyi-vue-pro1
mirror of https://gitee.com/zhijiantianya/ruoyi-vue-pro.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
4,889 Commits 8 Branches 31 Tags 233 MiB
Commit Graph

4889 Commits

Author SHA1 Message Date
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
YunaiV b8a4d8cab2 分销：避免报错 2023-09-07 12:29:50 +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 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
owen 9336a0a102 trade: 分销业务从 member 模块 转移到 trade模块 2023-09-06 00:16:47 +08:00
YunaiV e4b153a866 分佣：增加获得分销排行分页 API mock 2023-09-05 23:49:35 +08:00
owen a68691f2d9 trade: 增加分销用户表 2023-09-05 23:45:53 +08:00
owen 6474502738 trade: 增加交易中心配置表 2023-09-05 22:31:36 +08:00
YunaiV 0329f13fbf 分佣：增加获得分销排行分页 API mock 2023-09-05 21:32:34 +08:00
owen 9eb7837b67 member: 佣金失效 2023-09-05 19:43:07 +08:00
owen a708521b9d member: 佣金解冻 2023-09-05 19:05:01 +08:00
owen 2f6092005b member: 佣金解冻 2023-09-05 18:59:24 +08:00
jason f99e2aec2d Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-09-05 12:44:43 +08:00
jason f3ca0f066b 会员钱包 查询订单和查询退款单的实现 2023-09-05 12:44:34 +08:00
芋道源码 a58d7d63ed
!606 会员：分销佣金计算 
Merge pull request !606 from 疯狂的世界/brokerage
 2023-09-05 01:58:11 +00:00
owen 090058a2ba member: 佣金不冻结时，直接就是结算状态 2023-09-05 09:27:12 +08:00
owen c7ef8519c8 member: 分销增加佣金 2023-09-05 08:56:39 +08:00
YunaiV eae8218f0d 分佣：增加获得分销排行分页 API mock 2023-09-05 00:11:41 +08:00
YunaiV 7389e4fb65 分佣：增加获得分销记录分页 API mock 2023-09-04 22:48:26 +08:00
YunaiV fc56a15f76 分佣：增加用户分销记录、提现 API mock 2023-09-04 21:00:03 +08:00
jason cc4c924717 钱包 review DO 类修改 2023-09-04 14:54:38 +08:00
jason 91b03e7c93 钱包 review 修改 2023-09-04 12:18:56 +08:00
YunaiV 6a819da0b6 分佣：增加用户分销统计 API mock 2023-09-03 21:21:33 +08:00
owen 991b53649b member: 分销配置 2023-09-03 21:19:42 +08:00
YunaiV 36b3cfafd2 同步 v1.8.1 SQL 脚本 2023-09-03 19:15:18 +08:00
YunaiV 5308e309ea 同步 https://gitee.com/zhijiantianya/yudao-cloud/pulls/51/files 2023-09-03 18:44:03 +08:00
YunaiV 379c143dbb 修复：#320 支付手续费计算不正确，超过付款金额 #334 2023-09-03 18:39:51 +08:00
YunaiV a532ba0579 Merge branch 'master' of https://github.com/YunaiV/ruoyi-vue-pro 2023-09-03 18:38:02 +08:00
芋道源码 05fc322919
Merge pull request #334 from freesme/fix-master-#320-calculation-error 
修复：#320 支付手续费计算不正确，超过付款金额
 2023-09-03 18:37:52 +08:00
芋道源码 0cb7d8a29a
Merge pull request #335 from freesme/master-fix-#330wx-mini-jump-failed 
修复：微信公众号菜单添加跳转小程序失败
 2023-09-03 18:34:33 +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 4809e9b462 修复单元测试报错的问题 2023-09-03 18:28:29 +08:00
YunaiV 8f86f65884 Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2023-09-03 18:07:05 +08:00
YunaiV 482a84a6f1 603 mall: 优惠券退还优化 2023-09-03 18:06:15 +08:00
芋道源码 670f2ef5da
!603 mall: 优惠券退还优化 
Merge pull request !603 from 疯狂的世界/mall_order_cancel
 2023-09-03 10:04:41 +00:00
芋道源码 8321d14b0b
!599 Crontab组件radio的label类型不一致 
Merge pull request !599 from 高小牛/master
 2023-09-03 10:02:32 +00: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
芋道源码 80a5889757
!565 vben代码生成模版 
Merge pull request !565 from xingyu/feature/vben_codegen
 2023-09-03 09:58:56 +00:00