YunaiV
|
b8a4d8cab2
|
分销：避免报错
|
2 years ago |
|
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
|
2 years ago |
|
YunaiV
|
62a4e8242b
|
分销：增加提现接口
|
2 years ago |
|
芋道源码
|
ea26691967
|
!607 member: 佣金解冻
Merge pull request !607 from 疯狂的世界/brokerate_unfreeze
|
2 years ago |
|
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
|
2 years ago |
|
YunaiV
|
fcca69d243
|
修复 revision 在 Maven install、deploy 时，不替换为版本号的问题
|
2 years ago |
|
zhijiantianya@gmail.com
|
beb385aab4
|
修复 revision 在 Maven install、deploy 时，不替换为版本号的问题
|
2 years ago |
jason
|
9074312fe3
|
后台接入钱包支付
|
2 years ago |
|
jason
|
4a0fa2a3a4
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2 years ago |
|
jason
|
3f51be6a2d
|
钱包。删除不需要的类
|
2 years ago |
owen
|
fa53a3b15e
|
trade: MemberBrokerageRecord 重命名为 TradeBrokerageRecord
|
2 years ago |
|
owen
|
9336a0a102
|
trade: 分销业务从 member 模块 转移到 trade模块
|
2 years ago |
|
YunaiV
|
e4b153a866
|
分佣：增加获得分销排行分页 API mock
|
2 years ago |
|
owen
|
a68691f2d9
|
trade: 增加分销用户表
|
2 years ago |
|
owen
|
6474502738
|
trade: 增加交易中心配置表
|
2 years ago |
|
YunaiV
|
0329f13fbf
|
分佣：增加获得分销排行分页 API mock
|
2 years ago |
|
owen
|
9eb7837b67
|
member: 佣金失效
|
2 years ago |
|
owen
|
a708521b9d
|
member: 佣金解冻
|
2 years ago |
|
owen
|
2f6092005b
|
member: 佣金解冻
|
2 years ago |
|
jason
|
f99e2aec2d
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2 years ago |
|
jason
|
f3ca0f066b
|
会员钱包 查询订单和查询退款单的实现
|
2 years ago |
|
芋道源码
|
a58d7d63ed
|
!606 会员：分销佣金计算
Merge pull request !606 from 疯狂的世界/brokerage
|
2 years ago |
|
owen
|
090058a2ba
|
member: 佣金不冻结时，直接就是结算状态
|
2 years ago |
|
owen
|
c7ef8519c8
|
member: 分销增加佣金
|
2 years ago |
|
YunaiV
|
eae8218f0d
|
分佣：增加获得分销排行分页 API mock
|
2 years ago |
|
YunaiV
|
7389e4fb65
|
分佣：增加获得分销记录分页 API mock
|
2 years ago |
|
YunaiV
|
fc56a15f76
|
分佣：增加用户分销记录、提现 API mock
|
2 years ago |
|
jason
|
cc4c924717
|
钱包 review DO 类修改
|
2 years ago |
|
jason
|
91b03e7c93
|
钱包 review 修改
|
2 years ago |
|
YunaiV
|
6a819da0b6
|
分佣：增加用户分销统计 API mock
|
2 years ago |
|
owen
|
991b53649b
|
member: 分销配置
|
2 years ago |
|
YunaiV
|
36b3cfafd2
|
同步 v1.8.1 SQL 脚本
|
2 years ago |
|
YunaiV
|
5308e309ea
|
同步 https://gitee.com/zhijiantianya/yudao-cloud/pulls/51/files
|
2 years ago |
|
YunaiV
|
379c143dbb
|
修复：#320 支付手续费计算不正确，超过付款金额 #334
|
2 years ago |
|
YunaiV
|
a532ba0579
|
Merge branch 'master' of https://github.com/YunaiV/ruoyi-vue-pro
|
2 years ago |
|
芋道源码
|
05fc322919
|
Merge pull request #334 from freesme/fix-master-#320-calculation-error
修复：#320 支付手续费计算不正确，超过付款金额
|
2 years ago |
|
芋道源码
|
0cb7d8a29a
|
Merge pull request #335 from freesme/master-fix-#330wx-mini-jump-failed
修复：微信公众号菜单添加跳转小程序失败
|
2 years ago |
|
YunaiV
|
4db3de8d86
|
Merge branch 'master' of https://github.com/YunaiV/ruoyi-vue-pro
|
2 years ago |
|
芋道源码
|
a1f6826e14
|
Merge pull request #337 from freesme/fix-master-#319-wx-pay-client-error
修复：#319 微信支付初始化 client 客户端错误，导致发起支付报错
|
2 years ago |
|
YunaiV
|
4809e9b462
|
修复单元测试报错的问题
|
2 years ago |
|
YunaiV
|
8f86f65884
|
Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2 years ago |
|
YunaiV
|
482a84a6f1
|
603 mall: 优惠券退还优化
|
2 years ago |
|
芋道源码
|
670f2ef5da
|
!603 mall: 优惠券退还优化
Merge pull request !603 from 疯狂的世界/mall_order_cancel
|
2 years ago |
|
芋道源码
|
8321d14b0b
|
!599 Crontab组件radio的label类型不一致
Merge pull request !599 from 高小牛/master
|
2 years ago |
|
YunaiV
|
b69d4e0852
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
|
2 years ago |
|
芋道源码
|
80a5889757
|
!565 vben代码生成模版
Merge pull request !565 from xingyu/feature/vben_codegen
|
2 years ago |
|
芋道源码
|
7870283bfa
|
!594 兼容spring web 配置上下文根路径的情况
Merge pull request !594 from suyh/master
|
2 years ago |
|
芋道源码
|
e67b62f2f6
|
!604 优惠券优化
Merge pull request !604 from 疯狂的世界/coupon
|
2 years ago |
|
YunaiV
|
9148170926
|
调整 mapper 命名，避免可能的冲突
|
2 years ago |
|
owen
|
71efa0ed6f
|
promotion: 订单使用品类券时，根据品类过滤可用商品
|
2 years ago |