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

1184 Commits

Author SHA1 Message Date
YunaiV 8b3bfcbd6b 📖 MALL：code review 商品浏览记录 2024-01-13 20:23:58 +08:00
YunaiV bbee720710 📖 CRM：code review 拼团记录的实现 2024-01-13 19:34:49 +08:00
芋道源码 1b87b8a42f
!822 接入拼团 
Merge pull request !822 from 疯狂的世界/develop
 2024-01-13 03:20:25 +00:00
YunaiV bf966cd610 ✨ MALL：简化 SPU 属性 的 VO 转化 2024-01-12 23:18:00 +08:00
YunaiV f6c8159dac ✨ MALL：简化 SPU 的 VO 转化 2024-01-12 22:48:58 +08:00
YunaiV fe5c5e4223 ✨ MALL：调整商品 SPU 字段，简化部分接口 2024-01-12 21:01:44 +08:00
owen 31a28cb40d Review代码修改 2024-01-11 12:38:17 +08:00
owen d6b59743a3 营销：接入 APP 装修页面 2024-01-11 11:55:25 +08:00
owen 680718c78f 营销：统一装修预览图片字段名称 2024-01-11 11:21:24 +08:00
owen 30fce2911f Merge remote-tracking branch 'origin/develop' into develop 
# Conflicts:
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/history/AppProductBrowseHistoryController.java
 2024-01-11 11:11:05 +08:00
owen 2ab2b510cc 营销：修正拼团接口名称 2024-01-11 00:26:22 +08:00
owen df609df2cf 商品：修正浏览记录 2024-01-11 00:25:55 +08:00
YunaiV 63db275af1 ✨ MALL：默认异步记录商品访问日志、访问次数 2024-01-08 19:14:09 +08:00
YunaiV 772b794374 📖 CRM：code review CRM 产品分类 2024-01-08 19:08:03 +08:00
YunaiV df9ff3fc5c 🐛 MALL：修复 issue 提到的 bug 2024-01-07 20:51:57 +08:00
YunaiV bbba83ef61 📖 MALL：code review 商品统计的代码 2024-01-07 16:23:02 +08:00
YunaiV eb048532f7 Merge branch 'develop' of https://gitee.com/CrazyWorld/ruoyi-vue-pro into develop 
# Conflicts:
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/article/AppArticleController.java
 2024-01-06 21:52:10 +08:00
YunaiV a259e032e1 ✨ MALL：增加商品列表的分类编号数组、商品编号的筛选 2024-01-06 20:42:32 +08:00
YunaiV f73cb540cf ✨ MALL：去除分销提现的银行配置 2024-01-05 22:46:35 +08:00
owen 9203f485e9 Merge remote-tracking branch 'origin/develop' into develop 
# Conflicts:
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/article/AppArticleController.java
 2024-01-05 15:40:29 +08:00
芋道源码 9c3cf1d6b6
!806 操作日志：完善 code review 提到的问题 
Merge pull request !806 from puhui999/develop
 2023-12-30 12:14:40 +00:00
YunaiV 33c3686bef ✨ MALL：合并订单和售后订单的数量接口 2023-12-28 23:15:25 +08:00
YunaiV 1f3f3d789b ✨ MALL：营销文章增加 title 查询，简易解决常见问题、用户协议的编辑 2023-12-27 22:07:54 +08:00
YunaiV c019136f07 ✨ Member：增加积分记录的时间筛选 2023-12-27 20:39:14 +08:00
puhui999 e5377074d5 数据权限：完善 code review 提到的问题 2023-12-26 00:21:04 +08:00
YunaiV 5de6a8bd23 📖 code review：操作日志的实现 2023-12-25 21:40:16 +08:00
puhui999 7286f33a7f Merge remote-tracking branch 'yudao/develop' into develop 2023-12-24 00:32:47 +08:00
puhui999 60e684c455 营销活动：获取商品近期参与的每个活动新增满减送和限时折扣活动 2023-12-24 00:32:17 +08:00
YunaiV d65c28d7f7 ✨ Member：社交登录逻辑调整，如果登录时无用户，则自动创建用户，保持和各 App 统一逻辑 2023-12-23 09:59:58 +08:00
YunaiV 106c1ecf4c 📖 code review：店铺装修逻辑 2023-12-19 23:11:09 +08:00
owen 0944584029 商品：用户未登录时，不记录商品浏览记录 2023-12-19 21:44:04 +08:00
owen 0b7d42482f 统计：增加商品统计定时任务 2023-12-17 19:30:50 +08:00
owen f374e778bb 商品：增加商品浏览记录 2023-12-17 17:20:08 +08:00
owen 5851bcb479 Merge remote-tracking branch 'origin/develop' into develop 2023-12-17 10:05:13 +08:00
芋道源码 bada32750c
!795 CRM: 完善线索、商机、联系人、客户、合同、回款、回款计划数据权限 
Merge pull request !795 from puhui999/develop
 2023-12-17 01:54:29 +00:00
