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

529 Commits

Author SHA1 Message Date
dhb52 edea17e781 Merge remote-tracking branch 'upstream/master' 2023-11-21 23:19:49 +08:00
YunaiV e40c0e3057 Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	pom.xml
#	sql/mysql/pay_wallet.sql
#	yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/mapper/BaseMapperX.java
 2023-11-19 18:39:55 +08:00
芋道源码 667957c941
!737 【修改】最新的SQL字符编码不一致导致创建表失败，修改utf8mb4_0900_ai_ci=》utf8mb4_unicode_ci 
Merge pull request !737 from souvc/master
 2023-11-18 16:57:03 +00:00
liuhongfeng 58ede7d69c 【修改】最新的SQL字符编码不一致导致创建表失败，修改utf8mb4_0900_ai_ci=》utf8mb4_unicode_ci 2023-11-18 23:30:24 +08:00
dhb52 677a6d348f Merge remote-tracking branch 'upstream/master' 2023-11-18 22:28:24 +08:00
YunaiV 8c9c91f0ca crm：code review 配置管理 2023-11-18 22:12:12 +08:00
YunaiV 90f135ad95 Merge branch 'feature/crm' of https://gitee.com/jiangwanwan/ruoyi-vue-pro into feature/crm 
# Conflicts:
#	sql/mysql/crm.sql
 2023-11-18 21:17:11 +08:00
YunaiV 5122aee924 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/crm 
# Conflicts:
#	sql/mysql/ruoyi-vue-pro.sql
#	yudao-ui-admin/src/views/system/user/index.vue
 2023-11-18 20:44:06 +08:00
YunaiV 966690125b crm：code review 联系人 2023-11-18 20:43:32 +08:00
YunaiV 7ac74b44d8 同步最新 SQL 脚本 2023-11-18 17:49:01 +08:00
YunaiV ac80aa97b3 代码生成：优化前端模版的 package 路径 2023-11-18 17:41:37 +08:00
zyna 7af80ba248 crm联系人表结构 2023-11-11 23:32:42 +08:00
Wanwan 5b295d56b6 feat: CRM 客户限制 2023-11-11 20:49:52 +08:00
Wanwan 9abff2c7ad feat: CRM 客户公海配置 2023-11-08 23:16:55 +08:00
dhb52 cba0b08730 doc: 优化文档，patch文件可以放入任意启用的模块 2023-11-08 14:30:46 +08:00
dhb52 e04c4b11df feat: 达梦flowable 6.8适配 2023-11-08 13:09:49 +08:00
jason 4ae3d34801 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-11-07 23:11:25 +08:00
YunaiV 9762a2a7c3 优化：默认只引入 mysql driver，减少打包大小 2023-11-06 21:17:27 +08:00
芋道源码 d48a236d4c
!720 1. 完善达梦的兼容性；2. 增加域名解析租户编号 
Merge pull request !720 from 芋道源码/feature/dameng
 2023-11-06 11:57:57 +00:00
YunaiV c162b39e1e 多租户：调整 tenant 表的 domain 字段为 website，避免 dm 数据库的关键字冲突 2023-11-06 19:04:01 +08:00
jason 09d45e6393 转账 - 增加转账通知 2023-11-06 11:33:08 +08:00
dhb52 24b9688894 doc: 添加达梦数据库适配指引 2023-11-06 00:15:16 +08:00
YunaiV 8efdf3141a code review：crm 商品逻辑 2023-11-05 20:47:56 +08:00
YunaiV f9e64a9f0a 同步最新 SQL 2023-11-04 20:43:18 +08:00
ZanGe丶 bf42f8e9ff 【增加CRM：产品以及产品分类】 2023-11-04 19:48:20 +08:00
jason f4d600398c 转账 - 管理后台增加转账单查询 2023-11-03 08:43:21 +08:00
liuhongfeng 921c2ab757 【新增】负责人 
【修改】规范命名：期数：indexNo-》period
 2023-10-30 21:33:28 +08:00
