30 Commits (552e9969ccf5fa33dadcce388a98e30defd5b3da)

Author SHA1 Message Date
YunaiV 102d56ff7d 修复单测报错的问题 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
halfninety abbb076859 完成秒杀时段,秒杀活动相关todo 4 years ago
halfninety fc3245a06b 修改秒杀相关文件地址 4 years ago
halfninety 54baad165d 秒杀时段新增修改时间段冲突校验。
秒杀活动新增,修改,删除时对秒杀时段的秒杀活动数量进行修改
4 years ago
halfninety 7bc1ae5f35 秒杀活动增删改查 4 years ago
halfninety cd62c4d220 秒杀时段相关 4 years ago
halfninety 83ee1c6129 秒杀活动,添加商品,分页查询 4 years ago
xingyu 0d0f64e30a feat: 删除过期方法 4 years ago
YunaiV 38f67d4130 将 mall 使用到 Date 的部分,迁移到 LocalDateTime 中 4 years ago
YunaiV 12d045ea58 修复部分单元测试报错的问题 4 years ago
YunaiV d7a1c8f7ca promotion:增加获得优惠劵匹配结果的列表的单元测试 4 years ago
YunaiV d10f49b6a7 promotion:优化价格计算的接口,增加 orderPrice 字段 4 years ago
YunaiV 636cc794dd promotion:完善价格计算,重新接入限时折扣的多种优惠方式 4 years ago
YunaiV c87bc084e6 promotion:RewardActivityServiceImpl 的 getMatchRewardActivities 逻辑 4 years ago
YunaiV 941782fb10 promotion:完善限时折扣的修改逻辑 4 years ago
YunaiV 544597d6e2 promotion:完善限时折扣,补充相关的单元测试 4 years ago
YunaiV d4b7f4aaa0 promotion:增加限时折扣的基础代码 4 years ago
YunaiV 00f90e75d9 promotion:增加满减送活动的关闭功能 4 years ago
YunaiV 79304b3a73 promotion:增加满减送活动的排重校验、单元测试 4 years ago
YunaiV 0e5b7734ac promotion:增加满减送活动的后端 20% 4 years ago
YunaiV 47c2dfa623 promotion:增加优惠劵的前端分页界面 100% 4 years ago
YunaiV a89d5a83db promotion:增加优惠劵的后端分页接口 4 years ago
YunaiV 2c39405bce promotion:完善的优惠卷的实体 4 years ago
YunaiV 8ae8a4a652 promotion:完善优惠劵模板的单元测试、禁用功能 4 years ago
YunaiV dc51a93533 promotion:实现部分优惠劵模板的前端列表 4 years ago
YunaiV 979ba0f916 promotion:实现优惠劵模板的逻辑 4 years ago
YunaiV 035c2cf28c promotion:完善 优惠劵模板 表~ 4 years ago
YunaiV e6acdf7098 将 market 模块,调整成 promotion 模块 4 years ago