puhui999
|
cd4940d710
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
|
2023-06-18 13:17:36 +08:00 |
|
YunaiV
|
a93acd2a74
|
mall + promotion：mock 秒杀列表
|
2023-06-18 02:05:10 +08:00 |
|
YunaiV
|
6573849f56
|
mall + promotion：mock 拼团列表
|
2023-06-18 00:35:22 +08:00 |
|
chenchen
|
7d0e9ea762
|
fix 依赖启动问题
|
2023-06-17 23:47:38 +08:00 |
|
YunaiV
|
60b24e36d5
|
code review：售后日志逻辑
|
2023-06-17 22:15:03 +08:00 |
|
puhui999
|
1871a01944
|
fix：seckill：调整相关类属性和表字段对齐
|
2023-06-17 22:14:23 +08:00 |
|
陈賝
|
59e16795be
|
!514 mall交易日志封装
* 交易日志封装
* 交易日志封装
* 交易日志模块
|
2023-06-17 14:00:10 +00:00 |
|
YunaiV
|
35df912be7
|
code review：商品评价哈
|
2023-06-17 21:57:52 +08:00 |
|
芋道源码
|
08535d6019
|
!509 完善商品评论
Merge pull request !509 from puhui999/feature/mall_product
|
2023-06-17 13:39:35 +00:00 |
|
puhui999
|
16f2a5b91a
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
|
2023-06-17 21:19:02 +08:00 |
|
puhui999
|
32cca12cd2
|
fix：seckillTime => seckillConfig
|
2023-06-17 21:17:02 +08:00 |
|
YunaiV
|
fd072b7d6e
|
code review：会员积分配置
|
2023-06-17 18:33:17 +08:00 |
|
芋道源码
|
798e322f08
|
!506 积分模块
Merge pull request !506 from QingX/feature/mall_product
|
2023-06-17 09:41:41 +00:00 |
|
YunaiV
|
0d47d6cead
|
mall + trade：code review 快递客户端的实现，没啥问题咧，搞下单测就 ok 拉
|
2023-06-17 11:59:38 +08:00 |
|
YunaiV
|
59d5fef592
|
mall + trade：优化运费模版的代码
|
2023-06-17 11:35:31 +08:00 |
|
YunaiV
|
07fe52939d
|
mall + promotion：mock banner mock 接口
|
2023-06-17 00:47:47 +08:00 |
|
YunaiV
|
5b324f90a4
|
mall + promotion：mock 拼团活动列表
|
2023-06-16 23:27:27 +08:00 |
|
YunaiV
|
8ec3733882
|
mall + trade：mock 拼团记录列表的接口
|
2023-06-16 20:32:03 +08:00 |
|
YunaiV
|
af9334c9b2
|
mall + trade：mock 拼团记录详情的接口
|
2023-06-16 00:12:49 +08:00 |
|
jason
|
1662d17fc9
|
快递客户端 review 修改
|
2023-06-15 14:59:31 +08:00 |
|
jason
|
e69e6d880b
|
快递价格计算 review 修改
|
2023-06-15 10:49:24 +08:00 |
|
puhui999
|
217a31a123
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
|
2023-06-15 09:11:07 +08:00 |
|
YunaiV
|
af0eeb6e3b
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-06-14 23:08:28 +08:00 |
|
YunaiV
|
b74991e242
|
mall + trade：mock 拼团活动详情的接口
|
2023-06-14 23:08:22 +08:00 |
|
xingyu
|
e23fb5024a
|
fix: required = true 已过期
|
2023-06-14 15:21:41 +08:00 |
|
xingyu
|
573ad59edc
|
Merge remote-tracking branch 'origin/master' into feature/mall_product
# Conflicts:
# yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/string/StrUtils.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/vo/ProductBrandBaseVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/ProductCategoryBaseVO.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/spu/vo/ProductSpuBaseVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuRespVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuSimpleRespVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppProductSpuDetailRespVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppProductSpuPageItemRespVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderBaseVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderItemBaseVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/base/sku/AppProductSkuBaseRespVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppTradeCartDetailRespVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppTradeCartItemUpdateSelectedReqVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppTradeCartResetReqVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderCreateReqVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderDetailRespVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderGetCreateInfoRespVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderPageItemRespVO.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/address/vo/AppAddressBaseVO.java
|
2023-06-14 15:18:12 +08:00 |
|
puhui999
|
60172274ec
|
fix：合并代码后修改差异完善商品评论相关
|
2023-06-12 17:02:46 +08:00 |
|
puhui999
|
5cfcaa1a6e
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
# Conflicts:
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/comment/AppCommentController.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/comment/vo/AppProductCommentBaseVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/comment/vo/AppProductCommentRespVO.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/test/java/cn/iocoder/yudao/module/product/service/comment/ProductCommentServiceImplTest.java
|
2023-06-12 12:18:27 +08:00 |
|
puhui999
|
9ff873fe53
|
fix：完善商品评论测试 sql
|
2023-06-12 12:09:16 +08:00 |
|
puhui999
|
20100aa78b
|
fix：完善商品评论
|
2023-06-12 12:08:55 +08:00 |
|
YunaiV
|
dcb1660880
|
mall + trade：code review 快递计算逻辑
|
2023-06-12 00:20:20 +08:00 |
|
YunaiV
|
e1a8e45ac7
|
mall + trade：快递价格计算
|
2023-06-11 23:40:38 +08:00 |
|
YunaiV
|
0c283ded5d
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-06-11 23:19:09 +08:00 |
|
YunaiV
|
b6c7a940be
|
mall + promotion：增加秒杀活动的 mock 接口
|
2023-06-11 23:19:04 +08:00 |
|
jason
|
644d976a78
|
快递100 快递查询实现
|
2023-06-11 18:15:33 +08:00 |
|
jason
|
45e5578cb4
|
快递查询、 通过快递鸟查询实现
|
2023-06-11 10:22:33 +08:00 |
|
YunaiV
|
5ffc1ac9f3
|
mall + promotion：增加秒杀活动的 mock 接口
|
2023-06-11 00:22:45 +08:00 |
|
xiaqing
|
5f64fe052b
|
初始化sql
|
2023-06-10 20:45:31 +08:00 |
|
xiaqing
|
73d0e9d08a
|
初始化积分模块
1.积分设置管理
2.积分签到规则管理
3.用户积分记录管理
4.用户签到积分管理
|
2023-06-10 20:44:31 +08:00 |
|
YunaiV
|
4f5ac0edbb
|
mall + promotion：增加营销活动的 mock 接口
|
2023-06-10 17:51:15 +08:00 |
|
YunaiV
|
9e894e0430
|
mall + promotion：增加优惠劵的 mock 接口
|
2023-06-10 09:57:37 +08:00 |
|
YunaiV
|
66210e5ee2
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-06-10 00:19:08 +08:00 |
|
YunaiV
|
bb8e44a268
|
mall + product：增加评论 mock 逻辑
|
2023-06-10 00:17:22 +08:00 |
|
jason
|
dde89d51d5
|
物流运费计算 review 修改 + 单元测试
|
2023-06-10 00:15:57 +08:00 |
|
YunaiV
|
1e1a22c256
|
mall + product：评论的 review
|
2023-06-09 22:41:16 +08:00 |
|
YunaiV
|
84b365a707
|
mall + product：简化收藏逻辑，去掉 type 字段
|
2023-06-09 20:44:00 +08:00 |
|
YunaiV
|
25bea4920c
|
mall + trade：review 物流计算
|
2023-06-09 19:17:25 +08:00 |
|
YunaiV
|
f2d803c111
|
mall + product：review 评论接口
|
2023-06-09 13:59:04 +08:00 |
|
YunaiV
|
4126e37d91
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
# Conflicts:
# yudao-module-mall/yudao-module-product-biz/pom.xml
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/AppProductSpuController.java
|
2023-06-09 08:55:45 +08:00 |
|
YunaiV
|
f75f4e8846
|
mall + product：完善商品详情接口
|
2023-06-09 08:54:33 +08:00 |
|