jason 48b1c19f28 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-10-29 23:36:26 +08:00
jason ccccd9f226 转账 - 转账代码修改，新增转账示例 2023-10-29 23:36:06 +08:00
owen b5f9ed9edf 营销：装修SQL调整 2023-10-29 22:04:21 +08:00
YunaiV 054d80b472 code review：同步 crm 最新代码 2023-10-29 19:23:09 +08:00
YunaiV 53afce0bff code review：crm 回款 2023-10-29 19:22:09 +08:00
YunaiV 973b710992 code review：crm 商机 2023-10-29 19:14:15 +08:00
YunaiV d1978d318b code review：crm 合同 2023-10-29 19:05:36 +08:00
YunaiV fe50356ae8 code review：crm 客户模块的实现 2023-10-29 17:38:59 +08:00
YunaiV 0657c357bf Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/crm 2023-10-29 14:25:38 +08:00
Wanwan 3af9688383 feat: 调整客户表的字段 2023-10-29 00:33:42 +08:00
Wanwan c18f5baa4b feat: 调整客户表的字段 2023-10-28 22:47:56 +08:00
YunaiV bf247a6626 Merge branch 'feature/crm' of https://gitee.com/ljlleo/ruoyi-vue-pro into feature/crm 
# Conflicts:
#	sql/mysql/crm.sql
 2023-10-27 23:11:16 +08:00
芋道源码 0719efb4c2
!695 feat: 客户表的 crud 
Merge pull request !695 from wanwan/feature/crm
 2023-10-27 14:41:38 +00:00
owen 3a2ccc9d6b 营销：装修模板、装修页面 2023-10-27 14:58:04 +08:00
ljlleo 75115bcc48 1、商机前端页面； 
2、商机状态类型和商机状态字段的处理；
 2023-10-26 16:22:44 +08:00
jason 626bd0bd55 转账 - code review 修改 2023-10-25 23:41:59 +08:00
Wanwan 04613af0cd feat: 客户表的 crud 2023-10-25 00:25:00 +08:00
YunaiV 3fdc132c17 1.8.3 版本发布 2023-10-24 20:53:37 +08:00
YunaiV df00126fa4 统一 boot 和 cloud 代码 2023-10-24 13:39:21 +08:00
jason 86598dd177 转账 - 动态收款人字段修改 2023-10-24 08:44:30 +08:00
zyna 918ffc40ae crm联系人前端init 2023-10-22 16:40:57 +08:00
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
 2023-10-21 22:13:34 +08:00
YunaiV 9cf4cfca86 Merge branch 'feature/crm' of https://gitee.com/jiangwanwan/ruoyi-vue-pro into feature/crm 
# Conflicts:
#	sql/mysql/crm.sql
 2023-10-21 22:00:15 +08:00
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
 2023-10-21 21:41:16 +08:00
jason 89e847c8cd 钱包，转账 review 修改 2023-10-21 15:28:07 +08:00
913752709@qq.com e4eeaa1d69 feat: crm 线索表完善 review 提到的问题 2023-10-21 00:53:18 +08:00
liuhongfeng 34a5785768 【新增】回款计划 功能 2023-10-20 23:48:19 +08:00
zyna e4943f0dfa crm联系人 2023-10-20 23:42:22 +08:00
liuhongfeng 73f4fc8ceb 【新增】回款管理 功能 2023-10-20 22:16:34 +08:00
ljlleo 01490c879c 商机sql 2023-10-20 16:14:45 +08:00
芋道源码 8bd1942083
!676 交易：核销订单 
Merge pull request !676 from 疯狂的世界/feature/mall_product
 2023-10-19 15:59:00 +00:00
YunaiV f8e4aece31 Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product 2023-10-19 23:31:21 +08:00
wanwan 48661f980c !679 feat: CRM 线索表 crud 
* feat: CRM 线索表 crud
* feat: CRM 线索表 crud
 2023-10-19 14:52:16 +00:00
YunaiV d256275099 saas：支持社交应用的多租户配置 2023-10-18 23:48:14 +08:00
913752709@qq.com a09ee495b6 feat: CRM 线索表 crud 2023-10-18 19:53:15 +08:00
zhijiantianya@gmail.com 00e18a480f code review：钱包、充值、转账的实现 2023-10-18 18:39:05 +08:00
owen 0c4713b7e0 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 
# Conflicts:
#	sql/mysql/mall.sql
 2023-10-17 23:29:11 +08:00
