237 Commits (482a84a6f1059fa4726892c0fcbd249c73ba2d1d)

Author	SHA1	Message	Date
puhui999	384359c9d4	fix: 完善拼团、秒杀、砍价活动管理	3 years ago
puhui999	5f9184904a	fix: 完善拼团、秒杀、砍价活动管理	3 years ago
YunaiV	5e2fa48f20	code review：拼团、秒杀活动的代码	3 years ago
puhui999	92b10e2ecf	Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product	3 years ago
puhui999	d156d43d63	fix：完善 review 拼团、秒杀活动的实现提到的问题	3 years ago
wcz	a6ffb5d650	BaseMapperX.java少了几个方法，TradeCartMapper.java方法调整，BpmProcessInstanceServiceImpl.java多了	3 years ago
YunaiV	b84f7825c5	review 拼团、秒杀活动的实现	3 years ago
puhui999	7957cfa50d	fix：优化拼团与订单集成逻辑	3 years ago
puhui999	8d13ecc9c8	fix：优化订单发货逻辑使其支持一单分发	3 years ago
puhui999	f23e1b857a	fix：合并差异修正	3 years ago
puhui999	a73e078593	Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product ... # Conflicts: # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderServiceImpl.java	3 years ago
puhui999	259807600a	feat：拼团订单集成	3 years ago
zhijiantianya@gmail.com	3f410c2735	by gateway: ... 1. 补全 channel 单元测试 2. 完善部分 order 单元测试	3 years ago
puhui999	d80bf5a368	Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product	3 years ago
YunaiV	6f475f8c85	mall + pay： ... 1. 优化 PayClient 支付逻辑，返回业务失败 errorCode + errorMsg 错误码	3 years ago
puhui999	927f71c7e2	Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product	3 years ago
YunaiV	ca4afc2909	mall + pay： ... 1. 调整 cashier 的 channels 的读取实现方式	3 years ago
YunaiV	2485a5ebc9	mall + pay： ... 1. 将 amount 统一都修改成 price 2. 将 payed 统一改成 payStatus	3 years ago
puhui999	e7d8643665	fix：修复 mall review @puhui999	3 years ago
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
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
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
YunaiV	0631c51d93	mall + trade：review 配置管理列表	3 years ago
jason	55dbff7570	运费模板 review 修改. 运费模块可以选择多个区域	3 years ago
YunaiV	02fa6fc5c6	mall + trade：调整价格字段，更易懂	3 years ago
YunaiV	0083d12404	mall：review + mall：快递费用	3 years ago
YunaiV	53e9be733f	mall：review + mall：快递公司管理	3 years ago
YunaiV	3672c217f8	mall：售后分页接口的 mock	3 years ago
jason	01a67289a9	mall: 订单中心新增运费模板功能	3 years ago
YunaiV	e942b52a67	mall：订单详情：调整售后字段	3 years ago
YunaiV	e745bb6675	mall：订单列表：增加订单类型的接入	3 years ago
YunaiV	be7c664e07	mall：订单统计接口	3 years ago
YunaiV	83aa656bda	mall：增加订单评论字段	3 years ago
jason	3da2eb89b2	新增快递公司功能	3 years ago
YunaiV	f129eab36f	REVIEW 物流配送管理表	3 years ago
YunaiV	db73ddc942	REVIEW 物流配送管理表	3 years ago
jason	4b643a7b34	物流配送管理表结构修改	3 years ago
YunaiV	7fef594390	订单接口的梳理	3 years ago