owen 4a007f0c98 统计：增加商品统计 2023-12-16 23:48:10 +08:00
YunaiV e1bb546460 ✨ MALL：1）优惠劵增加返回使用范围；2）商品分类增加 id 批量查询 2023-12-16 18:32:54 +08:00
YunaiV 07e610b3f7 🔥 MALL：移除商品收藏的批量操作接口，由前端自身 for 处理 2023-12-15 00:02:40 +08:00
YunaiV 8913572e51 🐛 修复创建订单评论的 scores、replyStatus 默认值未填写的问题 2023-12-14 22:00:04 +08:00
YunaiV c1429dd3a0 ✨ 增加售后日志列表 API 2023-12-14 20:07:35 +08:00
puhui999 289f0409d0 Merge remote-tracking branch 'yudao/develop' into develop 2023-12-13 17:52:32 +08:00
owen 6de17c38fd Merge remote-tracking branch 'origin/develop' into develop 2023-12-13 16:24:57 +08:00
puhui999 72cebfca14 CombinationRecordApiImpl 重命名一下 recordService 改为 combinationRecordService 解决和 mzt-biz-log 组件的 bean 冲突 2023-12-12 16:23:48 +08:00
YunaiV e71867683e 📖 MALL：调整接口文档的说明 2023-12-12 12:11:28 +08:00
owen f8604e17a1 营销：修正文章字段名、接口方法名 2023-12-08 10:20:16 +08:00
YunaiV 98697ee075 ⬆️ 2023-12-07 20:48:11 +08:00
芋道源码 a8e8c14ab3
!787 合并最新商城代码 
Merge pull request !787 from 芋道源码/feature/mall_product
 2023-12-07 11:48:54 +00:00
胡桃云 160e3584d3 商城-商品库存为零可以展示商品列表 2023-12-06 20:27:23 +08:00
YunaiV eeeafcc10c 1.9.0 版本发布 2023-11-30 21:14:13 +08:00
芋道源码 fa1aa51c96
!771 同步最新的 CRM 代码 
Merge pull request !771 from 芋道源码/feature/crm
 2023-11-30 12:50:49 +00:00
Ai3_刘小龙 7b587a79ca
返回使用过优惠券逻辑---->状态字段取错了 
Signed-off-by: Ai3_刘小龙 <wisty0317@163.com>
 2023-11-28 09:16:58 +00:00
puhui999 79600774ec crm-客户：分页查询 mapper 还是得拆成两个，怎么查逻辑交给 service 去做处理 2023-11-28 14:27:36 +08:00
YunaiV 4a3aa1fa08 营销：适配商城装修组件【优惠券】 2023-11-24 19:55:07 +08:00
owen 49accc946d 营销：适配商城装修组件【优惠券】 2023-11-22 16:58:01 +08:00
YunaiV c7a21b2a64 mall：优化商品收藏的分页接口 2023-11-19 00:58:12 +08:00
芋道源码 867293a4f9
!724 会员中心商品收藏 
Merge pull request !724 from niou233/feature/mall_product_org
 2023-11-18 16:40:00 +00:00
owen 330380c2d0 营销：适配商城装修组件【商品卡片】 2023-11-17 09:56:52 +08:00
niou233 5a5a42463b refactor: 会员商品收藏 2023-11-08 17:22:00 +08:00
niou233 92be763c6f refactor: 会员商品收藏 2023-11-08 17:18:28 +08:00
niou233 670c0962a7 refactor: 会员商品收藏 2023-11-08 17:03:37 +08:00
niou233 cbaadc3a77 Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product_org 2023-11-08 14:39:01 +08:00
niou233 5facac7330 refactor: 会员商品收藏 2023-11-08 14:37:18 +08:00
niou233 daa7d14b09 reafactor: 会员商品收藏 2023-11-08 14:36:44 +08:00
YunaiV 989d7c44d0 code review 店铺装修 2023-11-04 22:52:41 +08:00
YunaiV 787de1be94 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product 
# Conflicts:
#	sql/mysql/mall.sql
#	sql/mysql/ruoyi-vue-pro.sql
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/app/wallet/vo/recharge/AppPayWalletRechargeCreateReqVO.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/PayWalletRechargeServiceImpl.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/social/SocialUserService.java
 2023-11-04 20:48:27 +08:00