YunaiV 5842a361e2 同步最新 SQL 脚本 2023-10-17 23:23:17 +08:00
owen 0612a13cce 交易：核销订单 2023-10-17 23:18:08 +08:00
dhb52 164be5732b feat: CRM/合同管理 - SQL 2023-10-16 23:53:27 +08:00
YunaiV d2112458d2 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-10-16 22:51:28 +08:00
YunaiV 1ff9bc6a71 code review：文章管理 2023-10-16 22:51:19 +08:00
jason 34210d3534 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-10-16 22:43:54 +08:00
jason 7d0bcf5d3b wallet - 管理端钱包余额菜单脚本 2023-10-16 22:43:39 +08:00
owen 6f08645f61 会员：增加字段【注册终端】 2023-10-16 14:22:43 +08:00
owen df70402484 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-10-16 09:55:17 +08:00
owen f5dac38ca5 商城：增加商城首页 2023-10-16 09:51:20 +08:00
jason 3db7b30e66 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-10-16 08:46:44 +08:00
jason fcbbbc737d wallet - 管理端, 充值套餐脚本 2023-10-16 08:46:27 +08:00
YunaiV ca5e3f7bd1 优化最新的商城的 sql 2023-10-14 22:00:30 +08:00
jason 2e207019b3 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-10-12 22:21:17 +08:00
jason 571961b4da 充值套餐修改 2023-10-12 22:20:42 +08:00
owen df16278a03 统计：会员统计 2023-10-09 23:27:10 +08:00
YunaiV 6a04d6c458 promotion：新增助力记录列表 2023-10-05 12:43:14 +08:00
YunaiV d4417d2474 code review：积分、优惠劵、佣金等逻辑 2023-10-01 23:31:07 +08:00
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
 2023-10-01 22:00:31 +08:00
YunaiV b74169acfc trade：优化订单列表的查询 2023-10-01 21:59:51 +08:00
owen 2168145c3e 会员：会员配置的积分相关字段加上point前缀 2023-10-01 10:41:21 +08:00
owen ab35fcbe9b 会员：积分配置改为会员配置 2023-10-01 10:25:18 +08:00
owen 4f03635fcd 签到：签到后增加用户积分、经验 2023-10-01 09:53:54 +08:00
owen e7876b1520 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-09-30 22:09:49 +08:00
YunaiV 16cea61435 wallet：增加充值套餐 2023-09-30 18:54:10 +08:00
owen 42a899c5d3 交易：订单增加字段 推广人编号 2023-09-30 17:49:38 +08:00
owen 497ea2eee8 会员详情，修改会员积分 2023-09-30 15:50:13 +08:00
owen 929ff4286a Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-09-29 21:08:49 +08:00
owen 171161e6c7 统计：交易统计 2023-09-29 21:08:15 +08:00
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
 2023-09-29 14:06:12 +08:00
jason ce6f7ab1b1 Pay: 新增转账示例单 2023-09-29 14:01:58 +08:00
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
 2023-09-28 15:18:59 +08:00
YunaiV eeb8873b1d trade：微调交易配置的注释 2023-09-28 15:10:56 +08:00
owen 0a3a6825d5 优惠券：完善APP优惠券查询接口 2023-09-26 20:44:22 +08:00
YunaiV 9b7c757942 1.8.2 版本发布 2023-09-24 23:24:24 +08:00
owen 0b84c18736 分销：修正分享海报 2023-09-24 23:18:51 +08:00
owen 967e578d54 分销：重命名提现类型字段 2023-09-24 22:32:13 +08:00
dhb52 2a9aa357cb fix: 对具有软删除的表去除UNIQUE INDEX 2023-09-24 08:29:56 +08:00
owen 052328c5fa 积分：完善积分获得、退还、使用 相关逻辑 2023-09-23 14:11:16 +08:00
owen dc46dff62c Merge remote-tracking branch 'origin/feature/mall_product' into brokerate 2023-09-22 23:15:31 +08:00
owen bbd18afbcc 分佣: 简化推广用户关系树查询方式 2023-09-22 23:13:39 +08:00
owen 6e6486ccae Trade: 完善配置 2023-09-22 22:51:46 +08:00
jason 910ffa7a5a 钱包充值退款 2023-09-22 19:04:59 +08:00
owen a7de955926 trade: 分销业务 - 提现申请 2023-09-22 00:27:45 +08:00
jason c880dbfa60 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-09-21 17:32:43 +08:00
jason dbd7ab5f23 code review 修改 2023-09-21 17:31:58 +08:00
owen 32e1fc66ce trade: 分销业务 - 佣金提现后台管理 2023-09-19 22:03:28 +08:00
owen a3e8b42be6 trade: 分销业务review代码修改 2023-09-19 16:37:51 +08:00
jason 0e1b8126dd 新增钱包充值。启动报错修复 2023-09-14 16:55:31 +08:00
jason bcb3b19418 钱包充值 表结构设计 2023-09-13 17:28:42 +08:00
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
 2023-09-11 16:19:55 +08:00
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
 2023-09-10 23:56:00 +08:00
