1024 Commits (5778e728279b74e4816e7d0883fedbc507cc1209)

Author	SHA1	Message	Date
YunaiV	b1ce971a2f	code review：解决分佣的 npe 问题	3 years ago
YunaiV	9cd36abf10	同步 master 分支代码	3 years ago
YunaiV	5913ee0706	Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product ... # Conflicts: # yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/jackson/config/YudaoJacksonAutoConfiguration.java # yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/ErrorCodeConstants.java # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/vo/activity/AppBargainActivityDetailRespVO.java # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/vo/activity/AppBargainActivityRespVO.java # yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/ErrorCodeConstants.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderSettlementReqVO.java # yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java # yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/enums/ErrorCodeConstants.java # yudao-server/src/main/resources/application-local.yaml	3 years ago
YunaiV	eeb8873b1d	trade：微调交易配置的注释	3 years ago
YunaiV	9e3564bd6a	code review：优惠劵逻辑	3 years ago
owen	b2c608e7a5	交易：发货订单日志	3 years ago
owen	565a8e0e6b	Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product	3 years ago
YunaiV	b9018baa03	trade：简化价格调整的逻辑	3 years ago
YunaiV	c5f2d07c87	商城：增加 stat 统计设计	3 years ago
YunaiV	26dfbfb2ac	trade：发货逻辑，增加订单日志	3 years ago
owen	be426235dd	Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product	3 years ago
owen	bc07e1dbf4	售后：重构售后更新订单的逻辑	3 years ago
owen	74ef98f8fc	售后：售后成功后，回滚 SKU 库存	3 years ago
owen	2766dd672a	优惠券：过期定时任务	3 years ago
owen	11ffa45b89	积分：Review代码修改	3 years ago
YunaiV	53bd1b9ec1	trade：订单评论超时时，自动评论	3 years ago
owen	cd2d0b7089	Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product	3 years ago
owen	77f7763560	优惠券：完善优惠券领取接口	3 years ago
YunaiV	cf41347cb3	trade：支付订单成功时，记录订单日志	3 years ago
owen	b1ac3a0b8b	优惠券：完善优惠券匹配接口	3 years ago
owen	f9aec7d8fd	优惠券：完善我的优惠券接口	3 years ago
YunaiV	debf568750	code review：增加取消售后的优化建议	3 years ago
owen	0a3a6825d5	优惠券：完善APP优惠券查询接口	3 years ago
YunaiV	ad535e674f	trade：积分相关的价格计算	3 years ago
YunaiV	a8c78f3097	trade：增加自动收货的 job	3 years ago
owen	a431bccc02	分销：Review代码修改	3 years ago
YunaiV	826d792ff2	trade：增加自动取消的 job	3 years ago
puhui999	bce96b29a6	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/convert/order/TradeOrderConvert.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/bo/TradePriceCalculateReqBO.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/bo/TradePriceCalculateRespBO.java	3 years ago
puhui999	42c47d9b44	秒回活动：订单金额计算初步设计	3 years ago
YunaiV	e384b810bf	code review：分销逻辑	3 years ago
owen	16af31d980	分销：@Select sql语句增加逻辑删除字段过滤	3 years ago
owen	3dca66eefa	分销：提现统计	3 years ago
owen	0b84c18736	分销：修正分享海报	3 years ago
owen	967e578d54	分销：重命名提现类型字段	3 years ago
owen	9856e17974	分销：根据商品，计算推广员可以得到的佣金	3 years ago
owen	e9fd377772	分销：Review代码修改	3 years ago
YunaiV	421bb7d154	code review：分销逻辑	3 years ago
owen	f7296d18b9	Merge remote-tracking branch 'origin/feature/mall_product' into brokerate ... # Conflicts: # yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/common/PromotionTypeEnum.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderDO.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderItemDO.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.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/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradePriceCalculatorHelper.java # yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/user/dto/MemberUserRespDTO.java	3 years ago
YunaiV	b4587fd79e	product：订单表，增加 vip 优惠字段	3 years ago
YunaiV	53e789dfdc	trade：订单表，增加 vip 优惠字段	3 years ago
YunaiV	aa5525d1f5	code review：营销活动 & 交易订单的对接	3 years ago
YunaiV	1da14a3f53	trade：删除订单的实现	3 years ago
YunaiV	a9485ad6bf	trade：取消订单、确认收货，增加订单日志	3 years ago
YunaiV	e9c9ac0cab	trade：确认收货时，增加订单日志	3 years ago
owen	052328c5fa	积分：完善积分获得、退还、使用 相关逻辑	3 years ago
YunaiV	71d6311bd4	code review：拼团、秒杀等逻辑	3 years ago
芋道源码	54fe0174bc	!625 完善订单和活动 review 提到的问题，完善 app 端获取拼团活动分页、列表、详情接口 ... Merge pull request !625 from puhui999/feature/mall_product	3 years ago
YunaiV	9451342aae	trade：营销商品（拼团、砍价）不能使用优惠劵	3 years ago
owen	dc46dff62c	Merge remote-tracking branch 'origin/feature/mall_product' into brokerate	3 years ago
owen	bbd18afbcc	分佣: 简化推广用户关系树查询方式	3 years ago
owen	6e6486ccae	Trade: 完善配置	3 years ago
owen	ad0513c87c	分佣: 推广人列表	3 years ago
YunaiV	7c4fbc63dc	trade：物流费用计算，增加金额 divide 分拆逻辑	3 years ago
owen	ee15b802b2	分佣: 推广人排行	3 years ago
owen	972b01c001	分佣: 佣金排行	3 years ago
owen	7a8a440eb6	分佣: 佣金记录	3 years ago
owen	eddc897cd8	分佣: 提现记录	3 years ago
owen	637ae8ce1d	分佣: 提现记录	3 years ago
owen	c146c98b72	分佣: 提现	3 years ago
owen	f72a087007	分佣: 我的推广统计接口	3 years ago
owen	a7de955926	trade: 分销业务 - 提现申请	3 years ago
owen	5ed99a9105	trade: 分销业务 - 整理包名	3 years ago
YunaiV	5949727c8d	trade：全局配送价格配置	3 years ago
puhui999	8060aeb5e7	秒杀: app 端返回增加秒杀活动状态	3 years ago
YunaiV	35569c5ec8	trade：下单时，如果是门店自提，增加核销码的生成	3 years ago
YunaiV	1b477aaa0d	trade：优化下单逻辑的实现	3 years ago
puhui999	583a0a2dd5	砍价+拼团: 修复 selectList limit 条件执行报错问题	3 years ago
puhui999	6ef94ade6a	完善订单和活动 review 提到的问题	3 years ago
puhui999	52848d6341	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/app/seckill/AppSeckillActivityController.java # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/bargain/BargainActivityService.java	3 years ago
puhui999	1d2a6ad065	拼团活动: 完善 app 端获取活动分页、列表、详情接口	3 years ago
YunaiV	c766f7daa5	code review：砍价、秒杀的逻辑	3 years ago
YunaiV	2278ad4652	Merge branch 'feature/mall_product' of https://gitee.com/puhui999/ruoyi-vue-pro into feature/mall_product ... Conflicts: yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java	3 years ago
YunaiV	962f2bbf69	code review：提现逻辑	3 years ago
芋道源码	de7699d972	!624 trade: 分销业务 - 佣金提现 ... Merge pull request !624 from 疯狂的世界/brokerate	3 years ago
owen	e22c577f7a	trade: 分销业务 - 佣金提现后台管理	3 years ago
YunaiV	8cfb738db3	code review：分销逻辑	3 years ago
owen	32e1fc66ce	trade: 分销业务 - 佣金提现后台管理	3 years ago
puhui999	04a391cd4b	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/combination/CombinationActivityApiImpl.java	3 years ago
puhui999	408df683d8	秒杀活动: 完善 app 端获取活动分页、列表、详情接口	3 years ago
owen	a3e161a9a3	trade: 分销业务review代码修改	3 years ago
owen	a3e8b42be6	trade: 分销业务review代码修改	3 years ago
puhui999	af6016bba5	砍价活动: 完善 app 端获取活动分页、列表、详情接口	3 years ago
jason	ebd4ea548c	Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product ... # Conflicts: # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/api/combination/CombinationApiImpl.java	3 years ago
jason	0e1b8126dd	新增钱包充值。启动报错修复	3 years ago
YunaiV	1b9a3f9f63	code review：调整操作日志的封装	3 years ago
puhui999	a10d77cdfe	mall+order: 完善部分 TODO 提到的问题	3 years ago
xingyu	437131cc7a	Merge remote-tracking branch 'origin/master' into feature/auth ... # Conflicts: # yudao-dependencies/pom.xml	3 years ago
YunaiV	9358639c41	code review：订单部分逻辑	3 years ago
YunaiV	e8bdd8349c	code review：订单部分逻辑	3 years ago
YunaiV	bdd81e4cbc	Merge branch 'feature/mall_product' of https://gitee.com/puhui999/ruoyi-vue-pro into feature/mall_product ... Conflicts: yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java	3 years ago
YunaiV	82c6354e1d	code review：分销逻辑	3 years ago
puhui999	254d7828aa	mall+order: 订单活动特殊逻辑的抽离	3 years ago
YunaiV	8b50cd9661	Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro ... Conflicts: yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/ErrorCodeConstants.java yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/combination/AppCombinationRecordController.java yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/ErrorCodeConstants.java yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/enums/ErrorCodeConstants.java	3 years ago
xingyu	5e9e41c045	fix: required 过期	3 years ago
owen	77daa0085e	trade: 分销业务review代码修改	3 years ago
puhui999	7fb455096c	商城活动: 完善活动商品并发库存扣减逻辑	3 years ago
owen	cddeb37289	Merge remote-tracking branch 'origin/feature/mall_product' into brokerate ... # Conflicts: # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/brokerage/record/BrokerageRecordConvert.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/brokerage/user/BrokerageUserConvert.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/record/BrokerageRecordServiceImpl.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/user/BrokerageUserServiceImpl.java	3 years ago
owen	290d1671a2	trade: 分销业务后台功能：推广订单列表	3 years ago
owen	6c193f723f	trade: 分销业务后台功能：推广订单列表	3 years ago
puhui999	3976011af0	Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product	3 years ago
owen	499a054eb9	trade: 分销业务后台功能：推广用户列表	3 years ago
puhui999	57f0ea04f7	mall-order: 完善活动商品库存扣减逻辑（并发更新库存下一提交实现）	3 years ago
puhui999	c023209aa5	订单管理：完善订单调价分摊逻辑	3 years ago
puhui999	51dab96889	支付订单错误码枚举类变量添加 PAY_ 前缀和交易订单区分开避免冲突	3 years ago
puhui999	50354462fe	spu：分佣属性和分佣保持一致	3 years ago
puhui999	95d8be0455	订单管理：完善订单聚合搜索	3 years ago
YunaiV	4265441e1d	分销：增加商品的分佣金额计算 api mock	3 years ago
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
芋道源码	fcf8ec98a0	!608 Date转localDateTime ... Merge pull request !608 from GamePlayer-Joker/master	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
dhb52	d7488e70b0	使用下划线分割ErrorCodeConstants的ErrorCode	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
GamePlayer-Joker	1bf182c341	补充 ... Signed-off-by: GamePlayer-Joker <13317488+gameplayer-joker@user.noreply.gitee.com>	3 years ago
GamePlayer-Joker	76a8fb8a0a	AppCombinationRecordRespVO中的expireTime过期时间是LocalDateTime, 现在用的是new Date()	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
芋道源码	a58d7d63ed	!606 会员：分销佣金计算 ... Merge pull request !606 from 疯狂的世界/brokerage	3 years ago
owen	c7ef8519c8	member: 分销增加佣金	3 years ago
YunaiV	6a819da0b6	分佣：增加用户分销统计 API mock	3 years ago
YunaiV	482a84a6f1	603 mall: 优惠券退还优化	3 years ago
芋道源码	670f2ef5da	!603 mall: 优惠券退还优化 ... Merge pull request !603 from 疯狂的世界/mall_order_cancel	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
owen	11ad7ad5e4	mall: 优惠券退还优化	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
YunaiV	68c1113ed1	code review：优惠劵发放	3 years ago
YunaiV	a6ec3fefcf	code review：优惠劵发放	3 years ago
owen	3fbce643ee	mall: 发送优惠券功能优化	3 years ago
YunaiV	76f510f247	code review：优惠劵发放	3 years ago
owen	b3fcefa677	trade: 会员取消订单	3 years ago
芋道源码	af0771a175	!597 优惠券 ... Merge pull request !597 from 疯狂的世界/owen_dev	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	e26814be31	Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product	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	f28b960319	调整最新图片 url	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	530ec7ab24	mall: 完善后台发送优惠券	3 years ago
YunaiV	f5c5d38303	code review：商品评论	3 years ago
owen	1e2c83d90f	mall: 商品评论表增加冗余 SKU 的图片地址, 规格	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
owen	2132de9dd1	商品：完善后台商品评论功能	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	c3de25e760	营销： ... 1. 调整店铺装修接口	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	5c2723c7bf	fix: 修复合并差异	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	e2a8f7b389	fix: 完善订单发货逻辑、重构砍价活动、完善拼团记录创建逻辑	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
YunaiV	e159b2e500	code review：砍价的代码	3 years ago
YunaiV	ba31d5f6fb	优化拼团活动的管理后台代码	3 years ago
YunaiV	6fdd4da0b3	优化秒杀活动的管理后台代码	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	f5079b1c57	feat: 添加砍价活动相关 DO	3 years ago
puhui999	d156d43d63	fix：完善 review 拼团、秒杀活动的实现提到的问题	3 years ago
wcz	a6ffb5d650	BaseMapperX.java少了几个方法，TradeCartMapper.java方法调整，BpmProcessInstanceServiceImpl.java多了	3 years ago
puhui999	446951bd11	fix：封装函数 convertCDUMap 作用：数据划分为需要新增的、还是删除的、还是更新的。	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	147cd271b8	fix：完善拼团活动列表展示	3 years ago
puhui999	7cdb321fe4	fix：完善拼团活动CRUD	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
puhui999	b697ee3298	Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product ... # Conflicts: # yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderServiceTest.java	3 years ago
puhui999	b78f814552	fix：mall promotion SeckillActivity	3 years ago
puhui999	78b3d2a20f	fix：mall promotion Combination	3 years ago
YunaiV	20eb0a2a88	mall + pay： ... 1、调整 returnUrl 的实现	3 years ago
puhui999	41d996f7f3	feat：mall promotion CombinationProduct	3 years ago
puhui999	c563051841	feat：mall product 新增通过 spuIds 获取相关 spu 详情列表的接口	3 years ago
puhui999	409ec555e8	feat：mall CombinationActivity	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	5ffea93731	mall + product： ... 1、完善商品评论列表的 mock	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	bb0bb2a4fa	mall + promotion：商品列表	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	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
芋道源码	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
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
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
chenchen	7d0e9ea762	fix 依赖启动问题	3 years ago
YunaiV	60b24e36d5	code review：售后日志逻辑	3 years ago
puhui999	1871a01944	fix：seckill：调整相关类属性和表字段对齐	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
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	0d47d6cead	mall + trade：code review 快递客户端的实现，没啥问题咧，搞下单测就 ok 拉	3 years ago
YunaiV	59d5fef592	mall + trade：优化运费模版的代码	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
jason	1662d17fc9	快递客户端 review 修改	3 years ago
jason	e69e6d880b	快递价格计算 review 修改	3 years ago
puhui999	217a31a123	Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product	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	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	9ff873fe53	fix：完善商品评论测试 sql	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
YunaiV	0c283ded5d	Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product	3 years ago
YunaiV	b6c7a940be	mall + promotion：增加秒杀活动的 mock 接口	3 years ago
jason	644d976a78	快递100 快递查询实现	3 years ago
jason	45e5578cb4	快递查询、 通过快递鸟查询实现	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
YunaiV	66210e5ee2	Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product	3 years ago
YunaiV	bb8e44a268	mall + product：增加评论 mock 逻辑	3 years ago
jason	dde89d51d5	物流运费计算 review 修改 + 单元测试	3 years ago
YunaiV	1e1a22c256	mall + product：评论的 review	3 years ago
YunaiV	84b365a707	mall + product：简化收藏逻辑，去掉 type 字段	3 years ago
YunaiV	25bea4920c	mall + trade：review 物流计算	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	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
puhui999	8d2bcc57aa	fix: 完善商品管理	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
puhui999	fcaa92d406	Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product	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
puhui999	b065a2a741	fix:修复商品 review 提到的问题	3 years ago
YunaiV	53e9be733f	mall：review + mall：快递公司管理	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	3672c217f8	mall：售后分页接口的 mock	3 years ago
芋道源码	7bfb426a9d	!484 bugfix: 解决不同模块错误码区间冲突、部分错误码重复错误 ... Merge pull request !484 from Rundeepin/feature/mall_product	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
崔家辉	fbeaa06100	bugfix: 解决不同模块错误码区间冲突、部分错误码重复错误	3 years ago
jason	3da2eb89b2	新增快递公司功能	3 years ago
YunaiV	f129eab36f	REVIEW 物流配送管理表	3 years ago
YunaiV	db73ddc942	REVIEW 物流配送管理表	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