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
|
4f5ac0edbb
|
mall + promotion：增加营销活动的 mock 接口
|
3 years ago |
|
YunaiV
|
9e894e0430
|
mall + promotion：增加优惠劵的 mock 接口
|
3 years ago |
|
YunaiV
|
bb8e44a268
|
mall + product：增加评论 mock 逻辑
|
3 years ago |
|
YunaiV
|
1e1a22c256
|
mall + product：评论的 review
|
3 years ago |
|
YunaiV
|
84b365a707
|
mall + product：简化收藏逻辑，去掉 type 字段
|
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
|
db7e47faa2
|
fix：完善 TODO 提到的问题
|
3 years ago |
|
YunaiV
|
dd93215139
|
mall + trade：review 商品管理
|
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
|
36ce968893
|
mall + trade：review 运费价格计算
|
3 years ago |
jason
|
f1fa8eadd2
|
mall - trade - 新增 TradeDeliveryPriceCalculator
|
3 years ago |
|
YunaiV
|
2a9a869e01
|
mall + trade：获得订单结算信息，接入支付接口
|
3 years ago |
|
puhui999
|
8d2bcc57aa
|
fix: 完善商品管理
|
3 years ago |
|
puhui999
|
e86214015d
|
fix: 完善商品管理
|
3 years ago |
|
puhui999
|
b065a2a741
|
fix:修复商品 review 提到的问题
|
3 years ago |
|
YunaiV
|
c62da6a056
|
mall：review 商品接口
|
3 years ago |
|
puhui999
|
a70c7ca855
|
fix:完善 mall.sql
|
3 years ago |
|
puhui999
|
d08b9530a2
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
# Conflicts:
# sql/mysql/optional/mall.sql
|
3 years ago |
|
puhui999
|
cac5545762
|
fix：完善商品管理, 完善 mall.sql, 完善 product 测试相关sql, 完善 ProductSpuServiceImplTest 测试
|
3 years ago |
|
YunaiV
|
8ed52701fd
|
调整商品收藏的命名
|
3 years ago |
|
jason
|
4b643a7b34
|
物流配送管理表结构修改
|
3 years ago |
|
jason
|
7a792a7d48
|
商品收藏相关修改
|
3 years ago |
|
YunaiV
|
7fef594390
|
订单接口的梳理
|
3 years ago |
|
YunaiV
|
c21e88860f
|
REVIEW 物流管理相关的表
|
3 years ago |
|
YunaiV
|
467811a42e
|
REVIEW 商品收藏的逻辑 v2
|
3 years ago |
|
jason
|
0ffa7ff4c8
|
发货配送模块表结构
|
3 years ago |
|
xingyu
|
0b3640a522
|
fix: required = true ==> requiredMode = Schema.RequiredMode.REQUIRED
|
3 years ago |
|
jason
|
14d02bdfb3
|
商品收藏修改
|
3 years ago |
|
YunaiV
|
96e2bf020f
|
REVIEW 商品收藏的逻辑
|
3 years ago |
|
YunaiV
|
cd86620b74
|
REVIEW 商品管理的逻辑
|
3 years ago |
|
jason
|
7345d80b53
|
新增商品收藏功能
|
3 years ago |
|
puhui999
|
810c7ed040
|
完善商品管理
|
3 years ago |
|
puhui999
|
c233ce1a20
|
合并分支修复差异
|
3 years ago |
|
puhui999
|
e163ae8b70
|
完成商品保存和编辑数据回显
|
3 years ago |
|
puhui999
|
70816371e5
|
初步完成商品CRUD
|
3 years ago |
|
YunaiV
|
da162853ec
|
商城：完善购物车的逻辑
|
3 years ago |
|
puhui999
|
15ced47b17
|
添加多租户
|
3 years ago |
|
puhui999
|
c10ea9d9de
|
移除ProductSku相关的status属性，修改Property
|
3 years ago |
|
puhui999
|
24a56bb45f
|
移除ProductSku相关的status属性，修改Property
|
3 years ago |
|
puhui999
|
f56d394830
|
修改ProductSpuBaseVO第一版
|
3 years ago |
|
puhui999
|
668d493b7f
|
Product相关Do添加TenantBaseDO
|
3 years ago |
|
YunaiV
|
2113e825d7
|
完善 App 商品详情逻辑的 10%
|
3 years ago |
|
YunaiV
|
3ced6a3240
|
完善 App 商品搜索的逻辑
|
3 years ago |
|
puhui999
|
4068548c45
|
移除ProductSpuSpecTypeEnum及相关引用
|
3 years ago |