owen
|
4f03635fcd
|
签到：签到后增加用户积分、经验
|
2 years ago |
|
owen
|
e7876b1520
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2 years ago |
YunaiV
|
16cea61435
|
wallet：增加充值套餐
|
2 years ago |
|
owen
|
42a899c5d3
|
交易：订单增加字段 推广人编号
|
2 years ago |
|
owen
|
497ea2eee8
|
会员详情，修改会员积分
|
2 years ago |
|
owen
|
929ff4286a
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2 years ago |
|
owen
|
171161e6c7
|
统计：交易统计
|
2 years ago |
jason
|
57d782bc94
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
# Conflicts:
# yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/enums/ErrorCodeConstants.java
|
2 years ago |
|
jason
|
ce6f7ab1b1
|
Pay: 新增转账示例单
|
2 years ago |
|
YunaiV
|
5913ee0706
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/jackson/config/YudaoJacksonAutoConfiguration.java
# yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/ErrorCodeConstants.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/vo/activity/AppBargainActivityDetailRespVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/vo/activity/AppBargainActivityRespVO.java
# yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/ErrorCodeConstants.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderSettlementReqVO.java
# yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java
# yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/enums/ErrorCodeConstants.java
# yudao-server/src/main/resources/application-local.yaml
|
2 years ago |
|
YunaiV
|
eeb8873b1d
|
trade：微调交易配置的注释
|
2 years ago |
|
owen
|
0a3a6825d5
|
优惠券：完善APP优惠券查询接口
|
2 years ago |
|
YunaiV
|
9b7c757942
|
1.8.2 版本发布
|
2 years ago |
|
owen
|
0b84c18736
|
分销：修正分享海报
|
2 years ago |
|
owen
|
967e578d54
|
分销：重命名提现类型字段
|
2 years ago |
dhb52
|
2a9aa357cb
|
fix: 对具有软删除的表去除UNIQUE INDEX
|
2 years ago |
|
owen
|
052328c5fa
|
积分：完善积分获得、退还、使用 相关逻辑
|
2 years ago |
|
owen
|
dc46dff62c
|
Merge remote-tracking branch 'origin/feature/mall_product' into brokerate
|
2 years ago |
|
owen
|
bbd18afbcc
|
分佣: 简化推广用户关系树查询方式
|
2 years ago |
|
owen
|
6e6486ccae
|
Trade: 完善配置
|
2 years ago |
|
jason
|
910ffa7a5a
|
钱包充值退款
|
2 years ago |
|
owen
|
a7de955926
|
trade: 分销业务 - 提现申请
|
2 years ago |
|
jason
|
c880dbfa60
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2 years ago |
|
jason
|
dbd7ab5f23
|
code review 修改
|
2 years ago |
|
owen
|
32e1fc66ce
|
trade: 分销业务 - 佣金提现后台管理
|
2 years ago |
|
owen
|
a3e8b42be6
|
trade: 分销业务review代码修改
|
2 years ago |
|
jason
|
0e1b8126dd
|
新增钱包充值。启动报错修复
|
2 years ago |
|
jason
|
bcb3b19418
|
钱包充值 表结构设计
|
2 years ago |
|
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
|
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 |
|
xiaqing
|
93effe8fa7
|
新版表结构
|
3 years ago |
|
YunaiV
|
00e1c30f57
|
1. 修复创建支付应用，界面会报错的问题
2. 同步最新 SQL 文件
|
3 years ago |
|
YunaiV
|
2485a5ebc9
|
mall + pay：
1. 将 amount 统一都修改成 price
2. 将 payed 统一改成 payStatus
|
3 years ago |
|
YunaiV
|
5d2d52020e
|
mall + pay：简化 pay 的复杂度
1. 移除 merchant 表设计
2. 移除 app 和 channel 的导出
|
3 years ago |
|
芋道源码
|
2f42964a96
|
!524 会员中心合并至member 模块
Merge pull request !524 from QingX/feature/mall_product
|
3 years ago |
|
jason
|
3a1e5c1b5f
|
pay : 会员电子钱包表结构
|
3 years ago |
|
xiaqing
|
c7ced55a6c
|
会员中心代码、sql脚本提交
1.合并积分模块只member module
2.初始化sql放入mysql/member_point.sql
3.添加会员中/会员积分、会员签到/xxx层级目录
4.删除无用的接口代码
|
3 years ago |
|
jason
|
050f0bb6a2
|
页面装修 review 修改
|
3 years ago |
|
jason
|
ad1f656dfa
|
页面装修修改,后端只负责存取
|
3 years ago |
|
芋道源码
|
b16632ea41
|
!522 mall seckill
Merge pull request !522 from puhui999/feature/mall_product
|
3 years ago |
|
jason
|
6b1d996b66
|
页面装修数据结构定义
|
3 years ago |
puhui999
|
16f2a5b91a
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
|
3 years ago |
|
puhui999
|
32cca12cd2
|
fix：seckillTime => seckillConfig
|
3 years ago |
|
xiaqing
|
5f64fe052b
|
初始化sql
|
3 years ago |
|
jason
|
894b19b8ec
|
新增自提门店管理
|
3 years ago |
|
jason
|
55dbff7570
|
运费模板 review 修改. 运费模块可以选择多个区域
|
3 years ago |
|
YunaiV
|
53e9be733f
|
mall：review + mall：快递公司管理
|
3 years ago |
|
puhui999
|
a70c7ca855
|
fix:完善 mall.sql
|
3 years ago |
|
puhui999
|
d08b9530a2
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
# Conflicts:
# sql/mysql/optional/mall.sql
|
3 years ago |
|
puhui999
|
cac5545762
|
fix：完善商品管理, 完善 mall.sql, 完善 product 测试相关sql, 完善 ProductSpuServiceImplTest 测试
|
3 years ago |
|
jason
|
01a67289a9
|
mall: 订单中心新增运费模板功能
|
3 years ago |
|
jason
|
3da2eb89b2
|
新增快递公司功能
|
3 years ago |
|
jason
|
4b643a7b34
|
物流配送管理表结构修改
|
3 years ago |
|
jason
|
0ffa7ff4c8
|
发货配送模块表结构
|
3 years ago |
|
jason
|
7345d80b53
|
新增商品收藏功能
|
3 years ago |
|
puhui999
|
810c7ed040
|
完善商品管理
|
3 years ago |
|
puhui999
|
992a30486e
|
补充mall.sql
|
3 years ago |
|
YunaiV
|
8eac97ae12
|
移除 Vue3 专属菜单，统一菜单！
|
3 years ago |
xingyuv
|
70f632852b
|
chore: up hutool 5.8.15
|
3 years ago |
|
xingyuv
|
760a1d31d5
|
feat: 代码生成 vben
|
3 years ago |
|
YunaiV
|
d500332a18
|
代码生成，支持配置前端 UI 类型
|
3 years ago |
|
owen
|
147091fa08
|
修复积木报表建表语句错误
|
3 years ago |
|
YunaiV
|
35ba9b36af
|
菜单新增 alwaysShow 总是展示、componentName 组件名
|
3 years ago |
|
xingyuv
|
fe5f1c74a4
|
fix: router
|
3 years ago |
|
YunaiV
|
1b6124a0db
|
集成 Go-View 大屏设计器
|
3 years ago |
|
YunaiV
|
f770133854
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master_unit-sql
# Conflicts:
# yudao-module-system/yudao-module-system-biz/src/test/resources/sql/clean.sql
|
3 years ago |
|
xingyu
|
2ea9027031
|
mp user => mp mpuser
|
3 years ago |
|
xingyu
|
227361661f
|
fix: mp menu error
|
3 years ago |
|
YunaiV
|
f7762e646e
|
站内信模块：我的站内信 vue3
|
3 years ago |
|
YunaiV
|
1a4bea8ca2
|
邮箱模块：同步最新的 SQL 脚本
|
3 years ago |
|
YunaiV
|
3166cd7063
|
mp：同步 mp 公众号 SQL
|
3 years ago |
|
xingyu
|
6a9244a707
|
feat: vue3 add websocket
|
3 years ago |
咱哥丶
|
7879632cf5
|
commit 增加webSocket 菜单sql
|
3 years ago |
dengxiaobing
|
df2c137fe2
|
清理单元测试 sql 脚本
|
3 years ago |
|
xingyu
|
17d9a4e4f2
|
perf: 优化数据库建表语句
|
3 years ago |
gaibu
|
67435648b2
|
fix: 逻辑删除唯一索引冲突的问题
|
3 years ago |
|
YunaiV
|
ea95115ffd
|
移除云片短信渠道，解决云片的安全风险
|
3 years ago |
|
YunaiV
|
c51ab6ad73
|
优化 Vue3 SQL 导入脚本，避免误解
|
3 years ago |
|
xingyu4j
|
2e2cd448bd
|
chore: update devs
|
3 years ago |
|
xingyu
|
a6a01fcb8e
|
增加升级sql文件说明
|
4 years ago |
|
xingyu
|
5f6926d17c
|
增加升级sql文件
|
4 years ago |
|
xingyu
|
58cdc0be13
|
fix: fix menu active bug
|
4 years ago |
|
xingyu
|
340790dec4
|
chore: update deps
|
4 years ago |
|
芋道源码
|
35413b52c9
|
!237 集成积木报表
Merge pull request !237 from 芋道源码/feature/visual
|
4 years ago |
|
YunaiV
|
74c9e68a0f
|
1. 修改 file 的 type 过短的问题
2. 修复 pgsql 脚本不正确的问题
|
4 years ago |
|
YunaiV
|
b2f5900abc
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/visual
|
4 years ago |
|
芋道源码
|
69a7b0de57
|
!220 vue3
Merge pull request !220 from xingyu/master
|
4 years ago |
|
xingyu
|
87f4248e2f
|
fix: Vue Router i18 warn
|
4 years ago |
|
xingyu
|
74983d7b74
|
feat: vue3 menu sql
|
4 years ago |
|
YunaiV
|
b0cdfd7afc
|
完善工作流的注释
|
4 years ago |
jiangqiang
|
5c58a377db
|
新增积木报表菜单
|
4 years ago |
|
jiangqiang
|
0ed3321719
|
修改文件表表结构
|
4 years ago |
|
jiangqiang
|
36d7775171
|
1. 修改文件名和文件路径字段长度一致，因为如果不存在文件名的情况下，会使用文件路径作为字段名，防止数据库报错字段内容太长。
2. 修改type字段为ext_name，因为此字段本来就存的文件扩展名，并且新增mime_type字段，用来存储文件的类型。方便后期拓展网盘项目。
3. 修改文件路径生成方式：之前是md5，现在是sha256，降低文件碰撞概率。方便拓展网盘项目，实现秒传等功能。
|
4 years ago |
|
YunaiV
|
d3fe187696
|
增加 file 的文件名的字段，同步最新 SQL
|
4 years ago |
|
YunaiV
|
6566605da3
|
同步 SSO 相关的 MySQL、SQL Server 的脚本
|
4 years ago |
|
YunaiV
|
1f1970e6c8
|
提供最新的内嵌模式
|
4 years ago |
|
YunaiV
|
09c8a91b6a
|
修复 MySQL 文件的编码错误
|
4 years ago |
|
YunaiV
|
e1daeba5d3
|
同步最新的 SQL 脚本
|
4 years ago |
|
YunaiV
|
60f918da84
|
增加 SQLServer 的适配~
|
4 years ago |
|
YunaiV
|
0f21b55e6d
|
解决 Oracle 关键字冲突的问题
导出最新的 SQL 脚本
|
4 years ago |
|
YunaiV
|
7db1a58bfc
|
适配 Oracle 数据库
1. 去除关键字，避免数据库的查询冲突
|
4 years ago |
|
YunaiV
|
72ad12344b
|
调整 Flowable、Activiti 提供的脚本，通过 db 自动生成
|
4 years ago |
|
YunaiV
|
45cbb56ea1
|
1. 同步 MySQL、PostgreSQL 最新的脚本
2. 修复单元测试的报错
|
4 years ago |