owen bdfb5b8894 营销：装修页面适配 2023-11-03 09:18:04 +08:00
owen 9996608da6 营销：装修模板APP接口 2023-11-03 06:38:49 +08:00
dongshanshan 98aae5ed1a feat: 会员商品收藏 2023-10-31 16:51:56 +08:00
owen 32499be98f 营销：完善商城装修 
1. 拆分页面设计用的属性修改接口
2. 增加模板的页面保存
3. 增加唯一名称校验
4. 增加页面编辑器，默认选中组件判断
 2023-10-31 16:01:23 +08:00
YunaiV d048daf7d6 mq 重构：默认的 mq 实现，采用 event，减少对 redis、rocketmq 等消息队列的依赖 2023-10-30 12:53:54 +08:00
owen c637a172ec 营销：装修代码整理 2023-10-29 18:50:55 +08:00
owen 3a2ccc9d6b 营销：装修模板、装修页面 2023-10-27 14:58:04 +08:00
YunaiV 126dc610b1 1.8.3 版本发布 2023-10-24 23:14:14 +08:00
YunaiV 3a9ac56f96 修复 banner 返回字段不对 2023-10-24 20:29:15 +08:00
YunaiV c11300d33a 解决启动问题 2023-10-24 19:54:49 +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 07dbfc5546 code review：sign 签到逻辑 2023-10-24 19:08:08 +08:00
puhui999 ff3b1e942a Banner: market ==> promotion 2023-10-24 18:00:35 +08:00
YunaiV df00126fa4 统一 boot 和 cloud 代码 2023-10-24 13:39:21 +08:00
YunaiV 7bff98b658 统一 boot 和 cloud 代码 2023-10-23 23:48:06 +08:00
YunaiV 633a4c5687 pay：微调 enum 的包名 2023-10-23 19:56:30 +08:00
YunaiV 054569a3d3 promotion：去除已经不使用的代码 2023-10-23 19:24:04 +08:00
puhui999 3672d0f245 商品模块移除对营销模块的依赖 2023-10-23 17:29:26 +08:00
puhui999 6723cae781 营销活动：完善 review 提到的问题 2023-10-23 12:02:13 +08:00
YunaiV a778c25075 product：优化代码实现，简化重复判空 2023-10-22 21:44:05 +08:00
YunaiV 728308cbc0 member：优化部分变量的命名 2023-10-22 16:35:48 +08:00
YunaiV ec27a1bae5 修复报错的单元测试 2023-10-22 08:24:47 +08:00
YunaiV 0db4581030 code review：签到逻辑 2023-10-21 19:56:53 +08:00
芋道源码 3e570b8b89
!685 完善遗留的问题 
Merge pull request !685 from puhui999/feature/mall_product
 2023-10-21 11:31:56 +00:00
YunaiV 785fbeeb5b code review：限时折扣活动 2023-10-21 18:16:09 +08:00
芋道源码 90fb2c62b8
!683 mall模块 
Merge pull request !683 from zxiaoxiu/discount
 2023-10-21 09:23:50 +00:00
puhui999 f363c598d8 Banner：完善 review 提到的问题 2023-10-21 17:09:04 +08:00
puhui999 f18a4741a9 营销活动：完善 review 提到的问题 2023-10-20 22:32:37 +08:00
puhui999 f462ac7f96 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 2023-10-20 21:04:47 +08:00
zhangshuai 04061b028c mall模块-限时折扣功能 2023-10-20 20:54:16 +08:00
puhui999 283ca908b7 SPU: 完善选择优惠卷 2023-10-20 16:35:49 +08:00
puhui999 6e11154010 SPU: 添加选择优惠卷 2023-10-20 11:35:16 +08:00
YunaiV 6c8e82ca5a code review：自提统计 2023-10-20 00:30:27 +08:00
芋道源码 8bd1942083
!676 交易：核销订单 
Merge pull request !676 from 疯狂的世界/feature/mall_product
 2023-10-19 15:59:00 +00:00
