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,046 Commits 8 Branches 31 Tags 233 MiB
Commit Graph

979 Commits

Author SHA1 Message Date
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