puhui999
|
f18a4741a9
|
营销活动：完善 review 提到的问题
|
2 years ago |
|
puhui999
|
f462ac7f96
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
|
2 years ago |
|
puhui999
|
283ca908b7
|
SPU: 完善选择优惠卷
|
2 years ago |
|
puhui999
|
6e11154010
|
SPU: 添加选择优惠卷
|
2 years ago |
YunaiV
|
6c8e82ca5a
|
code review：自提统计
|
2 years ago |
|
芋道源码
|
8bd1942083
|
!676 交易：核销订单
Merge pull request !676 from 疯狂的世界/feature/mall_product
|
2 years ago |
|
YunaiV
|
453f69931f
|
code review：营销文章
|
2 years ago |
|
YunaiV
|
64b842ed94
|
Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
|
2 years ago |
|
YunaiV
|
d256275099
|
saas：支持社交应用的多租户配置
|
2 years ago |
|
puhui999
|
ffbf9278b8
|
营销文章：修正文章浏览量类型错误，新增时初始化浏览量
|
2 years ago |
|
puhui999
|
6081ce30d5
|
营销活动：完善 review 提到的问题
|
2 years ago |
owen
|
0c4713b7e0
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
# Conflicts:
# sql/mysql/mall.sql
|
2 years ago |
|
owen
|
0612a13cce
|
交易：核销订单
|
2 years ago |
|
zhijiantianya@gmail.com
|
4b0333f3e9
|
code review：订单统计
|
2 years ago |
|
owen
|
b1e0129046
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
# Conflicts:
# sql/mysql/statistics.sql
|
2 years ago |
|
owen
|
5e65512a92
|
交易：订单核销
|
2 years ago |
|
YunaiV
|
d842708c23
|
code review：数据统计
|
2 years ago |
|
YunaiV
|
1ff9bc6a71
|
code review：文章管理
|
2 years ago |
|
owen
|
b89ae001ad
|
统计：trade_statistics 字段【order_wallet_pay_price】改为【wallet_pay_price】
|
2 years ago |
|
owen
|
7aa1ecceeb
|
统计：Review修改
|
2 years ago |
|
芋道源码
|
cebdc190b6
|
!668 营销活动：完善文章相关 app 端接口，完善 review 提到的问题
Merge pull request !668 from puhui999/feature/mall_product
|
2 years ago |
|
owen
|
6fbb7d6d6d
|
终端类型参数改为从Controller传入
|
2 years ago |
|
zhijiantianya@gmail.com
|
b6e63e885d
|
code review：商城统计
|
2 years ago |
|
puhui999
|
4273b8f09c
|
营销活动：完善 review 提到的问题
|
2 years ago |
|
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
|
2 years ago |
|
owen
|
76f512fc7a
|
1. APP增加终端Header[terminal]
2. 订单、会员注册记录来源终端
|
2 years ago |
|
owen
|
b6d400e04a
|
统计：会员终端统计接口实现
|
2 years ago |
|
owen
|
d3385dcb4f
|
统计：会员分析数据接口重构
|
2 years ago |
|
owen
|
8e35a786ba
|
统计：处理会员性别统计，存在未知的情况
|
2 years ago |
|
owen
|
4f731e9904
|
统计：处理会员地区统计，存在未知省份的情况
|
2 years ago |
|
owen
|
bb82c631e9
|
统计：Review修改
|
2 years ago |
|
owen
|
ea810bb5d6
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2 years ago |
|
YunaiV
|
7345933d6b
|
code review：文章管理
|
2 years ago |
|
owen
|
df70402484
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2 years ago |
|
owen
|
f5dac38ca5
|
商城：增加商城首页
|
2 years ago |
|
YunaiV
|
4359c584bb
|
code review：拼团逻辑
|
2 years ago |
|
puhui999
|
0d45acaf20
|
营销活动：完善文章相关 app 端接口
|
2 years ago |
|
puhui999
|
26d3672668
|
营销活动: 文章分类管理软件包调整
|
2 years ago |
|
puhui999
|
1fe6c82899
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
|
2 years ago |
|
puhui999
|
55eed1377a
|
营销活动: 新增文章管理
|
2 years ago |
|
puhui999
|
a47ab32800
|
营销活动: 新增文章分类管理
|
2 years ago |
|
YunaiV
|
ca5e3f7bd1
|
优化最新的商城的 sql
|
2 years ago |
|
YunaiV
|
3110e427fb
|
同步 https://gitee.com/zhijiantianya/ruoyi-vue-pro/pulls/647/files
|
2 years ago |
|
YunaiV
|
970e524088
|
code review：交易统计
|
2 years ago |
|
YunaiV
|
1ac2f2b5c2
|
code review：会员统计
|
2 years ago |
|
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
|
2 years ago |
|
puhui999
|
a4613f0af9
|
拼团活动: 完善 review 提到的问题
|
2 years ago |
|
YunaiV
|
a72869b97e
|
code review：修复部分统计报错
|
2 years ago |
|
owen
|
4be709b815
|
统计：Review修改
|
2 years ago |
|
YunaiV
|
fef808d88c
|
code review：统计代码
|
2 years ago |