YunaiV 453f69931f code review：营销文章 2023-10-19 23:41:39 +08:00
YunaiV 64b842ed94 Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product 2023-10-19 23:31:45 +08:00
YunaiV d256275099 saas：支持社交应用的多租户配置 2023-10-18 23:48:14 +08:00
puhui999 ffbf9278b8 营销文章：修正文章浏览量类型错误，新增时初始化浏览量 2023-10-18 11:27:14 +08:00
puhui999 6081ce30d5 营销活动：完善 review 提到的问题 2023-10-18 11:09:20 +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
owen b1e0129046 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 
# Conflicts:
#	sql/mysql/statistics.sql
 2023-10-17 16:13:46 +08:00
owen 5e65512a92 交易：订单核销 2023-10-17 16:09:37 +08:00
YunaiV d842708c23 code review：数据统计 2023-10-16 23:42:54 +08:00
YunaiV 1ff9bc6a71 code review：文章管理 2023-10-16 22:51:19 +08:00
owen b89ae001ad 统计：trade_statistics 字段【order_wallet_pay_price】改为【wallet_pay_price】 2023-10-16 22:09:20 +08:00
owen 7aa1ecceeb 统计：Review修改 2023-10-16 22:03:37 +08:00
芋道源码 cebdc190b6
!668 营销活动：完善文章相关 app 端接口，完善 review 提到的问题 
Merge pull request !668 from puhui999/feature/mall_product
 2023-10-16 13:55:47 +00:00
owen 6fbb7d6d6d 终端类型参数改为从Controller传入 2023-10-16 21:01:01 +08:00
zhijiantianya@gmail.com b6e63e885d code review：商城统计 2023-10-16 20:01:25 +08:00
puhui999 4273b8f09c 营销活动：完善 review 提到的问题 2023-10-16 18:53:25 +08:00
puhui999 01ef5f7911 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/controller/admin/article/ArticleController.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/article/vo/article/ArticleExcelVO.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/article/vo/article/ArticleExportReqVO.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/article/ArticleConvert.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/article/ArticleMapper.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/article/ArticleService.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/article/ArticleServiceImpl.java
#	yudao-module-mall/yudao-module-promotion-biz/src/test/java/cn/iocoder/yudao/module/promotion/service/article/ArticleServiceImplTest.java
 2023-10-16 17:47:17 +08:00
owen 76f512fc7a 1. APP增加终端Header[terminal] 
2. 订单、会员注册记录来源终端
 2023-10-16 15:06:59 +08:00
owen b6d400e04a 统计：会员终端统计接口实现 2023-10-16 14:23:53 +08:00
owen d3385dcb4f 统计：会员分析数据接口重构 2023-10-16 13:52:00 +08:00
owen 8e35a786ba 统计：处理会员性别统计，存在未知的情况 2023-10-16 13:25:15 +08:00
owen 4f731e9904 统计：处理会员地区统计，存在未知省份的情况 2023-10-16 13:20:11 +08:00
owen bb82c631e9 统计：Review修改 2023-10-16 13:00:14 +08:00
owen ea810bb5d6 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-10-16 10:02:04 +08:00
YunaiV 7345933d6b code review：文章管理 2023-10-16 09:57:57 +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
YunaiV 4359c584bb code review：拼团逻辑 2023-10-16 09:07:02 +08:00
puhui999 0d45acaf20 营销活动：完善文章相关 app 端接口 2023-10-15 22:41:18 +08:00
puhui999 26d3672668 营销活动: 文章分类管理软件包调整 2023-10-15 16:40:27 +08:00
puhui999 1fe6c82899 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 2023-10-15 16:17:14 +08:00
puhui999 55eed1377a 营销活动: 新增文章管理 2023-10-15 16:16:41 +08:00
puhui999 a47ab32800 营销活动: 新增文章分类管理 2023-10-15 01:29:30 +08:00
YunaiV ca5e3f7bd1 优化最新的商城的 sql 2023-10-14 22:00:30 +08:00
YunaiV 3110e427fb 同步 https://gitee.com/zhijiantianya/ruoyi-vue-pro/pulls/647/files 2023-10-14 17:45:49 +08:00
YunaiV 970e524088 code review：交易统计 2023-10-14 13:15:14 +08:00
YunaiV 1ac2f2b5c2 code review：会员统计 2023-10-14 01:26:06 +08:00
YunaiV 0eb86ca269 Merge branch 'feature/mall_product' of https://gitee.com/CrazyWorld/ruoyi-vue-pro into feature/mall_product 
# Conflicts:
#	yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/service/member/MemberStatisticsServiceImpl.java
 2023-10-13 20:41:17 +08:00
