puhui999
|
f3a982da31
|
fix：修复合并差异
|
2023-06-03 21:12:12 +08:00 |
|
puhui999
|
ba380ea615
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
# Conflicts:
# yudao-module-mall/yudao-module-promotion-biz/src/test/java/cn/iocoder/yudao/module/promotion/service/price/PriceServiceTest.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/bo/TradePriceCalculateRespBO.java
# yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/aftersale/TradeAfterSaleServiceTest.java
|
2023-06-03 20:55:45 +08:00 |
|
YunaiV
|
910d374cee
|
mall + trade：review 运费价格计算
|
2023-06-03 19:56:23 +08:00 |
|
YunaiV
|
36ce968893
|
mall + trade：review 运费价格计算
|
2023-06-03 18:08:59 +08:00 |
|
jason
|
f1fa8eadd2
|
mall - trade - 新增 TradeDeliveryPriceCalculator
|
2023-06-03 17:16:18 +08:00 |
|
YunaiV
|
73a781cbbe
|
mall + trade：增加 TradeRewardActivityPriceCalculatorTest 的单元测试
|
2023-06-03 13:36:07 +08:00 |
|
YunaiV
|
0d08c814ec
|
mall + trade：增加 TradeDiscountActivityPriceCalculator 的单元测试
|
2023-06-03 13:14:47 +08:00 |
|
YunaiV
|
1452f6b231
|
mall + trade：增肌爱 TradeCouponPriceCalculator 的单元测试
|
2023-06-03 11:53:40 +08:00 |
|
YunaiV
|
636b14ccce
|
mall + trade：创建订单逻辑，接入新的价格接口
|
2023-06-03 09:14:51 +08:00 |
|
YunaiV
|
2a9a869e01
|
mall + trade：获得订单结算信息，接入支付接口
|
2023-06-03 00:46:56 +08:00 |
|
puhui999
|
e41935ea1d
|
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/api/price/PriceApiImpl.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/vo/expresstemplate/DeliveryExpressTemplateSimpleRespVO.java
|
2023-06-01 11:44:16 +08:00 |
|
YunaiV
|
5de8fa2e42
|
mall + trade：解决报错问题
|
2023-05-31 21:17:35 +08:00 |
|
puhui999
|
e86214015d
|
fix: 完善商品管理
|
2023-05-31 16:39:43 +08:00 |
|
YunaiV
|
e34eddc386
|
mall + trade：review 自提代码
|
2023-05-31 09:18:24 +08:00 |
|
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 |
|
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 |
|
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 |
|
xingyu
|
0b3640a522
|
fix: required = true ==> requiredMode = Schema.RequiredMode.REQUIRED
|
2023-05-08 10:06:17 +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 |
|
inypeacock
|
d3cd87767b
|
缺少ServletUtils引用
Signed-off-by: inypeacock <1300856@qq.com>
|
2023-04-21 05:13:54 +00: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 |
|