owen 6c193f723f trade: 分销业务后台功能：推广订单列表 2023-09-10 23:30:43 +08:00
jason 5858f57fe9 钱包 review 修改 2023-09-09 18:32:53 +08:00
owen ca55e61dd2 trade: 分销业务后台功能：清除推广员、修改推广资格 2023-09-09 14:38:47 +08:00
owen 1ead368595 trade: 优化分销用户佣金字段名称 2023-09-08 23:10:04 +08:00
owen 4b43304c76 trade: 优化分销用户绑定用户编号、绑定时间字段名称 2023-09-08 22:51:05 +08:00
owen 1cc2dfc963 trade: 分销Review代码修改 2023-09-08 12:29:38 +08:00
owen 166b1b31c0 trade: 分销用户管理 2023-09-08 11:03:57 +08:00
samisgod a4d6d5e6c3 fix db creation error 2023-09-07 16:18:24 +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 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
owen fa53a3b15e trade: MemberBrokerageRecord 重命名为 TradeBrokerageRecord 2023-09-06 00:35:40 +08:00
owen a68691f2d9 trade: 增加分销用户表 2023-09-05 23:45:53 +08:00
owen 6474502738 trade: 增加交易中心配置表 2023-09-05 22:31:36 +08:00
芋道源码 a58d7d63ed
!606 会员：分销佣金计算 
Merge pull request !606 from 疯狂的世界/brokerage
 2023-09-05 01:58:11 +00:00
owen c7ef8519c8 member: 分销增加佣金 2023-09-05 08:56:39 +08:00
jason cc4c924717 钱包 review DO 类修改 2023-09-04 14:54:38 +08:00
YunaiV 36b3cfafd2 同步 v1.8.1 SQL 脚本 2023-09-03 19:15:18 +08:00
YunaiV 26129b52a8 同步最新 SQL 脚本 2023-08-31 20:47:30 +08:00
YunaiV d982a95fdd Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2023-08-31 20:38:59 +08:00
chenchen 73f1636daa 售后日志添加售前售后状态 2023-08-30 10:58:37 +08:00
YunaiV cc71aabd3d 钱包：钱包流水 api 2023-08-29 00:31:54 +08:00
YunaiV d82729e4c6 同步最新会员中心 SQL 2023-08-27 21:15:44 +08:00
YunaiV 8b98d13d8b Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2023-08-27 21:05:42 +08:00
芋道源码 40560f9618
!569 fix: posgres sql 
Merge pull request !569 from 天天写BUG/master
 2023-08-27 03:07:44 +00:00
YunaiV f5c5d38303 code review：商品评论 2023-08-26 21:23:01 +08:00
owen 1e2c83d90f mall: 商品评论表增加冗余 SKU 的图片地址, 规格 2023-08-26 14:40:16 +08:00
jason f33b66558c 新增查询钱包余额明细接口 2023-08-25 22:08:40 +08:00
jason 1ffbd9399e 新增获得支付钱包接口 2023-08-25 22:08:40 +08:00
YunaiV 9b6f5bd503 code review：会员等级 2023-08-24 00:53:09 +08:00
owen da8b2eab6d 合并冲突 2023-08-23 10:24:01 +08:00
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
 2023-08-23 10:17:24 +08:00
YunaiV 54bf24b966 code review：会员等级 2023-08-22 21:59:00 +08:00
owen ca51056c00 会员: 统一用户等级记录、用户经验记录 命名 2023-08-22 20:49:25 +08:00
owen bdb38c4157 会员: 修改会员等级，使用单独的表单、接口 2023-08-22 11:23:09 +08:00