puhui999 a4613f0af9 拼团活动: 完善 review 提到的问题 2023-10-13 12:07:28 +08:00
YunaiV a72869b97e code review：修复部分统计报错 2023-10-12 21:54:06 +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
YunaiV 670a098aa8 code review：拼团记录流程 2023-10-11 11:04:22 +08:00
YunaiV b0179457ce 重构：将订单的分支流程，抽到 TradeOrderHandler 实现类中（补全各种排重逻辑） 2023-10-11 07:49:23 +08:00
YunaiV 41e5cf5285 Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product_tmp 
# Conflicts:
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/handler/TradeBargainOrderHandler.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/handler/TradeCombinationOrderHandler.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/handler/TradeSeckillOrderHandler.java
 2023-10-10 20:42:33 +08:00
YunaiV 150a1c9771 重构：将订单的分支流程，抽到 TradeOrderHandler 实现类中（取消的排重逻辑） 2023-10-10 20:38:20 +08:00
YunaiV 2e5cc0537b 重构：将订单的分支流程，抽到 TradeOrderHandler 实现类中 2023-10-10 19:20:12 +08:00
puhui999 cfbc8b4849 拼团记录（admin-api）：增加 page-by-headId 接口获取指定 headId 完整拼团列表分页 2023-10-10 17:21:37 +08:00
puhui999 bccd270fc7 营销活动：完成砍价、秒杀库存回滚。完成拼团过期和虚拟成团处理 2023-10-10 15:30:58 +08:00
puhui999 fdbebc406c 秒杀活动：纠正秒杀库存和秒杀总库存扣减错误的问题 2023-10-10 10:57:17 +08:00
puhui999 42fcbe0501 砍价活动：完成订单取消时恢复活动库存 2023-10-10 10:47:25 +08:00
puhui999 245f14b8f1 秒杀活动：完成订单取消时恢复活动库存和商品库存 2023-10-10 10:25:57 +08:00
owen 2c10dde195 统计：修复错误 2023-10-09 23:53:50 +08:00
owen 91d0bbf8b1 合并代码 2023-10-09 23:40:11 +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
puhui999 831983e314 营销活动：重构 getCombinationActivityBySpuIdsAndStatus 方法 2023-10-09 18:17:20 +08:00
puhui999 57407a39d2 营销活动：修正 selectListBySpuIdsAndStatus 查询 sql，添加接口测试 2023-10-09 16:25:06 +08:00
puhui999 c869d99a0f 修复：启动报错-循环依赖 2023-10-09 16:25:04 +08:00
puhui999 53e67c0437 拼团活动：完善 review 提到的问题 2023-10-09 11:53:02 +08:00
YunaiV 7b727d5ce2 code review：拼团记录流程 2023-10-08 21:14:54 +08:00
puhui999 2c0f1121ca 拼团活动：完善 review 提到的问题 2023-10-08 17:46:48 +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 c71bdd158a 拼团活动：完善 review 提到的问题 2023-10-08 17:19:39 +08:00
puhui999 c8a9d68933 拼团活动：完善 review 提到的问题 2023-10-08 12:08:17 +08:00
YunaiV 8a11ca8126 code review：拼团记录流程 2023-10-08 09:59:53 +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
YunaiV 6a38da4ad9 promotion：合并最新代码 2023-10-07 23:00:13 +08:00
YunaiV c917f01d83 promotion：code review 拼团相关的部分代码 2023-10-07 22:47:45 +08:00
puhui999 6636ee7420 拼团记录(APP)：新增一个取消拼团的接口 2023-10-07 18:46:19 +08:00
puhui999 1a0fda23b1 拼团记录：调整团长的 headId 为 CombinationRecordDO#HEAD_ID_GROUP 2023-10-07 17:11:25 +08:00
puhui999 89b240c1f9 订单：介入 TradeOrderHandler#cancelOrder 2023-10-07 16:58:40 +08:00
puhui999 c485c6e04d 订单：重构拼团下单流程更改为订单支付后再创建拼团记录 2023-10-07 16:30:28 +08:00
puhui999 c95317577d 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-07 14:33:09 +08:00
puhui999 f40bd23f6a 拼团记录：完善拼团记录创建前的条件校验规则 2023-10-07 14:30:25 +08:00
YunaiV ec2c3e508a promotion：优化拼团记录的详情代码 2023-10-07 13:58:12 +08:00
YunaiV c7b5df930e promotion：修复拼团下单时，相关字段记录不正确的情况。 2023-10-07 07:09:15 +08:00
YunaiV c8f1269d6e promotion：修复砍价活动返回的 combinationPrice 为空的问题 2023-10-06 22:29:11 +08:00
puhui999 6099786c1b 拼团记录：完善拼团记录后台管理接口 2023-10-06 21:26:53 +08:00
puhui999 8b480c52cc 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/dal/mysql/combination/CombinationRecordMapper.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationRecordService.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationRecordServiceImpl.java
 2023-10-06 21:15:06 +08:00
