owen
|
cddeb37289
|
Merge remote-tracking branch 'origin/feature/mall_product' into brokerate
# Conflicts:
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/brokerage/record/BrokerageRecordConvert.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/brokerage/user/BrokerageUserConvert.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/record/BrokerageRecordServiceImpl.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/user/BrokerageUserServiceImpl.java
|
2 years ago |
|
owen
|
6c193f723f
|
trade: 分销业务后台功能：推广订单列表
|
2 years ago |
jason
|
5858f57fe9
|
钱包 review 修改
|
2 years ago |
|
owen
|
ca55e61dd2
|
trade: 分销业务后台功能：清除推广员、修改推广资格
|
2 years ago |
|
owen
|
1ead368595
|
trade: 优化分销用户佣金字段名称
|
2 years ago |
|
owen
|
4b43304c76
|
trade: 优化分销用户绑定用户编号、绑定时间字段名称
|
2 years ago |
|
owen
|
1cc2dfc963
|
trade: 分销Review代码修改
|
2 years ago |
|
owen
|
166b1b31c0
|
trade: 分销用户管理
|
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
|
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 |
|
owen
|
fa53a3b15e
|
trade: MemberBrokerageRecord 重命名为 TradeBrokerageRecord
|
2 years ago |
|
owen
|
a68691f2d9
|
trade: 增加分销用户表
|
2 years ago |
|
owen
|
6474502738
|
trade: 增加交易中心配置表
|
2 years ago |
|
芋道源码
|
a58d7d63ed
|
!606 会员：分销佣金计算
Merge pull request !606 from 疯狂的世界/brokerage
|
2 years ago |
|
owen
|
c7ef8519c8
|
member: 分销增加佣金
|
2 years ago |
|
jason
|
cc4c924717
|
钱包 review DO 类修改
|
2 years ago |
|
YunaiV
|
36b3cfafd2
|
同步 v1.8.1 SQL 脚本
|
2 years ago |
|
YunaiV
|
26129b52a8
|
同步最新 SQL 脚本
|
2 years ago |
|
YunaiV
|
d982a95fdd
|
Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2 years ago |
chenchen
|
73f1636daa
|
售后日志添加售前售后状态
|
2 years ago |
|
YunaiV
|
cc71aabd3d
|
钱包：钱包流水 api
|
2 years ago |
|
YunaiV
|
d82729e4c6
|
同步最新会员中心 SQL
|
2 years ago |
|
YunaiV
|
8b98d13d8b
|
Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2 years ago |
|
芋道源码
|
40560f9618
|
!569 fix: posgres sql
Merge pull request !569 from 天天写BUG/master
|
2 years ago |
|
YunaiV
|
f5c5d38303
|
code review：商品评论
|
2 years ago |
|
owen
|
1e2c83d90f
|
mall: 商品评论表增加冗余 SKU 的图片地址, 规格
|
2 years ago |
|
jason
|
f33b66558c
|
新增查询钱包余额明细接口
|
2 years ago |
|
jason
|
1ffbd9399e
|
新增获得支付钱包接口
|
2 years ago |
|
YunaiV
|
9b6f5bd503
|
code review：会员等级
|
2 years ago |
|
owen
|
da8b2eab6d
|
合并冲突
|
2 years ago |
|
owen
|
4dd2d80887
|
Merge remote-tracking branch 'origin/feature/mall_product' into member_dev
# Conflicts:
# sql/mysql/member_level.sql
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberExperienceLogService.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelLogService.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelLogServiceImpl.java
|
2 years ago |
|
YunaiV
|
54bf24b966
|
code review：会员等级
|
2 years ago |
|
owen
|
ca51056c00
|
会员: 统一用户等级记录、用户经验记录 命名
|
2 years ago |
|
owen
|
bdb38c4157
|
会员: 修改会员等级，使用单独的表单、接口
|
2 years ago |
|
owen
|
9d9638b15b
|
Merge remote-tracking branch 'origin/feature/mall_product' into member_dev
# Conflicts:
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/MemberUserController.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/user/MemberUserConvert.java
|
2 years ago |
|
owen
|
8ae3401452
|
会员: 增加会员分组功能
|
2 years ago |
|
芋道源码
|
4cd5b5712b
|
!577 会员：修改会员标签名称唯一校验逻辑
Merge pull request !577 from 疯狂的世界/member_dev
|
2 years ago |
|
owen
|
8ffbc15cec
|
会员：后台调整会员等级
|
2 years ago |
|
owen
|
f884054d2c
|
会员：完善会员等级校验、单元测试
|
2 years ago |
|
YunaiV
|
c3e4e23459
|
同步最新 Member 菜单
|
2 years ago |
|
YunaiV
|
a83c156bf1
|
code review：签到记录
|
2 years ago |
|
YunaiV
|
c5e85f3bfb
|
code review：签到配置
|
2 years ago |
|
YunaiV
|
4257cad46a
|
code review：会员积分
|
2 years ago |
|
owen
|
e2032e7e97
|
会员：增加会员等级增删改查
|
2 years ago |
xiaqing
|
2e9dfac9ab
|
会员积分和会员签到模块todo修改
|
3 years ago |
decan
|
e6f4d649aa
|
fix: postgres sql
|
3 years ago |
|
芋道源码
|
4177071758
|
!560 todo修改
Merge pull request !560 from QingX/feature/mall_product
|
3 years ago |
|
天天写BUG
|
f221f58973
|
update sql/postgresql/ruoyi-vue-pro.sql.
fix:修复创建新租户，由于data_scope_dept_ids设置的是 not null 但是是空值时候产生错误，插入失败
Signed-off-by: 天天写BUG <decan_zheng@foxmail.com>
|
3 years ago |
|
xiaqing
|
93effe8fa7
|
新版表结构
|
3 years ago |
congqing
|
1dee258c18
|
适配postgres数据库sql脚本
infra_codegen_table表增加front_type字段
member_user表部分字段增加默认值
system_menu表permission增加默认值
|
3 years ago |