YunaiV
|
63db275af1
|
✨ MALL：默认异步记录商品访问日志、访问次数
|
2 years ago |
|
YunaiV
|
772b794374
|
📖 CRM：code review CRM 产品分类
|
2 years ago |
|
YunaiV
|
df9ff3fc5c
|
🐛 MALL：修复 issue 提到的 bug
|
2 years ago |
|
YunaiV
|
bbba83ef61
|
📖 MALL：code review 商品统计的代码
|
2 years ago |
|
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
|
2 years ago |
|
YunaiV
|
a259e032e1
|
✨ MALL：增加商品列表的分类编号数组、商品编号的筛选
|
2 years ago |
|
YunaiV
|
f73cb540cf
|
✨ MALL：去除分销提现的银行配置
|
2 years ago |
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
|
2 years ago |
杨宇庆
|
9e895c8af1
|
修复订单操作日志中快递公司名称模板与数据对不上的问题
cn.iocoder.yudao.module.trade.enums.order.TradeOrderOperateTypeEnum中ADMIN_DELIVERY为deliveryName
Signed-off-by: 杨宇庆 <hiyyq@qq.com>
|
2 years ago |
|
芋道源码
|
9c3cf1d6b6
|
!806 操作日志：完善 code review 提到的问题
Merge pull request !806 from puhui999/develop
|
2 years ago |
|
YunaiV
|
33c3686bef
|
✨ MALL：合并订单和售后订单的数量接口
|
2 years ago |
|
YunaiV
|
1f3f3d789b
|
✨ MALL：营销文章增加 title 查询，简易解决常见问题、用户协议的编辑
|
2 years ago |
|
YunaiV
|
c019136f07
|
✨ Member：增加积分记录的时间筛选
|
2 years ago |
puhui999
|
e5377074d5
|
数据权限：完善 code review 提到的问题
|
2 years ago |
|
YunaiV
|
5de6a8bd23
|
📖 code review：操作日志的实现
|
2 years ago |
|
puhui999
|
7286f33a7f
|
Merge remote-tracking branch 'yudao/develop' into develop
|
2 years ago |
|
puhui999
|
60e684c455
|
营销活动：获取商品近期参与的每个活动新增满减送和限时折扣活动
|
2 years ago |
|
YunaiV
|
d65c28d7f7
|
✨ Member：社交登录逻辑调整，如果登录时无用户，则自动创建用户，保持和各 App 统一逻辑
|
2 years ago |
|
YunaiV
|
106c1ecf4c
|
📖 code review：店铺装修逻辑
|
2 years ago |
|
owen
|
0944584029
|
商品：用户未登录时，不记录商品浏览记录
|
2 years ago |
|
owen
|
0b7d42482f
|
统计：增加商品统计定时任务
|
2 years ago |
|
owen
|
f374e778bb
|
商品：增加商品浏览记录
|
2 years ago |
|
owen
|
5851bcb479
|
Merge remote-tracking branch 'origin/develop' into develop
|
2 years ago |
|
芋道源码
|
bada32750c
|
!795 CRM: 完善线索、商机、联系人、客户、合同、回款、回款计划数据权限
Merge pull request !795 from puhui999/develop
|
2 years ago |
|
owen
|
4a007f0c98
|
统计：增加商品统计
|
2 years ago |
|
YunaiV
|
e1bb546460
|
✨ MALL：1）优惠劵增加返回使用范围；2）商品分类增加 id 批量查询
|
2 years ago |
|
YunaiV
|
07e610b3f7
|
🔥 MALL：移除商品收藏的批量操作接口，由前端自身 for 处理
|
2 years ago |
|
YunaiV
|
8913572e51
|
🐛 修复创建订单评论的 scores、replyStatus 默认值未填写的问题
|
2 years ago |
|
YunaiV
|
c1429dd3a0
|
✨ 增加售后日志列表 API
|
2 years ago |
|
puhui999
|
289f0409d0
|
Merge remote-tracking branch 'yudao/develop' into develop
|
2 years ago |
|
owen
|
6de17c38fd
|
Merge remote-tracking branch 'origin/develop' into develop
|
2 years ago |
|
puhui999
|
72cebfca14
|
CombinationRecordApiImpl 重命名一下 recordService 改为 combinationRecordService 解决和 mzt-biz-log 组件的 bean 冲突
|
2 years ago |
|
YunaiV
|
e71867683e
|
📖 MALL：调整接口文档的说明
|
2 years ago |
|
YunaiV
|
802ac89b73
|
⬇️ 保持 JDK8 + Spring Boot 2.7.18 持续维护
|
2 years ago |
|
owen
|
f8604e17a1
|
营销：修正文章字段名、接口方法名
|
2 years ago |
|
YunaiV
|
98697ee075
|
⬆️
|
2 years ago |
|
芋道源码
|
a8e8c14ab3
|
!787 合并最新商城代码
Merge pull request !787 from 芋道源码/feature/mall_product
|
2 years ago |
胡桃云
|
160e3584d3
|
商城-商品库存为零可以展示商品列表
|
2 years ago |
|
YunaiV
|
eeeafcc10c
|
1.9.0 版本发布
|
2 years ago |
|
芋道源码
|
fa1aa51c96
|
!771 同步最新的 CRM 代码
Merge pull request !771 from 芋道源码/feature/crm
|
2 years ago |
Ai3_刘小龙
|
7b587a79ca
|
返回使用过优惠券逻辑---->状态字段取错了
Signed-off-by: Ai3_刘小龙 <wisty0317@163.com>
|
2 years ago |
|
puhui999
|
79600774ec
|
crm-客户：分页查询 mapper 还是得拆成两个，怎么查逻辑交给 service 去做处理
|
2 years ago |
|
YunaiV
|
4a3aa1fa08
|
营销：适配商城装修组件【优惠券】
|
2 years ago |
|
owen
|
49accc946d
|
营销：适配商城装修组件【优惠券】
|
2 years ago |
|
YunaiV
|
c7a21b2a64
|
mall：优化商品收藏的分页接口
|
2 years ago |
|
芋道源码
|
867293a4f9
|
!724 会员中心商品收藏
Merge pull request !724 from niou233/feature/mall_product_org
|
2 years ago |
|
owen
|
330380c2d0
|
营销：适配商城装修组件【商品卡片】
|
2 years ago |
niou233
|
5a5a42463b
|
refactor: 会员商品收藏
|
2 years ago |
|
niou233
|
92be763c6f
|
refactor: 会员商品收藏
|
2 years ago |
|
niou233
|
670c0962a7
|
refactor: 会员商品收藏
|
2 years ago |
|
niou233
|
cbaadc3a77
|
Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product_org
|
2 years ago |
|
niou233
|
5facac7330
|
refactor: 会员商品收藏
|
2 years ago |
|
niou233
|
daa7d14b09
|
reafactor: 会员商品收藏
|
2 years ago |
|
YunaiV
|
989d7c44d0
|
code review 店铺装修
|
2 years ago |
|
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
|
2 years ago |
|
owen
|
bdfb5b8894
|
营销：装修页面适配
|
2 years ago |
|
owen
|
9996608da6
|
营销：装修模板APP接口
|
2 years ago |
dongshanshan
|
98aae5ed1a
|
feat: 会员商品收藏
|
2 years ago |
|
owen
|
32499be98f
|
营销：完善商城装修
1. 拆分页面设计用的属性修改接口
2. 增加模板的页面保存
3. 增加唯一名称校验
4. 增加页面编辑器，默认选中组件判断
|
2 years ago |
|
YunaiV
|
d048daf7d6
|
mq 重构：默认的 mq 实现，采用 event，减少对 redis、rocketmq 等消息队列的依赖
|
2 years ago |
|
owen
|
c637a172ec
|
营销：装修代码整理
|
2 years ago |
|
owen
|
3a2ccc9d6b
|
营销：装修模板、装修页面
|
2 years ago |
|
YunaiV
|
126dc610b1
|
1.8.3 版本发布
|
2 years ago |
|
YunaiV
|
3a9ac56f96
|
修复 banner 返回字段不对
|
2 years ago |
|
YunaiV
|
c11300d33a
|
解决启动问题
|
2 years ago |
|
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
|
2 years ago |
|
YunaiV
|
07dbfc5546
|
code review：sign 签到逻辑
|
2 years ago |
|
puhui999
|
ff3b1e942a
|
Banner: market ==> promotion
|
2 years ago |
|
YunaiV
|
df00126fa4
|
统一 boot 和 cloud 代码
|
2 years ago |
|
YunaiV
|
7bff98b658
|
统一 boot 和 cloud 代码
|
2 years ago |
|
YunaiV
|
633a4c5687
|
pay：微调 enum 的包名
|
2 years ago |
|
YunaiV
|
054569a3d3
|
promotion：去除已经不使用的代码
|
2 years ago |
|
puhui999
|
3672d0f245
|
商品模块移除对营销模块的依赖
|
2 years ago |
|
puhui999
|
6723cae781
|
营销活动：完善 review 提到的问题
|
2 years ago |
|
YunaiV
|
a778c25075
|
product：优化代码实现，简化重复判空
|
2 years ago |
|
YunaiV
|
728308cbc0
|
member：优化部分变量的命名
|
2 years ago |
|
YunaiV
|
ec27a1bae5
|
修复报错的单元测试
|
2 years ago |
|
YunaiV
|
0db4581030
|
code review：签到逻辑
|
2 years ago |
|
芋道源码
|
3e570b8b89
|
!685 完善遗留的问题
Merge pull request !685 from puhui999/feature/mall_product
|
2 years ago |
|
YunaiV
|
785fbeeb5b
|
code review：限时折扣活动
|
2 years ago |
|
芋道源码
|
90fb2c62b8
|
!683 mall模块
Merge pull request !683 from zxiaoxiu/discount
|
2 years ago |
|
puhui999
|
f363c598d8
|
Banner：完善 review 提到的问题
|
2 years ago |
|
puhui999
|
f18a4741a9
|
营销活动：完善 review 提到的问题
|
2 years ago |
|
puhui999
|
f462ac7f96
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
|
2 years ago |
zhangshuai
|
04061b028c
|
mall模块-限时折扣功能
|
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 |
|
YunaiV
|
704087ce86
|
Merge branch 'feature/mall_product' of https://gitee.com/CrazyWorld/ruoyi-vue-pro into feature/mall_product
# Conflicts:
# yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/api/order/TradeOrderApi.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/api/order/TradeOrderApiImpl.java
|
2 years ago |
|
YunaiV
|
670a098aa8
|
code review：拼团记录流程
|
2 years ago |
|
YunaiV
|
b0179457ce
|
重构：将订单的分支流程，抽到 TradeOrderHandler 实现类中（补全各种排重逻辑）
|
2 years ago |
|
YunaiV
|
41e5cf5285
|
Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product_tmp
# Conflicts:
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/handler/TradeBargainOrderHandler.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/handler/TradeCombinationOrderHandler.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/handler/TradeSeckillOrderHandler.java
|
2 years ago |
|
YunaiV
|
150a1c9771
|
重构：将订单的分支流程，抽到 TradeOrderHandler 实现类中（取消的排重逻辑）
|
2 years ago |
|
YunaiV
|
2e5cc0537b
|
重构：将订单的分支流程，抽到 TradeOrderHandler 实现类中
|
2 years ago |
|
puhui999
|
cfbc8b4849
|
拼团记录（admin-api）：增加 page-by-headId 接口获取指定 headId 完整拼团列表分页
|
2 years ago |
|
puhui999
|
bccd270fc7
|
营销活动：完成砍价、秒杀库存回滚。完成拼团过期和虚拟成团处理
|
2 years ago |
|
puhui999
|
fdbebc406c
|
秒杀活动：纠正秒杀库存和秒杀总库存扣减错误的问题
|
2 years ago |
|
puhui999
|
42fcbe0501
|
砍价活动：完成订单取消时恢复活动库存
|
2 years ago |
|
puhui999
|
245f14b8f1
|
秒杀活动：完成订单取消时恢复活动库存和商品库存
|
2 years ago |
|
owen
|
2c10dde195
|
统计：修复错误
|
2 years ago |
|
owen
|
91d0bbf8b1
|
合并代码
|
2 years ago |
|
owen
|
74a5e40d8d
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
# Conflicts:
# yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/api/order/TradeOrderApi.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/api/order/TradeOrderApiImpl.java
|
2 years ago |
|
owen
|
df16278a03
|
统计：会员统计
|
2 years ago |
|
puhui999
|
831983e314
|
营销活动：重构 getCombinationActivityBySpuIdsAndStatus 方法
|
2 years ago |
|
puhui999
|
57407a39d2
|
营销活动：修正 selectListBySpuIdsAndStatus 查询 sql，添加接口测试
|
2 years ago |