YunaiV 34bf360da6 trade：调整拼团活动列表接口 2023-10-06 21:04:37 +08:00
puhui999 ce77d510bb 拼团记录：添加拼团记录后台管理接口 2023-10-06 20:27:22 +08:00
owen 383439f902 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-10-06 14:17:14 +08:00
owen 4f33a0c9c0 统计：交易统计Review修改 2023-10-06 14:15:59 +08:00
芋道源码 a76760c419
!653 完善拼团活动下单流程 
Merge pull request !653 from puhui999/feature/mall_product
 2023-10-06 02:20:21 +00:00
YunaiV 8e7b295d24 trade：砍价记录的详情 100% 2023-10-06 10:17:41 +08:00
YunaiV 5f57cc6247 trade：砍价记录的详情 50% 2023-10-06 02:06:38 +08:00
puhui999 3d51c67f1a 拼团活动：app-api 获得拼团活动列表增加 Spring Cache 缓存 2023-10-06 01:43:56 +08:00
puhui999 92da91a7dc 订单：修改订单收货地址添加日志记录 2023-10-06 01:32:57 +08:00
puhui999 9d7285c4ed 营销活动：实现 list-by-spu-ids 接口 2023-10-06 01:19:32 +08:00
puhui999 07493bc7e5 营销活动：实现 list-by-spu-id 接口 2023-10-06 01:04:36 +08:00
puhui999 3f6f7f404b 拼团活动：更改创建拼团记录的校验方式 2023-10-06 00:24:40 +08:00
puhui999 474eebd8c9 拼团活动：更改创建拼团记录的校验方式 2023-10-06 00:20:00 +08:00
puhui999 f732e7a750 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/api/bargain/BargainRecordApiImpl.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/bargain/BargainRecordServiceImpl.java
 2023-10-06 00:05:28 +08:00
puhui999 038e23a6b3 拼团活动：完善拼团 app-api 相关接口 2023-10-06 00:03:03 +08:00
YunaiV aec8e853e4 trade：完善砍价的下单流程 2023-10-05 23:24:44 +08:00
puhui999 0b2943ba8b 拼团活动：完善拼团下单金额结算 2023-10-05 21:28:38 +08:00
puhui999 07d6ab5842 拼团活动：完善 TradeCombinationHandler 2023-10-05 19:14:19 +08:00
YunaiV 1bda3c8b53 promotion：完善砍价 API ~ 提交下，准备出门吃饭！！！！ 2023-10-05 17:22:17 +08:00
YunaiV 6a04d6c458 promotion：新增助力记录列表 2023-10-05 12:43:14 +08:00
YunaiV 269da3d56d promotion：新增砍价记录列表 2023-10-05 12:07:05 +08:00
YunaiV cd45be1fe2 promotion：优化砍价活动的分页结果 2023-10-05 02:18:14 +08:00
YunaiV 16e436a0f5 promotion：增加助力砍价的接口 2023-10-05 00:05:20 +08:00
YunaiV cc087e4eca promotion：增加创建砍价的接口 2023-10-04 21:55:05 +08:00
YunaiV a37427c355 stat：增加用户统计的设计 2023-10-04 18:53:49 +08:00
YunaiV c5824eedf7 Merge branch 'feature/mall_product' of https://gitee.com/CrazyWorld/ruoyi-vue-pro into feature/mall_product 
# Conflicts:
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java
 2023-10-04 17:33:14 +08:00
YunaiV 6f39b2c030 trade：1、重构 order handler 的参数；2、增加砍价商品的价格计算 2023-10-04 17:30:07 +08:00
YunaiV 8dbabb9efc trade：1、重构 order handler 的参数；2、增加砍价商品的价格计算 2023-10-04 11:29:38 +08:00
owen 7a15b340b0 交易：核销 2023-10-04 10:51:36 +08:00
owen 60ea719b46 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 
# Conflicts:
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/order/TradeOrderMapper.java
 2023-10-04 09:12:48 +08:00
