364 Commits (f1dd991cdef6d3a20821551cff1ed3e78e86f82a)

Author	SHA1	Message	Date
YunaiV	16e436a0f5	promotion：增加助力砍价的接口	2 years ago
YunaiV	cc087e4eca	promotion：增加创建砍价的接口	2 years ago
YunaiV	6f39b2c030	trade：1、重构 order handler 的参数；2、增加砍价商品的价格计算	2 years ago
YunaiV	8dbabb9efc	trade：1、重构 order handler 的参数；2、增加砍价商品的价格计算	2 years ago
YunaiV	dc1347184f	code review：拼团、砍价活动	3 years ago
YunaiV	20f5834d9a	trade：价格计算时，接入优惠劵逻辑	3 years ago
YunaiV	a1e9bedf34	promotion：完善秒杀的 uniapp 接口	3 years ago
YunaiV	ac55a9657c	promotion：完善秒杀模块	3 years ago
owen	7fdd36d979	Review代码修改	3 years ago
YunaiV	d4417d2474	code review：积分、优惠劵、佣金等逻辑	3 years ago
YunaiV	057952bdeb	Merge branch 'feature/mall_product' of https://gitee.com/CrazyWorld/ruoyi-vue-pro into feature/mall_product ... # Conflicts: # yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/date/LocalDateTimeUtils.java	3 years ago
owen	a04a3a27a9	Review代码修改	3 years ago
puhui999	82210a9583	订单：完善拼团活动	3 years ago
owen	d2c5eaf916	优惠券：重构是否领取检查方式	3 years ago
owen	d0d21b2787	优惠券：新增/修改时，校验对应的商品、分类是否存在	3 years ago
owen	fc432ba073	优惠券：新人券使用 MQ 发放	3 years ago
puhui999	597eacaaeb	Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product ... # Conflicts: # yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/ErrorCodeConstants.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java	3 years ago
puhui999	0b35d4a7e3	订单：完善拼团活动部分 TODO	3 years ago
owen	6b7f071988	Review代码修改	3 years ago
YunaiV	9ee0aebd3f	promotion：增加 coupon 的 code review	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	9e3564bd6a	code review：优惠劵逻辑	3 years ago
owen	2766dd672a	优惠券：过期定时任务	3 years ago
owen	77f7763560	优惠券：完善优惠券领取接口	3 years ago
owen	b1ac3a0b8b	优惠券：完善优惠券匹配接口	3 years ago
owen	f9aec7d8fd	优惠券：完善我的优惠券接口	3 years ago
owen	0a3a6825d5	优惠券：完善APP优惠券查询接口	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	aa5525d1f5	code review：营销活动 & 交易订单的对接	3 years ago
YunaiV	71d6311bd4	code review：拼团、秒杀等逻辑	3 years ago
puhui999	8060aeb5e7	秒杀: app 端返回增加秒杀活动状态	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
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
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	e8bdd8349c	code review：订单部分逻辑	3 years ago
puhui999	254d7828aa	mall+order: 订单活动特殊逻辑的抽离	3 years ago
xingyu	5e9e41c045	fix: required 过期	3 years ago
puhui999	7fb455096c	商城活动: 完善活动商品并发库存扣减逻辑	3 years ago
puhui999	57f0ea04f7	mall-order: 完善活动商品库存扣减逻辑（并发更新库存下一提交实现）	3 years ago
YunaiV	87c55784c4	code review：营销活动+订单	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
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
puhui999	2591ab5d36	订单中心+营销活动：完善部分 TODO 提到的问题	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	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	d982a95fdd	Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro	3 years ago
YunaiV	f28b960319	调整最新图片 url	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
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	5dd6e5bee8	营销： ... 1. 售后订单，增加对 afterSaleId 的更新	3 years ago
YunaiV	c3de25e760	营销： ... 1. 调整店铺装修接口	3 years ago
YunaiV	159c74ce15	订单： ... 1. review 发货 2. review 拼团逻辑	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	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	f5079b1c57	feat: 添加砍价活动相关 DO	3 years ago
puhui999	d156d43d63	fix：完善 review 拼团、秒杀活动的实现提到的问题	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	259807600a	feat：拼团订单集成	3 years ago
puhui999	147cd271b8	fix：完善拼团活动列表展示	3 years ago
puhui999	7cdb321fe4	fix：完善拼团活动CRUD	3 years ago
puhui999	e7d8643665	fix：修复 mall review @puhui999	3 years ago
puhui999	b78f814552	fix：mall promotion SeckillActivity	3 years ago
puhui999	78b3d2a20f	fix：mall promotion Combination	3 years ago
puhui999	41d996f7f3	feat：mall promotion CombinationProduct	3 years ago
puhui999	409ec555e8	feat：mall CombinationActivity	3 years ago
YunaiV	ef656cf762	mall + promotion： ... 1、增加获得符合条件的优惠劵	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	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	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
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
puhui999	1871a01944	fix：seckill：调整相关类属性和表字段对齐	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	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
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	573ad59edc	Merge remote-tracking branch 'origin/master' into feature/mall_product ... # Conflicts: # yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/string/StrUtils.java # yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/vo/ProductBrandBaseVO.java # yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/ProductCategoryBaseVO.java # yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuBaseVO.java # yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuBaseVO.java # yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuRespVO.java # yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuSimpleRespVO.java # yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppProductSpuDetailRespVO.java # yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppProductSpuPageItemRespVO.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderBaseVO.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderItemBaseVO.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/base/sku/AppProductSkuBaseRespVO.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppTradeCartDetailRespVO.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppTradeCartItemUpdateSelectedReqVO.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppTradeCartResetReqVO.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderCreateReqVO.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderDetailRespVO.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderGetCreateInfoRespVO.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderPageItemRespVO.java # yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/address/vo/AppAddressBaseVO.java	3 years ago
YunaiV	b6c7a940be	mall + promotion：增加秒杀活动的 mock 接口	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
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	73a781cbbe	mall + trade：增加 TradeRewardActivityPriceCalculatorTest 的单元测试	3 years ago
YunaiV	0d08c814ec	mall + trade：增加 TradeDiscountActivityPriceCalculator 的单元测试	3 years ago
YunaiV	1452f6b231	mall + trade：增肌爱 TradeCouponPriceCalculator 的单元测试	3 years ago
YunaiV	2a9a869e01	mall + trade：获得订单结算信息，接入支付接口	3 years ago
YunaiV	5de8fa2e42	mall + trade：解决报错问题	3 years ago
puhui999	35daee84e7	fix: 解决合并代码后项目运行失败的问题，相关问题已标注 TODO	3 years ago
YunaiV	0631c51d93	mall + trade：review 配置管理列表	3 years ago
YunaiV	02fa6fc5c6	mall + trade：调整价格字段，更易懂	3 years ago
YunaiV	7fef594390	订单接口的梳理	3 years ago
xingyu	0b3640a522	fix: required = true ==> requiredMode = Schema.RequiredMode.REQUIRED	3 years ago
YunaiV	102d56ff7d	修复单测报错的问题	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
YunaiV	92632c046c	Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp ... # Conflicts: # yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/jackson/config/YudaoJacksonAutoConfiguration.java # yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/notify/PayNotifyServiceImpl.java # yudao-ui-admin/src/views/mall/trade/order/index.vue	3 years ago
xingyu	cacefb4eea	feat: knife4j springdoc	3 years ago
芋道源码	f9b4874ee9	!320 秒杀活动相关 ... Merge pull request !320 from halfninety/feature/1.8.0-uniapp	3 years ago
xingyu4j	9fc6e0f00b	refactor: springdoc 替换 springfox	3 years ago
YunaiV	fac3e7c726	product：商品规格，调整成商品属性，避免和 sku 概念冲突	3 years ago
halfninety	9384ba0d52	秒杀相关VO添加example	3 years ago
halfninety	6808d3c163	完成秒杀时段todo，秒杀时段商品添加timeIds	3 years ago
halfninety	abbb076859	完成秒杀时段，秒杀活动相关todo	3 years ago
YunaiV	0b9ddddd18	promotion：code review 秒杀的代码	3 years ago
halfninety	fc3245a06b	修改秒杀相关文件地址	3 years ago
halfninety	54baad165d	秒杀时段新增修改时间段冲突校验。 ... 秒杀活动新增，修改，删除时对秒杀时段的秒杀活动数量进行修改	3 years ago
halfninety	7bc1ae5f35	秒杀活动增删改查	3 years ago
halfninety	cd62c4d220	秒杀时段相关	3 years ago
halfninety	ea2a57f0a0	修改秒杀时段id	3 years ago
halfninety	83ee1c6129	秒杀活动，添加商品，分页查询	3 years ago
xingyu	0d0f64e30a	feat: 删除过期方法	3 years ago
YunaiV	d884303df6	trade：【交易售后】查询分页列表	3 years ago
YunaiV	38f67d4130	将 mall 使用到 Date 的部分，迁移到 LocalDateTime 中	3 years ago
YunaiV	12d045ea58	修复部分单元测试报错的问题	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	16f5d0f5a4	trade：增加优惠劵使用、商品库存的扣减	3 years ago
YunaiV	01d10b518c	trade：优化创建订单接口的后端实现	3 years ago
YunaiV	d7a1c8f7ca	promotion：增加获得优惠劵匹配结果的列表的单元测试	3 years ago
YunaiV	edc5d0f1d0	promotion：增加获得优惠劵匹配结果的列表	3 years ago
YunaiV	d10f49b6a7	promotion：优化价格计算的接口，增加 orderPrice 字段	3 years ago
YunaiV	636cc794dd	promotion：完善价格计算，重新接入限时折扣的多种优惠方式	3 years ago
YunaiV	c87bc084e6	promotion：RewardActivityServiceImpl 的 getMatchRewardActivities 逻辑	3 years ago
YunaiV	941782fb10	promotion：完善限时折扣的修改逻辑	3 years ago
YunaiV	6d48bd1ed8	promotion：完善限时折扣的添加逻辑	3 years ago
YunaiV	544597d6e2	promotion：完善限时折扣，补充相关的单元测试	3 years ago
YunaiV	d4b7f4aaa0	promotion：增加限时折扣的基础代码	3 years ago