YunaiV
|
a83b8e8fbc
|
修复报错的单元测试
|
2022-12-30 00:27:14 +08:00 |
|
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
|
2022-12-23 19:12:45 +08:00 |
|
xingyu
|
cacefb4eea
|
feat: knife4j springdoc
|
2022-12-22 00:25:22 +08:00 |
|
芋道源码
|
f9b4874ee9
|
!320 秒杀活动相关
Merge pull request !320 from halfninety/feature/1.8.0-uniapp
|
2022-12-13 02:04:54 +00:00 |
|
xingyu4j
|
9fc6e0f00b
|
refactor: springdoc 替换 springfox
|
2022-12-09 13:43:15 +08:00 |
|
YunaiV
|
fac3e7c726
|
product：商品规格，调整成商品属性，避免和 sku 概念冲突
|
2022-12-08 21:12:35 +08:00 |
|
halfninety
|
9384ba0d52
|
秒杀相关VO添加example
|
2022-12-03 16:45:22 +08:00 |
|
halfninety
|
6808d3c163
|
完成秒杀时段todo，秒杀时段商品添加timeIds
|
2022-12-03 15:46:26 +08:00 |
|
halfninety
|
abbb076859
|
完成秒杀时段，秒杀活动相关todo
|
2022-12-02 22:33:07 +08:00 |
|
YunaiV
|
0b9ddddd18
|
promotion：code review 秒杀的代码
|
2022-11-30 19:59:38 +08:00 |
|
halfninety
|
fc3245a06b
|
修改秒杀相关文件地址
|
2022-11-29 23:25:00 +08:00 |
|
halfninety
|
54baad165d
|
秒杀时段新增修改时间段冲突校验。
秒杀活动新增，修改，删除时对秒杀时段的秒杀活动数量进行修改
|
2022-11-29 23:25:00 +08:00 |
|
halfninety
|
7bc1ae5f35
|
秒杀活动增删改查
|
2022-11-29 23:25:00 +08:00 |
|
halfninety
|
cd62c4d220
|
秒杀时段相关
|
2022-11-29 23:25:00 +08:00 |
|
halfninety
|
ea2a57f0a0
|
修改秒杀时段id
|
2022-11-29 23:24:59 +08:00 |
|
halfninety
|
83ee1c6129
|
秒杀活动，添加商品，分页查询
|
2022-11-29 23:24:59 +08:00 |
|
xingyu
|
0d0f64e30a
|
feat: 删除过期方法
|
2022-11-23 22:54:44 +08:00 |
|
YunaiV
|
d884303df6
|
trade：【交易售后】查询分页列表
|
2022-11-20 09:35:06 +08:00 |
|
YunaiV
|
38f67d4130
|
将 mall 使用到 Date 的部分，迁移到 LocalDateTime 中
|
2022-11-13 21:23:38 +08:00 |
|
YunaiV
|
12d045ea58
|
修复部分单元测试报错的问题
|
2022-11-13 21:08:15 +08:00 |
|
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
|
2022-11-13 12:07:59 +08:00 |
|
YunaiV
|
16f5d0f5a4
|
trade：增加优惠劵使用、商品库存的扣减
|
2022-11-09 23:56:00 +08:00 |
|
YunaiV
|
01d10b518c
|
trade：优化创建订单接口的后端实现
|
2022-11-08 22:50:03 +08:00 |
|
YunaiV
|
d7a1c8f7ca
|
promotion：增加获得优惠劵匹配结果的列表的单元测试
|
2022-11-08 19:32:49 +08:00 |
|
YunaiV
|
edc5d0f1d0
|
promotion：增加获得优惠劵匹配结果的列表
|
2022-11-08 00:40:53 +08:00 |
|
YunaiV
|
d10f49b6a7
|
promotion：优化价格计算的接口，增加 orderPrice 字段
|
2022-11-06 22:25:02 +08:00 |
|
YunaiV
|
636cc794dd
|
promotion：完善价格计算，重新接入限时折扣的多种优惠方式
|
2022-11-06 18:41:27 +08:00 |
|
YunaiV
|
c87bc084e6
|
promotion：RewardActivityServiceImpl 的 getMatchRewardActivities 逻辑
|
2022-11-06 16:36:14 +08:00 |
|
YunaiV
|
941782fb10
|
promotion：完善限时折扣的修改逻辑
|
2022-11-06 12:38:13 +08:00 |
|
YunaiV
|
6d48bd1ed8
|
promotion：完善限时折扣的添加逻辑
|
2022-11-06 00:48:07 +08:00 |
|
YunaiV
|
544597d6e2
|
promotion：完善限时折扣，补充相关的单元测试
|
2022-11-05 19:57:50 +08:00 |
|
YunaiV
|
d4b7f4aaa0
|
promotion：增加限时折扣的基础代码
|
2022-11-05 19:13:43 +08:00 |
|
YunaiV
|
00f90e75d9
|
promotion：增加满减送活动的关闭功能
|
2022-11-05 10:52:09 +08:00 |
|
YunaiV
|
79304b3a73
|
promotion：增加满减送活动的排重校验、单元测试
|
2022-11-05 09:57:45 +08:00 |
|
YunaiV
|
0e5b7734ac
|
promotion：增加满减送活动的后端 20%
|
2022-11-04 23:19:28 +08:00 |
|
YunaiV
|
873b530652
|
promotion：增加优惠劵的回收操作
|
2022-11-04 21:17:37 +08:00 |
|
YunaiV
|
47c2dfa623
|
promotion：增加优惠劵的前端分页界面 100%
|
2022-11-04 19:17:17 +08:00 |
|
YunaiV
|
a89d5a83db
|
promotion：增加优惠劵的后端分页接口
|
2022-11-03 22:40:19 +08:00 |
|
YunaiV
|
2c39405bce
|
promotion：完善的优惠卷的实体
|
2022-11-03 00:05:13 +08:00 |
|
YunaiV
|
8ae8a4a652
|
promotion：完善优惠劵模板的单元测试、禁用功能
|
2022-11-02 22:44:37 +08:00 |
|
YunaiV
|
bd661296c0
|
promotion：完善优惠劵模板的功能
|
2022-11-02 22:19:33 +08:00 |
|
YunaiV
|
dc51a93533
|
promotion：实现部分优惠劵模板的前端列表
|
2022-11-01 22:31:07 +08:00 |
|
YunaiV
|
3c10058dbd
|
promotion：实现部分优惠劵模板的前端逻辑
|
2022-11-01 00:37:07 +08:00 |
|
YunaiV
|
979ba0f916
|
promotion：实现优惠劵模板的逻辑
|
2022-10-31 23:47:06 +08:00 |
|
YunaiV
|
035c2cf28c
|
promotion：完善 优惠劵模板 表~
|
2022-10-31 21:19:18 +08:00 |
|
YunaiV
|
e6acdf7098
|
将 market 模块，调整成 promotion 模块
|
2022-10-30 17:37:07 +08:00 |
|