huangge1199/vue-pro
1
0
Fork 0
mirror of https://gitee.com/huangge1199_admin/vue-pro.git synced 2024-11-27 09:41:58 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
7,337 Commits 1 Branch 0 Tags 176 MiB
8eb82f0b59
Commit Graph

377 Commits

Author SHA1 Message Date
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
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
054569a3d3 promotion：去除已经不使用的代码 2023-10-23 19:24:04 +08:00
puhui999
6723cae781 营销活动：完善 review 提到的问题 2023-10-23 12:02:13 +08:00
YunaiV
728308cbc0 member：优化部分变量的命名 2023-10-22 16:35:48 +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
453f69931f code review：营销文章 2023-10-19 23:41:39 +08:00
puhui999
ffbf9278b8 营销文章：修正文章浏览量类型错误，新增时初始化浏览量 2023-10-18 11:27:14 +08:00
puhui999
6081ce30d5 营销活动：完善 review 提到的问题 2023-10-18 11:09:20 +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
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
YunaiV
7345933d6b code review：文章管理 2023-10-16 09:57:57 +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
puhui999
a4613f0af9 拼团活动: 完善 review 提到的问题 2023-10-13 12:07:28 +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
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
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
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
芋道源码
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