YunaiV
|
2efdbf93cb
|
mall + promotion：review 秒杀、评论代码
|
3 years ago |
|
芋道源码
|
b16632ea41
|
!522 mall seckill
Merge pull request !522 from puhui999/feature/mall_product
|
3 years ago |
jason
|
6b1d996b66
|
页面装修数据结构定义
|
3 years ago |
puhui999
|
26f563df57
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
|
3 years ago |
|
puhui999
|
ab30ff6480
|
fix：完善 mall seckill 相关 ②
|
3 years ago |
|
YunaiV
|
b0fcd96dfe
|
mall + promotion：增加砍价记录的 mock
|
3 years ago |
|
YunaiV
|
f5b2bb4d7d
|
mall + promotion：增加砍价记录的 mock
|
3 years ago |
|
YunaiV
|
c33bd38b5d
|
mall + promotion：增加砍价记录的 mock
|
3 years ago |
|
puhui999
|
b44ad3a0f7
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
|
3 years ago |
|
puhui999
|
666925da6e
|
fix：mall vo @Schema required = true => requiredMode = Schema.RequiredMode.REQUIRED
|
3 years ago |
|
YunaiV
|
772a982b5f
|
mall + promotion：增加拼团记录的 mock
|
3 years ago |
|
puhui999
|
700d95a43d
|
fix：完善商品评论 review 提到的问题
|
3 years ago |
|
puhui999
|
8dfb298376
|
fix：完善 mall seckill 相关 ①
|
3 years ago |
|
puhui999
|
9517ffdfb8
|
fix：修复 mall product promotion 测试 sql
|
3 years ago |
|
YunaiV
|
bf7f68a04b
|
mall + promotion：增加拼团的 mock 返回
|
3 years ago |
|
YunaiV
|
8a7f7fd641
|
mall + promotion：增加拼团的 mock 返回
|
3 years ago |
chenchen
|
2f0aaee823
|
售后日志优化
|
3 years ago |
xiaobai
|
32b348a2d3
|
Merge branch 'feature/mall_product' of https://gitee.com/joly_xiaobai/ruoyi-vue-pro into mall_product
# Conflicts:
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderBaseVO.java
|
3 years ago |
|
xiaobai
|
6b3af71735
|
订单详情修改20230619
|
3 years ago |
|
chenchen
|
b7c0fef63f
|
Merge branch 'feature/mall_product' into mall_product_aftersalelog
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-biz-trade/pom.xml
# yudao-module-mall/yudao-module-trade-biz/pom.xml
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/aftersale/TradeAfterSaleServiceImpl.java
# yudao-server/pom.xml
|
3 years ago |
|
chenchen
|
a93b9a616f
|
售后日志优化
|
3 years ago |
|
puhui999
|
331be53b8b
|
fix：完善时段配置管理
|
3 years ago |
|
puhui999
|
49d726019a
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
|
3 years ago |
|
YunaiV
|
fc570b6062
|
mall + promotion：完善秒杀活动的 mock 返回
|
3 years ago |
|
YunaiV
|
d795dbc7ac
|
mall + promotion：优化限购、库存的返回结果
|
3 years ago |
|
puhui999
|
cd4940d710
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
|
3 years ago |
|
YunaiV
|
a93acd2a74
|
mall + promotion：mock 秒杀列表
|
3 years ago |
|
YunaiV
|
6573849f56
|
mall + promotion：mock 拼团列表
|
3 years ago |
|
chenchen
|
7d0e9ea762
|
fix 依赖启动问题
|
3 years ago |
|
YunaiV
|
60b24e36d5
|
code review：售后日志逻辑
|
3 years ago |
|
puhui999
|
1871a01944
|
fix：seckill：调整相关类属性和表字段对齐
|
3 years ago |
|
陈賝
|
59e16795be
|
!514 mall交易日志封装
* 交易日志封装
* 交易日志封装
* 交易日志模块
|
3 years ago |
|
YunaiV
|
35df912be7
|
code review：商品评价哈
|
3 years ago |
|
芋道源码
|
08535d6019
|
!509 完善商品评论
Merge pull request !509 from puhui999/feature/mall_product
|
3 years ago |
|
puhui999
|
16f2a5b91a
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
|
3 years ago |
|
puhui999
|
32cca12cd2
|
fix：seckillTime => seckillConfig
|
3 years ago |
|
YunaiV
|
0d47d6cead
|
mall + trade：code review 快递客户端的实现，没啥问题咧，搞下单测就 ok 拉
|
3 years ago |
|
YunaiV
|
59d5fef592
|
mall + trade：优化运费模版的代码
|
3 years ago |
|
YunaiV
|
07fe52939d
|
mall + promotion：mock banner mock 接口
|
3 years ago |
|
YunaiV
|
5b324f90a4
|
mall + promotion：mock 拼团活动列表
|
3 years ago |
|
YunaiV
|
8ec3733882
|
mall + trade：mock 拼团记录列表的接口
|
3 years ago |
|
YunaiV
|
af9334c9b2
|
mall + trade：mock 拼团记录详情的接口
|
3 years ago |
|
jason
|
1662d17fc9
|
快递客户端 review 修改
|
3 years ago |
|
jason
|
e69e6d880b
|
快递价格计算 review 修改
|
3 years ago |
|
puhui999
|
217a31a123
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
|
3 years ago |
|
YunaiV
|
af0eeb6e3b
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
3 years ago |
|
YunaiV
|
b74991e242
|
mall + trade：mock 拼团活动详情的接口
|
3 years ago |
xingyu
|
e23fb5024a
|
fix: required = true 已过期
|
3 years ago |
|
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
|
3 years ago |
|
puhui999
|
60172274ec
|
fix：合并代码后修改差异完善商品评论相关
|
3 years ago |
|
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
|
3 years ago |
|
puhui999
|
9ff873fe53
|
fix：完善商品评论测试 sql
|
3 years ago |
|
puhui999
|
20100aa78b
|
fix：完善商品评论
|
3 years ago |
|
YunaiV
|
dcb1660880
|
mall + trade：code review 快递计算逻辑
|
3 years ago |
|
YunaiV
|
e1a8e45ac7
|
mall + trade：快递价格计算
|
3 years ago |
|
YunaiV
|
0c283ded5d
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
3 years ago |
|
YunaiV
|
b6c7a940be
|
mall + promotion：增加秒杀活动的 mock 接口
|
3 years ago |
|
jason
|
644d976a78
|
快递100 快递查询实现
|
3 years ago |
|
jason
|
45e5578cb4
|
快递查询、 通过快递鸟查询实现
|
3 years ago |
|
YunaiV
|
5ffc1ac9f3
|
mall + promotion：增加秒杀活动的 mock 接口
|
3 years ago |
|
YunaiV
|
4f5ac0edbb
|
mall + promotion：增加营销活动的 mock 接口
|
3 years ago |
|
YunaiV
|
9e894e0430
|
mall + promotion：增加优惠劵的 mock 接口
|
3 years ago |
|
YunaiV
|
66210e5ee2
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
3 years ago |
|
YunaiV
|
bb8e44a268
|
mall + product：增加评论 mock 逻辑
|
3 years ago |
|
jason
|
dde89d51d5
|
物流运费计算 review 修改 + 单元测试
|
3 years ago |
|
YunaiV
|
1e1a22c256
|
mall + product：评论的 review
|
3 years ago |
|
YunaiV
|
84b365a707
|
mall + product：简化收藏逻辑，去掉 type 字段
|
3 years ago |
|
YunaiV
|
25bea4920c
|
mall + trade：review 物流计算
|
3 years ago |
|
YunaiV
|
f2d803c111
|
mall + product：review 评论接口
|
3 years ago |
|
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
|
3 years ago |
|
YunaiV
|
f75f4e8846
|
mall + product：完善商品详情接口
|
3 years ago |
|
puhui999
|
91e357e59d
|
fix：移动 app 商品评论分页相关常量到 AppCommentPageReqVO 中
|
3 years ago |
|
puhui999
|
8f7efbe4e2
|
fix：测试 app 商品评论页获取评论分页接口和相关评论分类数量接口，修复测试时发现的问题
|
3 years ago |
|
puhui999
|
151e58daa1
|
fix：完善 app 商品评论页获取评论分页接口和相关评论分类数量接口
|
3 years ago |
|
puhui999
|
5bfca56efa
|
fix：完善 TODO 提到的问题
|
3 years ago |
|
puhui999
|
db7e47faa2
|
fix：完善 TODO 提到的问题
|
3 years ago |
|
jason
|
36c45bd44e
|
review 价格运算修改.
|
3 years ago |
|
YunaiV
|
dd93215139
|
mall + trade：review 商品管理
|
3 years ago |
|
puhui999
|
f3a982da31
|
fix：修复合并差异
|
3 years ago |
|
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
|
3 years ago |
|
YunaiV
|
910d374cee
|
mall + trade：review 运费价格计算
|
3 years ago |
|
YunaiV
|
36ce968893
|
mall + trade：review 运费价格计算
|
3 years ago |
|
jason
|
f1fa8eadd2
|
mall - trade - 新增 TradeDeliveryPriceCalculator
|
3 years ago |
|
YunaiV
|
73a781cbbe
|
mall + trade：增加 TradeRewardActivityPriceCalculatorTest 的单元测试
|
3 years ago |
|
YunaiV
|
0d08c814ec
|
mall + trade：增加 TradeDiscountActivityPriceCalculator 的单元测试
|
3 years ago |
|
YunaiV
|
1452f6b231
|
mall + trade：增肌爱 TradeCouponPriceCalculator 的单元测试
|
3 years ago |
|
YunaiV
|
636b14ccce
|
mall + trade：创建订单逻辑，接入新的价格接口
|
3 years ago |
|
YunaiV
|
2a9a869e01
|
mall + trade：获得订单结算信息，接入支付接口
|
3 years ago |
|
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
|
3 years ago |
|
puhui999
|
8d2bcc57aa
|
fix: 完善商品管理
|
3 years ago |
|
YunaiV
|
5de8fa2e42
|
mall + trade：解决报错问题
|
3 years ago |
|
puhui999
|
e86214015d
|
fix: 完善商品管理
|
3 years ago |
|
YunaiV
|
e34eddc386
|
mall + trade：review 自提代码
|
3 years ago |
|
jason
|
894b19b8ec
|
新增自提门店管理
|
3 years ago |
|
jason
|
f8db53896f
|
review 修改
|
3 years ago |
|
puhui999
|
35daee84e7
|
fix: 解决合并代码后项目运行失败的问题，相关问题已标注 TODO
|
3 years ago |
|
puhui999
|
fcaa92d406
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
|
3 years ago |
|
YunaiV
|
0631c51d93
|
mall + trade：review 配置管理列表
|
3 years ago |
|
jason
|
55dbff7570
|
运费模板 review 修改. 运费模块可以选择多个区域
|
3 years ago |
|
YunaiV
|
02fa6fc5c6
|
mall + trade：调整价格字段，更易懂
|
3 years ago |