526 Commits (f1dd991cdef6d3a20821551cff1ed3e78e86f82a)

Author	SHA1	Message	Date
YunaiV	a47d744f64	分销：绑定分销的 url 调整	3 years ago
owen	797680895b	trade: 分销业务后台功能：佣金格式化	3 years ago
YunaiV	426594ae00	分销：调整 app 的 price 到 brokeragePrice	3 years ago
owen	643602d038	trade: 分销业务后台功能：修改上级推广人	3 years ago
owen	ca55e61dd2	trade: 分销业务后台功能：清除推广员、修改推广资格	3 years ago
YunaiV	557b09a157	code review：分销逻辑	3 years ago
芋道源码	3b5215db21	!611 分销用户管理、Review代码修改 ... Merge pull request !611 from 疯狂的世界/brokerate	3 years ago
owen	4e9be7a181	trade: 分销业务后台功能：修改推广资格	3 years ago
owen	259734964d	trade: 分销业务后台功能：清除推广员、修改推广员	3 years ago
owen	f97c7a0f6e	trade: 分销业务绑定推广员	3 years ago
YunaiV	87c55784c4	code review：营销活动+订单	3 years ago
owen	6ef36d5ca6	trade: 增加分销 API	3 years ago
owen	1ead368595	trade: 优化分销用户佣金字段名称	3 years ago
owen	4b43304c76	trade: 优化分销用户绑定用户编号、绑定时间字段名称	3 years ago
owen	f36a6c5d6c	trade: 优化修改推广员接口字段名称	3 years ago
owen	b85d660a5c	trade: 分销业务完善校验	3 years ago
owen	0a0c3c0ede	trade: 分销业务相关类型移除Trade前缀	3 years ago
owen	ddcebb1986	common: MoneyUtils 移到 common 模块	3 years ago
owen	1cc2dfc963	trade: 分销Review代码修改	3 years ago
owen	166b1b31c0	trade: 分销用户管理	3 years ago
puhui999	5d6bb84d25	Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product	3 years ago
puhui999	0e8755972c	营销活动+订单：完善大部分 TODO 提到的问题	3 years ago
YunaiV	5808f77ade	code review：订单分佣	3 years ago
YunaiV	eb342d5abf	Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product ... # Conflicts: # yudao-module-member/yudao-module-member-biz/src/test/resources/sql/create_tables.sql	3 years ago
YunaiV	62a4e8242b	分销：增加提现接口	3 years ago
芋道源码	ea26691967	!607 member: 佣金解冻 ... Merge pull request !607 from 疯狂的世界/brokerate_unfreeze	3 years ago
puhui999	2591ab5d36	订单中心+营销活动：完善部分 TODO 提到的问题	3 years ago
owen	fa53a3b15e	trade: MemberBrokerageRecord 重命名为 TradeBrokerageRecord	3 years ago
owen	9336a0a102	trade: 分销业务从 member 模块 转移到 trade模块	3 years ago
YunaiV	e4b153a866	分佣：增加获得分销排行分页 API mock	3 years ago
owen	a68691f2d9	trade: 增加分销用户表	3 years ago
owen	6474502738	trade: 增加交易中心配置表	3 years ago
YunaiV	0329f13fbf	分佣：增加获得分销排行分页 API mock	3 years ago
owen	9eb7837b67	member: 佣金失效	3 years ago
owen	c7ef8519c8	member: 分销增加佣金	3 years ago
YunaiV	b69d4e0852	Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product	3 years ago
owen	71efa0ed6f	promotion: 订单使用品类券时，根据品类过滤可用商品	3 years ago
owen	8bbaaf1ce9	promotion: 优惠券模板 productSpuIds 改成 productScopeValues	3 years ago
YunaiV	c25bf38f50	code review：交易订单的取消	3 years ago
YunaiV	9c0d0c809a	Merge branch 'mall_order_cancel' of https://gitee.com/CrazyWorld/ruoyi-vue-pro into feature/mall_product ... Conflicts: yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponService.java yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponServiceImpl.java yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java	3 years ago
owen	3fbce643ee	mall: 发送优惠券功能优化	3 years ago
owen	b3fcefa677	trade: 会员取消订单	3 years ago
YunaiV	28adfff10e	code review：订单逻辑	3 years ago
芋道源码	8dd600a300	!600 订单中心：修改获取售后订单详情接口，修改订单管理后台物流获取接口 ... Merge pull request !600 from puhui999/feature/mall_product	3 years ago
zhijiantianya@gmail.com	dd6adb8ee6	code review order	3 years ago
puhui999	1f9968d784	订单中心：修改获取售后订单详情接口，修改订单管理后台物流获取接口	3 years ago
YunaiV	d982a95fdd	Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro	3 years ago
YunaiV	60d4aa97fb	code review：售后详情接口	3 years ago
YunaiV	059202a588	购物车：调整购物车接口	3 years ago
chenchen	73f1636daa	售后日志添加售前售后状态	3 years ago
YunaiV	3e4b1c0552	Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product	3 years ago
YunaiV	5a788af084	购物车：简化 cart 表命名	3 years ago
puhui999	d5fe7708ce	订单售后退款：添加获取售后订单详情接口	3 years ago
puhui999	0411b3464a	订单售后退款：添加获取售后订单详情接口	3 years ago
puhui999	498edfffb1	Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product	3 years ago
puhui999	655eefc340	订单管理：完善订单管理提到的一些问题	3 years ago
YunaiV	8b98d13d8b	Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro	3 years ago
YunaiV	02bc9d28de	解决 MapStruct 的时区问题	3 years ago
owen	02abe86253	member: ... 1.用户积分变动方法, 提取到单独的接口中 2.规范代码	3 years ago
YunaiV	b75d777670	code review：订单评论、订单积分的变更	3 years ago
owen	d4acacec60	trade: 1.支付成功后，增加用户积分；2.退款成功后，扣减用户积分	3 years ago
owen	dad56fd096	trade: 1.支付成功后，增加用户经验；2.退款成功后，扣减用户经验	3 years ago
shizhong	eb4434ecbc	解决MapStruct的时区问题	3 years ago
YunaiV	5932e8e931	code review：订单列表、详情	3 years ago
puhui999	002475f33a	订单管理：完善订单管理 补全相关接口	3 years ago
puhui999	d2c135eda9	订单管理：添加修改备注、订单调价、修改地址接口	3 years ago
puhui999	d29c5a556c	订单管理：添加修改备注、订单调价、修改地址接口	3 years ago
puhui999	716f11e80b	fix: 合并差异	3 years ago
puhui999	8123354f09	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/controller/admin/order/TradeOrderController.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/delivery/DeliveryExpressConvert.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/delivery/DeliveryExpressService.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/delivery/DeliveryExpressServiceImpl.java	3 years ago
puhui999	c2b6c0d72a	fix: 订单列表重构 ①	3 years ago
YunaiV	94a32d34b2	1. 会员用户，增加 point 积分字段 ... 2. 增加获得优惠劵、收藏数量的 API 接口	3 years ago
YunaiV	61fbb9909a	订单： ... 1、简化交易订单的逻辑	3 years ago
YunaiV	fe07e223e4	订单： ... 1、简化交易订单的逻辑	3 years ago
YunaiV	f217ba0807	售后： ... 1、完善整个流程的实现	3 years ago
YunaiV	5dd6e5bee8	营销： ... 1. 售后订单，增加对 afterSaleId 的更新	3 years ago
YunaiV	a159a983a2	订单： ... 1. 拆分读写 OrderService，避免单 Service 逻辑过重。	3 years ago
YunaiV	159c74ce15	订单： ... 1. review 发货 2. review 拼团逻辑	3 years ago
芋道源码	60171ce7e4	!571 完善订单发货逻辑、重构砍价活动、完善拼团记录创建逻辑 ... Merge pull request !571 from puhui999/feature/mall_product	3 years ago
YunaiV	e4a2c738b2	订单： ... 1. 增加查询物流接口	3 years ago
puhui999	de828e3d04	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/controller/admin/bargain/BargainActivityController.java # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/bargain/vo/BargainActivityCreateReqVO.java # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/bargain/vo/BargainActivityRespVO.java # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/bargain/vo/BargainActivityUpdateReqVO.java # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/bargain/vo/activity/BargainActivityCreateReqVO.java # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/bargain/vo/activity/BargainActivityPageReqVO.java # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/bargain/vo/product/BargainProductBaseVO.java # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/combination/vo/activity/CombinationActivityPageReqVO.java # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/bargain/BargainActivityConvert.java # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/combination/CombinationActivityConvert.java # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/seckill/seckillactivity/SeckillActivityConvert.java # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/bargain/BargainActivityDO.java # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/bargain/BargainProductDO.java # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/combination/CombinationActivityMapper.java # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/bargain/BargainActivityService.java # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/bargain/BargainActivityServiceImpl.java # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationServiceImpl.java # yudao-module-mall/yudao-module-promotion-biz/src/test/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationActivityServiceImplTest.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.java	3 years ago
puhui999	651725e3e8	fix: 完善订单发货逻辑、重构砍价活动、完善拼团记录创建逻辑	3 years ago
YunaiV	715c42574f	订单： ... 1、订单评价的接入	3 years ago
YunaiV	7dc398717a	订单： ... 1、实现确认收货接口	3 years ago
YunaiV	503c996acd	订单： ... 1、移除 deliverStatus 发货状态，暂时没作用 2、无需发货时，使用 logisticsId 进行实现 3、订单详情，增加 logisticsId 和 logisticsName 返回	3 years ago
zhijiantianya@gmail.com	ba59ec85e0	code review 各种活动	3 years ago
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
chenchen	284506b356	mall 下单日志	3 years ago
chenchen	f492797fba	update 售后日志	3 years ago
chenchen	2865c28a9f	售后日志优化，map->抽方法	3 years ago
chenchen	75afab1f86	售后日志优化	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
xingyu	0b3640a522	fix: required = true ==> requiredMode = Schema.RequiredMode.REQUIRED	3 years ago
芋道源码	19ceea2c6c	!472 完善商品管理（第一版） ... Merge pull request !472 from puhui999/dev	3 years ago
puhui999	c233ce1a20	合并分支修复差异	3 years ago
YunaiV	6b05835cb3	购物车：增加获得商品数量 Map 接口	3 years ago
YunaiV	9980b12551	调整购物车接口，支持 add 商品时，适配前端可能要删除的情况	3 years ago
YunaiV	f7fe9ad7b0	1. 商城：调整购物车的失效逻辑实现，基于 SPU 是否下架 ... 2. 商城：增加购物车失效的重选逻辑	3 years ago
YunaiV	da162853ec	商城：完善购物车的逻辑	3 years ago
puhui999	c3e36ba9da	修正相关问题让服务正常启动，改动位置都已加上TODO记录	3 years ago
inypeacock	d3cd87767b	缺少ServletUtils引用 ... Signed-off-by: inypeacock <1300856@qq.com>	3 years ago
YunaiV	e5fcc7a387	boot3：适合 ServletUtils	3 years ago
chop	14e7c52e0e	原来的Date类型查询订单返回时间差8个小时，项目全局使用LocalDateTime时间 ... 原来的Date类型查询订单返回时间差8个小时，项目全局使用LocalDateTime时间 Signed-off-by: chop <935048000@qq.com>	3 years ago
YunaiV	102d56ff7d	修复单测报错的问题	3 years ago
YunaiV	53767614fe	增加商城的提示	3 years ago
YunaiV	6bf5eb0133	适配 mall 模块的 openapi	3 years ago
xingyu	854ba3315c	marge master	3 years ago
xingyu	7b98a3f3f3	Merge remote-tracking branch 'origin/master' into feature/springdoc ... # Conflicts: # README.md # yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/ProductPropertyController.java # yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/ProductPropertyValueController.java # yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/ProductPropertyViewRespVO.java # yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyAndValueRespVO.java # yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyBaseVO.java # yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyCreateReqVO.java # yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyListReqVO.java # yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyPageReqVO.java # yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyRespVO.java # yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyUpdateReqVO.java # yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValueBaseVO.java # yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValueCreateReqVO.java # yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValuePageReqVO.java # yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValueRespVO.java # yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValueUpdateReqVO.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/sku/vo/ProductSkuCreateOrUpdateReqVO.java # yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/ProductSpuController.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/ProductSpuDetailRespVO.java # yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuPageReqVO.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/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppSpuPageReqVO.java # yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppSpuPageRespVO.java # yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppSpuRespVO.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/base/property/AppProductPropertyValueDetailRespVO.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderPageReqVO.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/TradeOrderItemRespVO.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/TradeOrderRespVO.java # yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/app/order/AppPayOrderController.java # yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/notify/vo/PayNotifyOrderReqVO.java # yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/notify/vo/PayRefundOrderReqVO.java # yudao-server/pom.xml # yudao-server/src/main/java/cn/iocoder/yudao/module/shop/controller/app/AppShopOrderController.java	3 years ago
YunaiV	a83b8e8fbc	修复报错的单元测试	3 years ago
xingyu	cacefb4eea	feat: knife4j springdoc	3 years ago
YunaiV	7f131a3853	trade：增加用户 App 的订单分页和详情接口	3 years ago
YunaiV	b7d78a24a4	trade：完成管理后台的订单详情的简单对接	3 years ago
YunaiV	c5408965eb	trade：增加管理后台的订单详情接口	3 years ago
YunaiV	fc48ab4928	trade：前端订单管理，联调接口	3 years ago
YunaiV	fc49f000ce	trade：前端订单管理，联调接口	3 years ago
YunaiV	bddbedd781	增加城市库	3 years ago
xingyu4j	9fc6e0f00b	refactor: springdoc 替换 springfox	3 years ago
YunaiV	fe1ae23b71	trade：增加管理后台的订单分页接口	3 years ago
YunaiV	fac3e7c726	product：商品规格，调整成商品属性，避免和 sku 概念冲突	3 years ago
YunaiV	7fc9689f07	trade：定义管理后台的订单分页接口	3 years ago
YunaiV	7056d89b0c	trade：完成交易订单的收货逻辑	3 years ago
YunaiV	66abe4a84b	trade：完成交易订单的发货逻辑	3 years ago
YunaiV	07f1681b50	Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp	3 years ago
YunaiV	e96422a47e	trade：完成支付成功后的回调，更新订单为已支付	3 years ago
YunaiV	1cd9085c59	pay: PayNotifyJob 增加多租户的支持	3 years ago
YunaiV	8798944069	优化 pay 支付成功后的回调逻辑	3 years ago
芋道源码	1465d064dd	!307 调用获取地址参数顺序错误 ... Merge pull request !307 from plimlips/N/A	3 years ago
YunaiV	73d847ae2e	调整支付模块的回调地址	3 years ago
YunaiV	64df5ce5f4	trade：【交易售后】增加会员取消售后	3 years ago
YunaiV	ed9c8d4a78	trade：【交易售后】增加售后日志	3 years ago
plimlips	453669c7d9	解决新建订单时,订单Id使用使用了address Id的问题 ... Signed-off-by: plimlips <156839224@qq.com>	3 years ago
plimlips	19a6fc79a2	调用获取地址参数顺序错误 ... Signed-off-by: plimlips <156839224@qq.com>	3 years ago
芋道源码	dbf237a1f3	修复 Swagger 注解错误，导致文档 404 问题 ... Signed-off-by: 芋道源码 <zhijiantianya@gmail.com>	3 years ago
YunaiV	d884303df6	trade：【交易售后】查询分页列表	3 years ago
YunaiV	00e66216c5	trade：【交易售后】查询分页列表的前端	3 years ago
YunaiV	35528e8267	trade：【交易售后】查询分页列表	3 years ago
YunaiV	73b92190c6	trade：【交易售后】增加申请售后的单元测试	3 years ago
YunaiV	e95402ab92	trade：【交易订单】调整交易订单的 afterSale 字段	3 years ago
YunaiV	cd2bc112cc	trade：【交易售后】完善发起、同意、不同意、收货、拒绝收货、退款的逻辑	3 years ago
YunaiV	ee1d362a7c	trade：【交易售后】回调退款	3 years ago
YunaiV	67050eeaa8	trade：【交易售后】确认收货	3 years ago
YunaiV	40f0117130	trade：售后增加发货	3 years ago
YunaiV	92dbf093ea	trade：增加管理员审批	3 years ago
YunaiV	10f2dbc8cd	trade: 增加创建售后订单的接口	3 years ago
YunaiV	b8d1d31df0	trade: 调整退款单	3 years ago
YunaiV	89580e7903	合并 master 代码	3 years ago
YunaiV	afc76973ce	Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp ... # Conflicts: # yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/date/DateUtils.java # yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponBaseVO.java # yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponExcelVO.java # yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponExportReqVO.java # yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponPageReqVO.java # yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponRespVO.java # yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteBaseVO.java # yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteExcelVO.java # yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteExportReqVO.java # yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempletePageReqVO.java # yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteRespVO.java # yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/dal/dataobject/CouponTemplete/CouponTempleteDO.java # yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/dal/dataobject/coupon/CouponDO.java # yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuPageReqVO.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-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/discount/DiscountProductDO.java # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/reward/RewardActivityDO.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/cart/TradeCartItemDO.java # yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/user/dto/UserInfoDTO.java # yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java # yudao-server/pom.xml # yudao-server/src/main/resources/application-local.yaml # yudao-server/src/main/resources/application.yaml # yudao-ui-admin/src/views/mall/CouponTemplete/index.vue # yudao-ui-admin/src/views/mall/product/property/index.vue # yudao-ui-admin/src/views/mall/product/spu/index.vue # yudao-ui-admin/src/views/mall/product/spu/save.vue # yudao-ui-admin/src/views/system/role/index.vue	3 years ago
YunaiV	f5ef87094d	优化，使用 @Configuration(proxyBeanMethods = false) 提升启动速度	3 years ago
YunaiV	5934d6b029	trade：完成下单时，创建支付单逻辑	3 years ago
YunaiV	84f6ec10bc	trade：增加优惠劵使用、商品库存的扣减	3 years ago
YunaiV	734236df97	trade：创建订单接口的后端实现的单元测试 100%	3 years ago
xingyu4j	632a132a6a	refactor: Date ==> LocalDateTime	3 years ago
YunaiV	bc2aa78f70	trade：创建订单接口的后端实现的单元测试 50%	3 years ago
YunaiV	01d10b518c	trade：优化创建订单接口的后端实现	3 years ago
YunaiV	05614cc0b8	trade：完善 TradeOrderItemDO 字段	3 years ago
YunaiV	d10f49b6a7	promotion：优化价格计算的接口，增加 orderPrice 字段	3 years ago
YunaiV	e6acdf7098	将 market 模块，调整成 promotion 模块	3 years ago
YunaiV	e1d5cfe8fe	微调 trade 交易表的设计	3 years ago
YunaiV	356642ecea	review 商品的 save 界面	3 years ago
YunaiV	c00ded3ed3	优化商品的 index 界面	3 years ago
YunaiV	2bd2cb56a1	Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp ... Conflicts: yudao-module-mall/yudao-module-trade-biz/pom.xml	3 years ago
YunaiV	a13fb61359	优化 pom.xml 文件，减少无用的多租户引用	3 years ago
zhijiantianya@gmail.com	67436ea4c6	mall: 下单的代码 review	4 years ago
ex_yang.li@ca-nio.com	9cf470df94	创建交易订单-单元测试-冲突合并	4 years ago
ex_yang.li@ca-nio.com	f21ce954ec	Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into ly_uniapp ... # Conflicts: # yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/api/price/PriceApiImpl.java # yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/api/sku/ProductSkuApiImpl.java # yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/api/spu/ProductSpuApiImpl.java # yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/sku/ProductSkuConvert.java # yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/sku/ProductSkuMapper.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderItemConvert.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderServiceImpl.java # yudao-server/src/main/resources/application.yaml	4 years ago
ex_yang.li@ca-nio.com	5889093a64	创建交易订单-单元测试	4 years ago
YunaiV	15798cea10	mall：价格计算的 API 简单实现	4 years ago
YunaiV	67d365475c	🐛修复创建订单的流程，使用到 API Bean 未声明的报错	4 years ago
ex_yang.li@ca-nio.com	19a703b8c9	创建订单接口定义	4 years ago
YunaiV	96fc252348	mall：新增价格计算的接口	4 years ago
YunaiV	5948be86a8	mall：新增价格计算的接口	4 years ago
YunaiV	00863fdbac	mall：调整 trade 订单的设计	4 years ago
YunaiV	face9cae76	mall：调整 trade 的接口	4 years ago
YunaiV	cfde3dcacb	mall：优化订单表的设计	4 years ago
YunaiV	c612487198	mall：优化订单表的设计	4 years ago
YunaiV	fd4cf0c7f7	mall：优化订单表的设计	4 years ago
YunaiV	4ce76e82fc	mall：完善收件地址	4 years ago
YunaiV	96e2a27d07	mall：初始化 trade 表结构	4 years ago
YunaiV	2b71a1588c	mall：初始化 trade 交易模块	4 years ago