hhyykk/ipms-sjy
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy.git synced 2025-11-01 02:38:43 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
6,503 Commits 20 Branches 0 Tags
bbfff1bae329b23a8ea88d4a192e9422fde7949a
Commit Graph

348 Commits

Author SHA1 Message Date
YunaiV
c1df35d305 【修复】商城：取消订单，返回优惠劵时，状态校验不正确的问题 2024-04-28 20:06:42 +08:00
YunaiV
6f42da1b77 【修复】部分菜单，确实 menu.sql 配置的权限标识 2024-04-24 20:11:11 +08:00
YunaiV
2e03dcba69 移除 resilience4j 组件 2024-04-10 20:57:44 +08:00
YunaiV
6b06bf8a3d bugfix MALL：已过期的优惠劵，还显示可以使用 2024-03-01 13:55:37 +08:00
YunaiV
722223c659 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop 
# Conflicts:
#	yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/comment/ProductCommentServiceImplTest.java
 2024-01-27 16:44:58 +08:00
YunaiV
23ef3c8ae0 📖 CRM：code review 跟进记录 2024-01-22 08:53:59 +08:00
YunaiV
6a6e95fcb6 ✨ 对齐 BOOT 与 CLOUD 的代码 2024-01-19 22:13:55 +08:00
YunaiV
023a7b14d8 ✨ 统一 JDK8 和 JDK21 相关代码 2024-01-19 12:38:57 +08:00
YunaiV
4c200eda92 ✨ MALL：清理多余的 MemberStatisticsDO 类 2024-01-18 00:00:42 +08:00
YunaiV
dd0a2b73e8 ✨ MALL：清理多余的 decorate 类 2024-01-17 19:45:57 +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
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
YunaiV
772b794374 📖 CRM：code review CRM 产品分类 2024-01-08 19:08:03 +08:00
YunaiV
a259e032e1 ✨ MALL：增加商品列表的分类编号数组、商品编号的筛选 2024-01-06 20:42:32 +08:00
芋道源码
9c3cf1d6b6 !806 操作日志：完善 code review 提到的问题 
Merge pull request !806 from puhui999/develop
 2023-12-30 12:14:40 +00:00
YunaiV
1f3f3d789b ✨ MALL：营销文章增加 title 查询，简易解决常见问题、用户协议的编辑 2023-12-27 22:07:54 +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
106c1ecf4c 📖 code review：店铺装修逻辑 2023-12-19 23:11:09 +08:00
芋道源码
bada32750c !795 CRM: 完善线索、商机、联系人、客户、合同、回款、回款计划数据权限 
Merge pull request !795 from puhui999/develop
 2023-12-17 01:54:29 +00:00
YunaiV
e1bb546460 ✨ MALL：1）优惠劵增加返回使用范围；2）商品分类增加 id 批量查询 2023-12-16 18:32:54 +08:00
puhui999
289f0409d0 Merge remote-tracking branch 'yudao/develop' into develop 2023-12-13 17:52:32 +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
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
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
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
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
3a9ac56f96 修复 banner 返回字段不对 2023-10-24 20:29:15 +08:00
YunaiV
c11300d33a 解决启动问题 2023-10-24 19:54:49 +08:00