YunaiV
|
9762a2a7c3
|
优化：默认只引入 mysql driver，减少打包大小
|
2 years ago |
|
芋道源码
|
d48a236d4c
|
!720 1. 完善达梦的兼容性；2. 增加域名解析租户编号
Merge pull request !720 from 芋道源码/feature/dameng
|
2 years ago |
|
YunaiV
|
c162b39e1e
|
多租户：调整 tenant 表的 domain 字段为 website，避免 dm 数据库的关键字冲突
|
2 years ago |
jason
|
09d45e6393
|
转账 - 增加转账通知
|
2 years ago |
dhb52
|
24b9688894
|
doc: 添加达梦数据库适配指引
|
2 years ago |
|
YunaiV
|
8efdf3141a
|
code review：crm 商品逻辑
|
2 years ago |
|
YunaiV
|
f9e64a9f0a
|
同步最新 SQL
|
2 years ago |
ZanGe丶
|
bf42f8e9ff
|
【增加CRM：产品以及产品分类】
|
2 years ago |
|
jason
|
f4d600398c
|
转账 - 管理后台增加转账单查询
|
2 years ago |
liuhongfeng
|
921c2ab757
|
【新增】负责人
【修改】规范命名：期数：indexNo-》period
|
2 years ago |
|
jason
|
48b1c19f28
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2 years ago |
|
jason
|
ccccd9f226
|
转账 - 转账代码修改，新增转账示例
|
2 years ago |
owen
|
b5f9ed9edf
|
营销：装修SQL调整
|
2 years ago |
|
YunaiV
|
054d80b472
|
code review：同步 crm 最新代码
|
2 years ago |
|
YunaiV
|
53afce0bff
|
code review：crm 回款
|
2 years ago |
|
YunaiV
|
973b710992
|
code review：crm 商机
|
2 years ago |
|
YunaiV
|
d1978d318b
|
code review：crm 合同
|
2 years ago |
|
YunaiV
|
fe50356ae8
|
code review：crm 客户模块的实现
|
2 years ago |
|
YunaiV
|
0657c357bf
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/crm
|
2 years ago |
Wanwan
|
3af9688383
|
feat: 调整客户表的字段
|
2 years ago |
|
Wanwan
|
c18f5baa4b
|
feat: 调整客户表的字段
|
2 years ago |
|
YunaiV
|
bf247a6626
|
Merge branch 'feature/crm' of https://gitee.com/ljlleo/ruoyi-vue-pro into feature/crm
# Conflicts:
# sql/mysql/crm.sql
|
2 years ago |
|
芋道源码
|
0719efb4c2
|
!695 feat: 客户表的 crud
Merge pull request !695 from wanwan/feature/crm
|
2 years ago |
|
owen
|
3a2ccc9d6b
|
营销：装修模板、装修页面
|
2 years ago |
ljlleo
|
75115bcc48
|
1、商机前端页面；
2、商机状态类型和商机状态字段的处理；
|
2 years ago |
|
jason
|
626bd0bd55
|
转账 - code review 修改
|
2 years ago |
|
Wanwan
|
04613af0cd
|
feat: 客户表的 crud
|
2 years ago |
|
YunaiV
|
3fdc132c17
|
1.8.3 版本发布
|
2 years ago |
|
YunaiV
|
df00126fa4
|
统一 boot 和 cloud 代码
|
2 years ago |
|
jason
|
86598dd177
|
转账 - 动态收款人字段修改
|
2 years ago |
zyna
|
918ffc40ae
|
crm联系人前端init
|
2 years ago |
|
YunaiV
|
723707c7ed
|
Merge branch 'feature/crm' of https://gitee.com/zyna/ruoyi-vue-pro into feature/crm
# Conflicts:
# sql/mysql/crm.sql
# yudao-module-crm/yudao-module-crm-api/src/main/java/cn/iocoder/yudao/module/crm/enums/ErrorCodeConstants.java
|
2 years ago |
|
YunaiV
|
9cf4cfca86
|
Merge branch 'feature/crm' of https://gitee.com/jiangwanwan/ruoyi-vue-pro into feature/crm
# Conflicts:
# sql/mysql/crm.sql
|
2 years ago |
|
YunaiV
|
56b59cf383
|
Merge branch 'feature/crm' of https://gitee.com/souvc/ruoyi-vue-pro into feature/crm
# Conflicts:
# sql/mysql/crm.sql
# sql/mysql/crm_menu.sql
# yudao-module-crm/yudao-module-crm-api/src/main/java/cn/iocoder/yudao/module/crm/enums/ErrorCodeConstants.java
|
2 years ago |
|
jason
|
89e847c8cd
|
钱包，转账 review 修改
|
2 years ago |
|
913752709@qq.com
|
e4eeaa1d69
|
feat: crm 线索表完善 review 提到的问题
|
2 years ago |
|
liuhongfeng
|
34a5785768
|
【新增】回款计划 功能
|
2 years ago |
|
zyna
|
e4943f0dfa
|
crm联系人
|
2 years ago |
|
liuhongfeng
|
73f4fc8ceb
|
【新增】回款管理 功能
|
2 years ago |
|
ljlleo
|
01490c879c
|
商机sql
|
2 years ago |
|
芋道源码
|
8bd1942083
|
!676 交易：核销订单
Merge pull request !676 from 疯狂的世界/feature/mall_product
|
2 years ago |
|
YunaiV
|
f8e4aece31
|
Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
|
2 years ago |
|
wanwan
|
48661f980c
|
!679 feat: CRM 线索表 crud
* feat: CRM 线索表 crud
* feat: CRM 线索表 crud
|
2 years ago |
|
YunaiV
|
d256275099
|
saas：支持社交应用的多租户配置
|
2 years ago |
|
913752709@qq.com
|
a09ee495b6
|
feat: CRM 线索表 crud
|
2 years ago |
|
zhijiantianya@gmail.com
|
00e18a480f
|
code review：钱包、充值、转账的实现
|
2 years ago |
|
owen
|
0c4713b7e0
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
# Conflicts:
# sql/mysql/mall.sql
|
2 years ago |
|
YunaiV
|
5842a361e2
|
同步最新 SQL 脚本
|
2 years ago |
|
owen
|
0612a13cce
|
交易：核销订单
|
2 years ago |
|
dhb52
|
164be5732b
|
feat: CRM/合同管理 - SQL
|
2 years ago |
|
YunaiV
|
d2112458d2
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2 years ago |
|
YunaiV
|
1ff9bc6a71
|
code review：文章管理
|
2 years ago |
|
jason
|
34210d3534
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2 years ago |
|
jason
|
7d0bcf5d3b
|
wallet - 管理端钱包余额菜单脚本
|
2 years ago |
|
owen
|
6f08645f61
|
会员：增加字段【注册终端】
|
2 years ago |
|
owen
|
df70402484
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2 years ago |
|
owen
|
f5dac38ca5
|
商城：增加商城首页
|
2 years ago |
|
jason
|
3db7b30e66
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2 years ago |
|
jason
|
fcbbbc737d
|
wallet - 管理端, 充值套餐脚本
|
2 years ago |
|
YunaiV
|
ca5e3f7bd1
|
优化最新的商城的 sql
|
2 years ago |
|
jason
|
2e207019b3
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2 years ago |
|
jason
|
571961b4da
|
充值套餐修改
|
2 years ago |
|
owen
|
df16278a03
|
统计：会员统计
|
2 years ago |
|
YunaiV
|
6a04d6c458
|
promotion：新增助力记录列表
|
2 years ago |
|
YunaiV
|
d4417d2474
|
code review：积分、优惠劵、佣金等逻辑
|
2 years ago |
|
YunaiV
|
057952bdeb
|
Merge branch 'feature/mall_product' of https://gitee.com/CrazyWorld/ruoyi-vue-pro into feature/mall_product
# Conflicts:
# yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/date/LocalDateTimeUtils.java
|
2 years ago |
|
YunaiV
|
b74169acfc
|
trade：优化订单列表的查询
|
2 years ago |
|
owen
|
2168145c3e
|
会员：会员配置的积分相关字段加上point前缀
|
2 years ago |
|
owen
|
ab35fcbe9b
|
会员：积分配置改为会员配置
|
2 years ago |
|
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 |
|
YunaiV
|
8b50cd9661
|
Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
Conflicts:
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/combination/AppCombinationRecordController.java
yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/ErrorCodeConstants.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
|
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 |
samisgod
|
a4d6d5e6c3
|
fix db creation error
|
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 |
|
YunaiV
|
00e1c30f57
|
1. 修复创建支付应用，界面会报错的问题
2. 同步最新 SQL 文件
|
3 years ago |