owen 8e905f706d 交易：核销 2023-10-04 09:11:51 +08:00
YunaiV dc1347184f code review：拼团、砍价活动 2023-10-04 00:47:17 +08:00
YunaiV 20f5834d9a trade：价格计算时，接入优惠劵逻辑 2023-10-04 00:30:03 +08:00
YunaiV a1e9bedf34 promotion：完善秒杀的 uniapp 接口 2023-10-03 21:45:51 +08:00
owen 5819b08740 交易：Review修改 2023-10-03 21:25:23 +08:00
owen 3c5917a6cd Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-10-03 21:21:48 +08:00
owen a9e822762d 统计：交易统计定时任务 2023-10-03 21:21:11 +08:00
YunaiV ac55a9657c promotion：完善秒杀模块 2023-10-03 18:41:41 +08:00
YunaiV df4716d5a1 code review：分销 2023-10-03 10:23:40 +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
owen 7fdd36d979 Review代码修改 2023-10-02 21:27:46 +08:00
YunaiV 1f910992d6 trade：新增是否自提的配置项 2023-10-02 21:18:52 +08:00
YunaiV fdb10aeced trade：优化运费模版的实现 2023-10-02 18:30:14 +08:00
YunaiV 6f4c04d944 trade：完善退款详情 2023-10-02 15:44:41 +08:00
YunaiV 0c1f5c9582 trade：完善订单详情 2023-10-02 10:34:52 +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 abfebebdd5 交易：增加 积分抵扣计算器 单元测试 2023-10-01 17:12:33 +08:00
owen afd306a71d 交易：增加 赠送积分计算器 单元测试 2023-10-01 16:23:41 +08:00
owen 2168145c3e 会员：会员配置的积分相关字段加上point前缀 2023-10-01 10:41:21 +08:00
owen ab35fcbe9b 会员：积分配置改为会员配置 2023-10-01 10:25:18 +08:00
owen a04a3a27a9 Review代码修改 2023-09-30 23:41:11 +08:00
puhui999 d3f03540f8 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 2023-09-30 23:35:19 +08:00
puhui999 82210a9583 订单：完善拼团活动 2023-09-30 23:34:45 +08:00
owen 7d68bdc7c8 分销：重构下级分销统计 2023-09-30 23:30:06 +08:00
owen cafa938ff4 common：LocalDateTimeUtils 增加方法：月份开始时间、月份结束时间 2023-09-30 22:21:47 +08:00
owen e7876b1520 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-09-30 22:09:49 +08:00
owen d2c5eaf916 优惠券：重构是否领取检查方式 2023-09-30 22:05:11 +08:00
owen aaa01de21d 分销：修改佣金排名查询算法 2023-09-30 19:55:18 +08:00
owen d0d21b2787 优惠券：新增/修改时，校验对应的商品、分类是否存在 2023-09-30 19:39:02 +08:00
owen 42a899c5d3 交易：订单增加字段 推广人编号 2023-09-30 17:49:38 +08:00
owen fc432ba073 优惠券：新人券使用 MQ 发放 2023-09-30 17:29:32 +08:00
YunaiV 367b45e3bd code review：数据统计 2023-09-30 12:30:01 +08:00
puhui999 597eacaaeb Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 
# Conflicts:
#	yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/ErrorCodeConstants.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java
 2023-09-30 11:35:51 +08:00
