168 Commits (20eb0a2a888ad7aa654108a595a863371c4ab3ab)

Author	SHA1	Message	Date
YunaiV	20eb0a2a88	mall + pay： ... 1、调整 returnUrl 的实现	3 years ago
YunaiV	9b90320985	mall + trade： ... 1、增加配送信息	3 years ago
YunaiV	6fc724545b	mall + trade： ... 1、取消订单 mock 接口 2、删除订单 mock 接口	3 years ago
YunaiV	6206dd94e2	mall + trade： ... 1、获取订单结算信息，增加门店自提编号	3 years ago
YunaiV	3750dc76c7	mall + trade： ... 1、获取订单结算信息，增加积分的 mock 返回	3 years ago
YunaiV	ef656cf762	mall + promotion： ... 1、增加获得符合条件的优惠劵	3 years ago
YunaiV	b3c1be108c	mall + trade： ... 1、增加门店自提的 mock 接口	3 years ago
YunaiV	1dfbe45913	mall + order：review 售后日志	3 years ago
YunaiV	07884ef423	Merge branch 'mall_trade_aftersalelog' of https://gitee.com/chen934298133/ruoyi-vue-pro into feature/mall_product ... Conflicts: yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/aftersale/vo/AppTradeAfterSaleCreateReqVO.java	3 years ago
YunaiV	bc54e2fb35	mall + order：订单详情	3 years ago
芋道源码	b92ed60136	!519 订单详情后端修改 ... Merge pull request !519 from 矿泉水/feature/mall_product	3 years ago
YunaiV	2efdbf93cb	mall + promotion：review 秒杀、评论代码	3 years ago
puhui999	666925da6e	fix：mall vo @Schema required = true => requiredMode = Schema.RequiredMode.REQUIRED	3 years ago
puhui999	700d95a43d	fix：完善商品评论 review 提到的问题	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
YunaiV	fc570b6062	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
陈賝	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
YunaiV	0d47d6cead	mall + trade：code review 快递客户端的实现，没啥问题咧，搞下单测就 ok 拉	3 years ago
YunaiV	59d5fef592	mall + trade：优化运费模版的代码	3 years ago
YunaiV	8ec3733882	mall + trade：mock 拼团记录列表的接口	3 years ago
jason	1662d17fc9	快递客户端 review 修改	3 years ago
jason	e69e6d880b	快递价格计算 review 修改	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	20100aa78b	fix：完善商品评论	3 years ago
YunaiV	dcb1660880	mall + trade：code review 快递计算逻辑	3 years ago
YunaiV	e1a8e45ac7	mall + trade：快递价格计算	3 years ago
jason	644d976a78	快递100 快递查询实现	3 years ago
jason	45e5578cb4	快递查询、 通过快递鸟查询实现	3 years ago
YunaiV	5ffc1ac9f3	mall + promotion：增加秒杀活动的 mock 接口	3 years ago
jason	dde89d51d5	物流运费计算 review 修改 + 单元测试	3 years ago
YunaiV	25bea4920c	mall + trade：review 物流计算	3 years ago
YunaiV	f2d803c111	mall + product：review 评论接口	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