puhui999
|
b78f814552
|
fix：mall promotion SeckillActivity
|
3 years ago |
|
puhui999
|
78b3d2a20f
|
fix：mall promotion Combination
|
3 years ago |
|
puhui999
|
41d996f7f3
|
feat：mall promotion CombinationProduct
|
3 years ago |
|
puhui999
|
409ec555e8
|
feat：mall CombinationActivity
|
3 years ago |
YunaiV
|
ef656cf762
|
mall + promotion：
1、增加获得符合条件的优惠劵
|
3 years ago |
|
YunaiV
|
846405d8b1
|
mall + promotion：
1、增加 article mock 接口
|
3 years ago |
|
YunaiV
|
7036a6652c
|
mall + member：
1、调整收获地址的返回
|
3 years ago |
|
YunaiV
|
5c9a99c83e
|
mall + promotion：
1、mock 优惠劵模版分页
2、mock 批量删除收藏
|
3 years ago |
|
YunaiV
|
4a3703e302
|
mall + promotion：review 页面装修
|
3 years ago |
jason
|
050f0bb6a2
|
页面装修 review 修改
|
3 years ago |
|
YunaiV
|
b582206003
|
mall + promotion：review 页面装修
|
3 years ago |
|
jason
|
ad1f656dfa
|
页面装修修改,后端只负责存取
|
3 years ago |
|
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 |
|
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 |
|
puhui999
|
1871a01944
|
fix：seckill：调整相关类属性和表字段对齐
|
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
|
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 |
|
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
|
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 |
|
YunaiV
|
b6c7a940be
|
mall + promotion：增加秒杀活动的 mock 接口
|
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 |
|
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 |