puhui999 0b35d4a7e3 订单：完善拼团活动部分 TODO 2023-09-30 11:27:24 +08:00
puhui999 5ecd0d94eb 订单：添加 order handler 默认抽象实现类，子类可以选择性地实现抽象方法，而不必实现所有方法 2023-09-30 11:24:52 +08:00
owen 6b7f071988 Review代码修改 2023-09-29 22:47:04 +08:00
owen 26628913cb 错误码分段 2023-09-29 21:34:38 +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
YunaiV 9ee0aebd3f promotion：增加 coupon 的 code review 2023-09-29 20:52:11 +08:00
YunaiV 666ba351a2 trade：退款理由的维护 2023-09-29 13:35:40 +08:00
YunaiV 3c643f814c trade：补全售后日志的记录 2023-09-29 11:46:43 +08:00
YunaiV d402bdb7e0 trade：优化售后取消订单的实现代码 2023-09-29 10:08:20 +08:00
YunaiV f9bf41d773 code review：分佣剩余部分的 review 2023-09-28 22:22:38 +08:00
YunaiV b1ce971a2f code review：解决分佣的 npe 问题 2023-09-28 16:39:07 +08:00
YunaiV 9cd36abf10 同步 master 分支代码 2023-09-28 15:28:40 +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
YunaiV 9e3564bd6a code review：优惠劵逻辑 2023-09-28 09:23:42 +08:00
owen b2c608e7a5 交易：发货订单日志 2023-09-27 21:27:55 +08:00
owen 565a8e0e6b Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-09-27 21:24:37 +08:00
YunaiV b9018baa03 trade：简化价格调整的逻辑 2023-09-27 19:14:48 +08:00
YunaiV c5f2d07c87 商城：增加 stat 统计设计 2023-09-27 19:14:32 +08:00
YunaiV 26dfbfb2ac trade：发货逻辑，增加订单日志 2023-09-27 09:55:04 +08:00
owen be426235dd Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-09-27 01:20:40 +08:00
owen bc07e1dbf4 售后：重构售后更新订单的逻辑 2023-09-27 01:19:49 +08:00
owen 74ef98f8fc 售后：售后成功后，回滚 SKU 库存 2023-09-27 00:24:22 +08:00
owen 2766dd672a 优惠券：过期定时任务 2023-09-27 00:15:12 +08:00
owen 11ffa45b89 积分：Review代码修改 2023-09-26 23:54:43 +08:00
YunaiV 53bd1b9ec1 trade：订单评论超时时，自动评论 2023-09-26 23:50:54 +08:00
owen cd2d0b7089 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-09-26 23:23:12 +08:00
owen 77f7763560 优惠券：完善优惠券领取接口 2023-09-26 23:21:01 +08:00
YunaiV cf41347cb3 trade：支付订单成功时，记录订单日志 2023-09-26 22:48:21 +08:00
owen b1ac3a0b8b 优惠券：完善优惠券匹配接口 2023-09-26 22:46:06 +08:00
owen f9aec7d8fd 优惠券：完善我的优惠券接口 2023-09-26 21:08:11 +08:00
YunaiV debf568750 code review：增加取消售后的优化建议 2023-09-26 20:57:10 +08:00
owen 0a3a6825d5 优惠券：完善APP优惠券查询接口 2023-09-26 20:44:22 +08:00
YunaiV ad535e674f trade：积分相关的价格计算 2023-09-26 20:11:54 +08:00
YunaiV a8c78f3097 trade：增加自动收货的 job 2023-09-26 19:27:37 +08:00
owen a431bccc02 分销：Review代码修改 2023-09-26 15:11:48 +08:00
YunaiV 826d792ff2 trade：增加自动取消的 job 2023-09-26 00:04:11 +08:00
puhui999 bce96b29a6 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 
# Conflicts:
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/bo/TradePriceCalculateReqBO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/bo/TradePriceCalculateRespBO.java
 2023-09-25 15:06:57 +08:00
puhui999 42c47d9b44 秒回活动：订单金额计算初步设计 2023-09-25 14:56:56 +08:00
YunaiV e384b810bf code review：分销逻辑 2023-09-25 09:39:39 +08:00
owen 16af31d980 分销：@Select sql语句增加逻辑删除字段过滤 2023-09-25 08:36:55 +08:00
owen 3dca66eefa 分销：提现统计 2023-09-25 08:05:29 +08:00
owen 0b84c18736 分销：修正分享海报 2023-09-24 23:18:51 +08:00
owen 967e578d54 分销：重命名提现类型字段 2023-09-24 22:32:13 +08:00
owen 9856e17974 分销：根据商品，计算推广员可以得到的佣金 2023-09-24 22:27:24 +08:00
owen e9fd377772 分销：Review代码修改 2023-09-24 20:28:44 +08:00
YunaiV 421bb7d154 code review：分销逻辑 2023-09-24 11:56:00 +08:00
owen f7296d18b9 Merge remote-tracking branch 'origin/feature/mall_product' into brokerate 
# Conflicts:
#	yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/common/PromotionTypeEnum.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderDO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderItemDO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/bo/TradePriceCalculateRespBO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradePriceCalculatorHelper.java
#	yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/user/dto/MemberUserRespDTO.java
 2023-09-24 10:10:53 +08:00
YunaiV b4587fd79e product：订单表，增加 vip 优惠字段 2023-09-24 00:45:32 +08:00
YunaiV 53e789dfdc trade：订单表，增加 vip 优惠字段 2023-09-23 23:58:22 +08:00