854 Commits

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