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

882 Commits

Author SHA1 Message Date
YunaiV 5bb91f139e Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/crm 2023-11-03 23:34:37 +08:00
YunaiV c886e7eff2 mq：增加 Rabbitmq 教程内容 2023-11-02 20:18:45 +08:00
YunaiV 20725e3dfd mq：增加 rabbitmq 配置项 2023-11-02 08:22:05 +08:00
YunaiV b8d5a665be mq：增加 rocketmq 配置项 2023-11-02 00:07:38 +08:00
YunaiV e1c34e9124 mq：优化 redis stream 的命名 2023-11-01 22:46:02 +08:00
zhijiantianya@gmail.com f8ed0e15f0 mq：增加 kafka、rocketmq、rabbitmq 的实现支持 2023-11-01 19:58:56 +08:00
YunaiV c066ea46f9 mq 重构：默认的 redis 实现： 
1）默认 channel 和 stream key
2）移除 enabled 开关，通过 listener 是否存在来实现
3）调整包名，为接入 rocketmq 作为 mq 实现做准备
 2023-10-30 21:15:22 +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
YunaiV 52e735f360 Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/api/coupon/CouponTemplateApiImpl.java
 2023-10-24 19:09:01 +08:00
YunaiV dd2f5ba2c3 统一 boot 和 cloud 代码 2023-10-24 18:48:02 +08:00
YunaiV d9a5ef3321 统一 boot 和 cloud 代码 2023-10-24 13:58:35 +08:00
puhui999 6723cae781 营销活动：完善 review 提到的问题 2023-10-23 12:02:13 +08:00
YunaiV d0caa77f80 Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2023-10-22 08:25:27 +08:00
YunaiV 9697aee898 code review：钱包的逻辑 2023-10-21 21:17:49 +08:00
YunaiV 3bb3e4caf6 code review：工作流的加减签 2023-10-21 21:04:20 +08:00
kehaiyou aca65a66b5 feat: 【工作流】--加减签review修改 2023-10-21 18:16:21 +08:00
913752709@qq.com e4eeaa1d69 feat: crm 线索表完善 review 提到的问题 2023-10-21 00:53:18 +08:00
jason db0fbf0596 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-10-20 23:22:16 +08:00
jason 183206e2d3 转账 - 支付宝转账修改, 支付宝 Client 支持公钥证书模式 2023-10-20 23:20:47 +08:00
芋道源码 8bd1942083
!676 交易：核销订单 
Merge pull request !676 from 疯狂的世界/feature/mall_product
 2023-10-19 15:59:00 +00: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
owen 0612a13cce 交易：核销订单 2023-10-17 23:18:08 +08:00
zhijiantianya@gmail.com 4b0333f3e9 code review：订单统计 2023-10-17 20:42:22 +08:00
zhijiantianya@gmail.com 0af205ede1 Merge remote-tracking branch 'origin/master' 2023-10-17 18:49:59 +08:00
owen 6fbb7d6d6d 终端类型参数改为从Controller传入 2023-10-16 21:01:01 +08:00
owen 76f512fc7a 1. APP增加终端Header[terminal] 
2. 订单、会员注册记录来源终端
 2023-10-16 15:06:59 +08:00
YunaiV 7e312aae02 初始化 crm 模块 2023-10-15 20:16:46 +08:00
YunaiV 1ac2f2b5c2 code review：会员统计 2023-10-14 01:26:06 +08:00
YunaiV 7a9dbfe41d Merge remote-tracking branch 'origin/master' 2023-10-12 21:59:04 +08:00
owen 4be709b815 统计：Review修改 2023-10-11 15:26:17 +08:00
YunaiV fef808d88c code review：统计代码 2023-10-11 12:32:28 +08:00
YunaiV 704087ce86 Merge branch 'feature/mall_product' of https://gitee.com/CrazyWorld/ruoyi-vue-pro into feature/mall_product 
# Conflicts:
#	yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/api/order/TradeOrderApi.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/api/order/TradeOrderApiImpl.java
 2023-10-11 11:30:03 +08:00
puhui999 bccd270fc7 营销活动：完成砍价、秒杀库存回滚。完成拼团过期和虚拟成团处理 2023-10-10 15:30:58 +08:00
youkehai bc781d9473 fix: 【工作流】按 review 修改代码 2023-10-10 10:46:16 +08:00
owen 74a5e40d8d Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 
# Conflicts:
#	yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/api/order/TradeOrderApi.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/api/order/TradeOrderApiImpl.java
 2023-10-09 23:33:51 +08:00
owen df16278a03 统计：会员统计 2023-10-09 23:27:10 +08:00
zhijiantianya@gmail.com 6388950ab2 code review：【工作流】—— 加签的实现 2023-10-09 20:57:23 +08:00
puhui999 2e559ebe06 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 
# Conflicts:
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationRecordServiceImpl.java
 2023-10-08 17:33:21 +08:00
puhui999 c8a9d68933 拼团活动：完善 review 提到的问题 2023-10-08 12:08:17 +08:00
YunaiV 01e6140d67 code review：拼团记录流程 2023-10-08 09:53:09 +08:00
YunaiV 99649bfdb8 code review：拼团记录流程 2023-10-08 07:43:25 +08:00
puhui999 6636ee7420 拼团记录(APP)：新增一个取消拼团的接口 2023-10-07 18:46:19 +08:00
YunaiV c8f1269d6e promotion：修复砍价活动返回的 combinationPrice 为空的问题 2023-10-06 22:29:11 +08:00
YunaiV 1bda3c8b53 promotion：完善砍价 API ~ 提交下，准备出门吃饭！！！！ 2023-10-05 17:22:17 +08:00
YunaiV a1e9bedf34 promotion：完善秒杀的 uniapp 接口 2023-10-03 21:45:51 +08:00
YunaiV 1bc1be14fb Merge branch 'feature/mall_product' of https://gitee.com/lanxindx/ruoyi-vue-pro into feature/mall_product 
# Conflicts:
#	yudao-server/src/main/resources/application-local.yaml
 2023-10-03 10:33:22 +08:00
owen b7359706db Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-10-02 23:52:25 +08:00
owen d0f0bc5888 分销：调整推广人列表查询方式 2023-10-02 23:51:49 +08:00
YunaiV 1f910992d6 trade：新增是否自提的配置项 2023-10-02 21:18:52 +08:00