jason
|
894b19b8ec
|
新增自提门店管理
|
2023-05-30 21:18:30 +08:00 |
|
jason
|
f8db53896f
|
review 修改
|
2023-05-30 21:17:51 +08:00 |
|
puhui999
|
35daee84e7
|
fix: 解决合并代码后项目运行失败的问题，相关问题已标注 TODO
|
2023-05-30 10:26:42 +08:00 |
|
puhui999
|
fcaa92d406
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
|
2023-05-30 09:46:31 +08:00 |
|
YunaiV
|
0631c51d93
|
mall + trade：review 配置管理列表
|
2023-05-28 23:16:11 +08:00 |
|
jason
|
55dbff7570
|
运费模板 review 修改. 运费模块可以选择多个区域
|
2023-05-27 11:20:43 +08:00 |
|
YunaiV
|
02fa6fc5c6
|
mall + trade：调整价格字段，更易懂
|
2023-05-26 23:58:26 +08:00 |
|
YunaiV
|
0083d12404
|
mall：review + mall：快递费用
|
2023-05-25 22:51:38 +08:00 |
|
puhui999
|
b065a2a741
|
fix:修复商品 review 提到的问题
|
2023-05-25 09:23:38 +08:00 |
|
YunaiV
|
53e9be733f
|
mall：review + mall：快递公司管理
|
2023-05-24 23:40:55 +08:00 |
|
YunaiV
|
c62da6a056
|
mall：review 商品接口
|
2023-05-23 23:27:15 +08:00 |
|
puhui999
|
a70c7ca855
|
fix:完善 mall.sql
|
2023-05-23 11:59:48 +08:00 |
|
puhui999
|
d08b9530a2
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
# Conflicts:
# sql/mysql/optional/mall.sql
|
2023-05-23 11:08:32 +08:00 |
|
puhui999
|
cac5545762
|
fix：完善商品管理, 完善 mall.sql, 完善 product 测试相关sql, 完善 ProductSpuServiceImplTest 测试
|
2023-05-23 11:01:40 +08:00 |
|
YunaiV
|
3672c217f8
|
mall：售后分页接口的 mock
|
2023-05-22 00:03:11 +08:00 |
|
芋道源码
|
7bfb426a9d
|
!484 bugfix: 解决不同模块错误码区间冲突、部分错误码重复错误
Merge pull request !484 from Rundeepin/feature/mall_product
|
2023-05-21 15:38:48 +00:00 |
|
jason
|
01a67289a9
|
mall: 订单中心新增运费模板功能
|
2023-05-21 23:35:07 +08:00 |
|
YunaiV
|
e942b52a67
|
mall：订单详情：调整售后字段
|
2023-05-21 12:18:52 +08:00 |
|
YunaiV
|
e745bb6675
|
mall：订单列表：增加订单类型的接入
|
2023-05-20 11:22:43 +08:00 |
|
YunaiV
|
be7c664e07
|
mall：订单统计接口
|
2023-05-20 10:11:38 +08:00 |
|
YunaiV
|
83aa656bda
|
mall：增加订单评论字段
|
2023-05-19 23:55:02 +08:00 |
|
崔家辉
|
fbeaa06100
|
bugfix: 解决不同模块错误码区间冲突、部分错误码重复错误
|
2023-05-19 10:47:23 +08:00 |
|
jason
|
3da2eb89b2
|
新增快递公司功能
|
2023-05-18 23:37:56 +08:00 |
|
YunaiV
|
f129eab36f
|
REVIEW 物流配送管理表
|
2023-05-16 21:41:40 +08:00 |
|
YunaiV
|
db73ddc942
|
REVIEW 物流配送管理表
|
2023-05-16 19:17:25 +08:00 |
|
YunaiV
|
8ed52701fd
|
调整商品收藏的命名
|
2023-05-16 19:14:00 +08:00 |
|
jason
|
4b643a7b34
|
物流配送管理表结构修改
|
2023-05-15 23:05:39 +08:00 |
|
jason
|
7a792a7d48
|
商品收藏相关修改
|
2023-05-14 23:39:05 +08:00 |
|
YunaiV
|
7fef594390
|
订单接口的梳理
|
2023-05-14 17:35:34 +08:00 |
|
YunaiV
|
c21e88860f
|
REVIEW 物流管理相关的表
|
2023-05-14 17:35:17 +08:00 |
|
YunaiV
|
467811a42e
|
REVIEW 商品收藏的逻辑 v2
|
2023-05-14 09:07:45 +08:00 |
|
jason
|
0ffa7ff4c8
|
发货配送模块表结构
|
2023-05-12 19:39:48 +08:00 |
|
xingyu
|
0b3640a522
|
fix: required = true ==> requiredMode = Schema.RequiredMode.REQUIRED
|
2023-05-08 10:06:17 +08:00 |
|
jason
|
14d02bdfb3
|
商品收藏修改
|
2023-05-06 11:58:27 +08:00 |
|
YunaiV
|
96e2bf020f
|
REVIEW 商品收藏的逻辑
|
2023-05-05 23:38:31 +08:00 |
|
YunaiV
|
cd86620b74
|
REVIEW 商品管理的逻辑
|
2023-05-05 23:01:23 +08:00 |
|
jason
|
7345d80b53
|
新增商品收藏功能
|
2023-05-04 15:52:42 +08:00 |
|
芋道源码
|
19ceea2c6c
|
!472 完善商品管理（第一版）
Merge pull request !472 from puhui999/dev
|
2023-05-04 00:36:18 +00:00 |
|
puhui999
|
810c7ed040
|
完善商品管理
|
2023-05-04 01:32:25 +08:00 |
|
puhui999
|
c233ce1a20
|
合并分支修复差异
|
2023-05-03 22:18:27 +08:00 |
|
YunaiV
|
6b05835cb3
|
购物车：增加获得商品数量 Map 接口
|
2023-05-03 09:20:17 +08:00 |
|
puhui999
|
e163ae8b70
|
完成商品保存和编辑数据回显
|
2023-05-03 02:31:50 +08:00 |
|
YunaiV
|
9980b12551
|
调整购物车接口，支持 add 商品时，适配前端可能要删除的情况
|
2023-05-03 00:30:02 +08:00 |
|
puhui999
|
70816371e5
|
初步完成商品CRUD
|
2023-05-02 02:33:14 +08:00 |
|
YunaiV
|
f7fe9ad7b0
|
1. 商城：调整购物车的失效逻辑实现，基于 SPU 是否下架
2. 商城：增加购物车失效的重选逻辑
|
2023-05-01 16:00:37 +08:00 |
|
puhui999
|
6428f0fcaf
|
添加商品枚举
|
2023-05-01 14:47:00 +08:00 |
|
YunaiV
|
da162853ec
|
商城：完善购物车的逻辑
|
2023-04-30 20:32:01 +08:00 |
|
puhui999
|
15ced47b17
|
添加多租户
|
2023-04-30 17:35:38 +08:00 |
|
puhui999
|
c10ea9d9de
|
移除ProductSku相关的status属性，修改Property
|
2023-04-30 17:35:05 +08:00 |
|
puhui999
|
24a56bb45f
|
移除ProductSku相关的status属性，修改Property
|
2023-04-30 17:34:56 +08:00 |
|
puhui999
|
f56d394830
|
修改ProductSpuBaseVO第一版
|
2023-04-29 21:28:09 +08:00 |
|
puhui999
|
668d493b7f
|
Product相关Do添加TenantBaseDO
|
2023-04-29 21:22:52 +08:00 |
|
YunaiV
|
2113e825d7
|
完善 App 商品详情逻辑的 10%
|
2023-04-27 22:43:37 +08:00 |
|
YunaiV
|
3ced6a3240
|
完善 App 商品搜索的逻辑
|
2023-04-26 20:13:12 +08:00 |
|
puhui999
|
4068548c45
|
移除ProductSpuSpecTypeEnum及相关引用
|
2023-04-26 17:38:42 +08:00 |
|
YunaiV
|
a5f018104e
|
调整商品分类的实现
|
2023-04-25 21:33:59 +08:00 |
|
puhui999
|
c3e36ba9da
|
修正相关问题让服务正常启动，改动位置都已加上TODO记录
|
2023-04-24 10:50:40 +08:00 |
|
puhui999
|
6786aa352b
|
修正DO对齐数据库表字段，VO对齐前端
|
2023-04-24 10:29:02 +08:00 |
|
芋道源码
|
dd46e9b107
|
!461 缺少ServletUtils引用
Merge pull request !461 from inypeacock/N/A
|
2023-04-22 11:19:03 +00:00 |
|
芋道源码
|
a2ca746f0a
|
!459 新建商品时商品分类状态判断错误
Merge pull request !459 from LiZhongShi/master
|
2023-04-22 11:16:27 +00:00 |
|
inypeacock
|
d3cd87767b
|
缺少ServletUtils引用
Signed-off-by: inypeacock <1300856@qq.com>
|
2023-04-21 05:13:54 +00:00 |
|
YunaiV
|
502fa11f1d
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
|
2023-04-19 18:10:59 +08:00 |
|
YunaiV
|
32da5aae84
|
商城：product：完善 ProductSpuDO 表
|
2023-04-19 18:07:22 +08:00 |
|
YunaiV
|
63542b4ccb
|
商城：product：完善 ProductSkuDO 表
|
2023-04-19 16:30:57 +08:00 |
|
YunaiV
|
b30fc28021
|
商城：product：完善 ProductSpuDO 表
|
2023-04-19 10:55:43 +08:00 |
|
lizs
|
d5a48e63a3
|
fix: 新建商品时商品分类状态判断错误
|
2023-04-16 21:53:24 +08:00 |
|
YunaiV
|
e5fcc7a387
|
boot3：适合 ServletUtils
|
2023-04-16 21:40:56 +08:00 |
|
wangzhs
|
38d7d75f7f
|
[新增][商品评价]管理后台/APP端
1. 增加头像返回字段
2. 调整商户自评userId
3. 控制评论图片数量判断
|
2023-03-23 14:06:14 +08:00 |
|
wangzhs
|
6fe5f4bc0d
|
[新增][商品评价]管理后台/APP端
|
2023-03-21 11:09:10 +08:00 |
|
chop
|
14e7c52e0e
|
原来的Date类型查询订单返回时间差8个小时，项目全局使用LocalDateTime时间
原来的Date类型查询订单返回时间差8个小时，项目全局使用LocalDateTime时间
Signed-off-by: chop <935048000@qq.com>
|
2023-03-21 02:35:42 +00:00 |
|
wangzhs
|
cbf5ef5953
|
[新增][商品评价]管理后台
1. 显示 / 隐藏评论
2. 商家回复
|
2023-03-19 22:07:07 +08:00 |
|
wangzhs
|
da53a041da
|
[新增][商品评价]管理后台分页查询
|
2023-03-19 18:59:51 +08:00 |
|
wangzhs
|
f69d8503a2
|
[新增][商品评价]
1. 实体类
2. h2.sql
|
2023-03-19 15:47:49 +08:00 |
|
wangzhs
|
b0c73b786a
|
[测试][商品分类]测试创建商品分类
|
2023-03-15 14:23:42 +08:00 |
|
wangzhs
|
5674bfafc8
|
[修改][商品分类]分类只能存在2级
|
2023-03-15 14:03:00 +08:00 |
|
wangzhs
|
b89d7ff384
|
[修改][商品分类]
1. 删除 description 分类描述字段
2. 新增big_pic_url PC端分类图字段
|
2023-03-15 13:44:13 +08:00 |
|
wangzhs
|
4a01348e0b
|
[新增][商品分类] 列表查询筛选增加 status、parentId 字段
|
2023-03-15 11:36:45 +08:00 |
|
YunaiV
|
102d56ff7d
|
修复单测报错的问题
|
2023-03-05 19:39:00 +08:00 |
|
YunaiV
|
53767614fe
|
增加商城的提示
|
2023-02-04 20:38:51 +08:00 |
|
YunaiV
|
6bf5eb0133
|
适配 mall 模块的 openapi
|
2023-02-04 13:06:54 +08:00 |
|
YunaiV
|
c3eb9022b8
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/springdoc
# Conflicts:
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/ConfigController.java
# yudao-module-mall/yudao-module-product-biz/src/test/resources/sql/clean.sql
# yudao-module-mall/yudao-module-product-biz/src/test/resources/sql/create_tables.sql
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/PostController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/RoleController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsChannelController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java
# yudao-server/pom.xml
|
2023-02-04 10:21:45 +08:00 |
|
YunaiV
|
711a39b8e9
|
spring doc：增加模块分组
|
2023-01-19 15:03:46 +08:00 |
|
xingyu
|
854ba3315c
|
marge master
|
2023-01-04 10:57:19 +08:00 |
|
xingyu
|
7b98a3f3f3
|
Merge remote-tracking branch 'origin/master' into feature/springdoc
# Conflicts:
# README.md
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/ProductPropertyController.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/ProductPropertyValueController.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/ProductPropertyViewRespVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyAndValueRespVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyBaseVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyCreateReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyListReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyPageReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyRespVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyUpdateReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValueBaseVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValueCreateReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValuePageReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValueRespVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValueUpdateReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuBaseVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuCreateOrUpdateReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/ProductSpuController.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuBaseVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuDetailRespVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuPageReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/AppProductSpuController.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppSpuPageReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppSpuPageRespVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppSpuRespVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/base/property/AppProductPropertyValueDetailRespVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderPageReqVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/TradeOrderItemRespVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/TradeOrderRespVO.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/app/order/AppPayOrderController.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/notify/vo/PayNotifyOrderReqVO.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/notify/vo/PayRefundOrderReqVO.java
# yudao-server/pom.xml
# yudao-server/src/main/java/cn/iocoder/yudao/module/shop/controller/app/AppShopOrderController.java
|
2023-01-04 10:48:18 +08:00 |
|
dengxiaobing
|
df2c137fe2
|
清理单元测试 sql 脚本
|
2022-12-30 10:10:43 +08:00 |
|
YunaiV
|
a83b8e8fbc
|
修复报错的单元测试
|
2022-12-30 00:27:14 +08:00 |
|
YunaiV
|
92632c046c
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/jackson/config/YudaoJacksonAutoConfiguration.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/notify/PayNotifyServiceImpl.java
# yudao-ui-admin/src/views/mall/trade/order/index.vue
|
2022-12-23 19:12:45 +08:00 |
|
YunaiV
|
7a4a6a3046
|
product：优化管理后台相关的接口
area：增加地区列表界面
|
2022-12-23 18:47:59 +08:00 |
|
xingyu
|
cacefb4eea
|
feat: knife4j springdoc
|
2022-12-22 00:25:22 +08:00 |
|
YunaiV
|
92dde0b48b
|
product：优化更新 SKU 的代码
|
2022-12-15 21:31:52 +08:00 |
|
YunaiV
|
d453301455
|
product：完善 App 商品分页接口
|
2022-12-15 19:48:21 +08:00 |
|
YunaiV
|
652428a723
|
product：完善 App 商品详情接口
|
2022-12-14 22:02:07 +08:00 |
|
YunaiV
|
2f9eef589b
|
product：优化商品分类的代码
|
2022-12-14 20:32:44 +08:00 |
|
芋道源码
|
f9b4874ee9
|
!320 秒杀活动相关
Merge pull request !320 from halfninety/feature/1.8.0-uniapp
|
2022-12-13 02:04:54 +00:00 |
|
YunaiV
|
4a2cb33cd7
|
product：优化商品属性值的代码
|
2022-12-12 23:40:23 +08:00 |
|
YunaiV
|
98ca807d4b
|
product：优化商品属性项的代码
|
2022-12-12 22:25:31 +08:00 |
|
YunaiV
|
7f131a3853
|
trade：增加用户 App 的订单分页和详情接口
|
2022-12-10 23:06:53 +08:00 |
|
YunaiV
|
b7d78a24a4
|
trade：完成管理后台的订单详情的简单对接
|
2022-12-10 21:02:32 +08:00 |
|
YunaiV
|
c5408965eb
|
trade：增加管理后台的订单详情接口
|
2022-12-10 17:53:44 +08:00 |
|
YunaiV
|
fc48ab4928
|
trade：前端订单管理，联调接口
|
2022-12-10 17:06:34 +08:00 |
|