YunaiV
|
53e9be733f
|
mall：review + mall：快递公司管理
|
2023-05-24 23:40:55 +08:00 |
|
YunaiV
|
3672c217f8
|
mall：售后分页接口的 mock
|
2023-05-22 00:03:11 +08: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 |
|
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 |
|
jason
|
4b643a7b34
|
物流配送管理表结构修改
|
2023-05-15 23:05:39 +08:00 |
|
YunaiV
|
7fef594390
|
订单接口的梳理
|
2023-05-14 17:35:34 +08:00 |
|
芋道源码
|
19ceea2c6c
|
!472 完善商品管理（第一版）
Merge pull request !472 from puhui999/dev
|
2023-05-04 00:36:18 +00:00 |
|
puhui999
|
c233ce1a20
|
合并分支修复差异
|
2023-05-03 22:18:27 +08:00 |
|
YunaiV
|
6b05835cb3
|
购物车：增加获得商品数量 Map 接口
|
2023-05-03 09:20:17 +08:00 |
|
YunaiV
|
9980b12551
|
调整购物车接口，支持 add 商品时，适配前端可能要删除的情况
|
2023-05-03 00:30:02 +08:00 |
|
YunaiV
|
f7fe9ad7b0
|
1. 商城：调整购物车的失效逻辑实现，基于 SPU 是否下架
2. 商城：增加购物车失效的重选逻辑
|
2023-05-01 16:00:37 +08:00 |
|
YunaiV
|
da162853ec
|
商城：完善购物车的逻辑
|
2023-04-30 20:32:01 +08:00 |
|
puhui999
|
c3e36ba9da
|
修正相关问题让服务正常启动，改动位置都已加上TODO记录
|
2023-04-24 10:50:40 +08:00 |
|
YunaiV
|
e5fcc7a387
|
boot3：适合 ServletUtils
|
2023-04-16 21:40:56 +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 |
|
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 |
|
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 |
|
YunaiV
|
a83b8e8fbc
|
修复报错的单元测试
|
2022-12-30 00:27:14 +08:00 |
|
xingyu
|
cacefb4eea
|
feat: knife4j springdoc
|
2022-12-22 00:25:22 +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 |
|
YunaiV
|
fc49f000ce
|
trade：前端订单管理，联调接口
|
2022-12-10 11:52:11 +08:00 |
|
YunaiV
|
bddbedd781
|
增加城市库
|
2022-12-10 00:17:08 +08:00 |
|
xingyu4j
|
9fc6e0f00b
|
refactor: springdoc 替换 springfox
|
2022-12-09 13:43:15 +08:00 |
|
YunaiV
|
fe1ae23b71
|
trade：增加管理后台的订单分页接口
|
2022-12-09 00:20:38 +08:00 |
|
YunaiV
|
fac3e7c726
|
product：商品规格，调整成商品属性，避免和 sku 概念冲突
|
2022-12-08 21:12:35 +08:00 |
|
YunaiV
|
7fc9689f07
|
trade：定义管理后台的订单分页接口
|
2022-12-08 00:07:14 +08:00 |
|
YunaiV
|
7056d89b0c
|
trade：完成交易订单的收货逻辑
|
2022-11-29 23:02:37 +08:00 |
|
YunaiV
|
66abe4a84b
|
trade：完成交易订单的发货逻辑
|
2022-11-27 19:42:49 +08:00 |
|
YunaiV
|
07f1681b50
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
|
2022-11-26 18:41:02 +08:00 |
|
YunaiV
|
e96422a47e
|
trade：完成支付成功后的回调，更新订单为已支付
|
2022-11-26 18:40:51 +08:00 |
|
YunaiV
|
1cd9085c59
|
pay: PayNotifyJob 增加多租户的支持
|
2022-11-24 23:56:13 +08:00 |
|
YunaiV
|
8798944069
|
优化 pay 支付成功后的回调逻辑
|
2022-11-23 21:09:16 +08:00 |
|
芋道源码
|
1465d064dd
|
!307 调用获取地址参数顺序错误
Merge pull request !307 from plimlips/N/A
|
2022-11-23 11:28:26 +00:00 |
|
YunaiV
|
73d847ae2e
|
调整支付模块的回调地址
|
2022-11-22 19:54:52 +08:00 |
|
YunaiV
|
64df5ce5f4
|
trade：【交易售后】增加会员取消售后
|
2022-11-20 23:07:14 +08:00 |
|
YunaiV
|
ed9c8d4a78
|
trade：【交易售后】增加售后日志
|
2022-11-20 22:54:30 +08:00 |
|
plimlips
|
453669c7d9
|
解决新建订单时,订单Id使用使用了address Id的问题
Signed-off-by: plimlips <156839224@qq.com>
|
2022-11-20 14:18:13 +00:00 |
|
plimlips
|
19a6fc79a2
|
调用获取地址参数顺序错误
Signed-off-by: plimlips <156839224@qq.com>
|
2022-11-20 12:05:18 +00:00 |
|