zhijiantianya@gmail.com
|
ba59ec85e0
|
code review 各种活动
|
2023-08-07 19:30:26 +08:00 |
|
puhui999
|
384359c9d4
|
fix: 完善拼团、秒杀、砍价活动管理
|
2023-08-06 20:21:53 +08:00 |
|
puhui999
|
5f9184904a
|
fix: 完善拼团、秒杀、砍价活动管理
|
2023-08-06 17:46:16 +08:00 |
|
YunaiV
|
5e2fa48f20
|
code review：拼团、秒杀活动的代码
|
2023-08-05 20:51:48 +08:00 |
|
puhui999
|
f5079b1c57
|
feat: 添加砍价活动相关 DO
|
2023-07-31 18:36:21 +08:00 |
|
puhui999
|
d156d43d63
|
fix：完善 review 拼团、秒杀活动的实现提到的问题
|
2023-07-31 18:34:56 +08:00 |
|
puhui999
|
446951bd11
|
fix：封装函数 convertCDUMap 作用：数据划分为需要新增的、还是删除的、还是更新的。
|
2023-07-28 16:30:38 +08:00 |
|
YunaiV
|
b84f7825c5
|
review 拼团、秒杀活动的实现
|
2023-07-26 19:09:47 +08:00 |
|
puhui999
|
7957cfa50d
|
fix：优化拼团与订单集成逻辑
|
2023-07-24 17:29:51 +08:00 |
|
puhui999
|
8d13ecc9c8
|
fix：优化订单发货逻辑使其支持一单分发
|
2023-07-24 15:14:16 +08:00 |
|
puhui999
|
259807600a
|
feat：拼团订单集成
|
2023-07-21 16:47:04 +08:00 |
|
puhui999
|
147cd271b8
|
fix：完善拼团活动列表展示
|
2023-07-14 17:34:37 +08:00 |
|
puhui999
|
7cdb321fe4
|
fix：完善拼团活动CRUD
|
2023-07-14 17:08:37 +08:00 |
|
puhui999
|
e7d8643665
|
fix：修复 mall review @puhui999
|
2023-07-10 16:35:49 +08:00 |
|
puhui999
|
b78f814552
|
fix：mall promotion SeckillActivity
|
2023-07-05 22:05:05 +08:00 |
|
puhui999
|
78b3d2a20f
|
fix：mall promotion Combination
|
2023-07-05 11:31:16 +08:00 |
|
puhui999
|
41d996f7f3
|
feat：mall promotion CombinationProduct
|
2023-07-04 11:21:03 +08:00 |
|
puhui999
|
409ec555e8
|
feat：mall CombinationActivity
|
2023-07-03 08:07:05 +08:00 |
|
YunaiV
|
ef656cf762
|
mall + promotion：
1、增加获得符合条件的优惠劵
|
2023-06-29 20:20:00 +08:00 |
|
YunaiV
|
846405d8b1
|
mall + promotion：
1、增加 article mock 接口
|
2023-06-27 22:44:38 +08:00 |
|
YunaiV
|
7036a6652c
|
mall + member：
1、调整收获地址的返回
|
2023-06-26 20:07:46 +08:00 |
|
YunaiV
|
5c9a99c83e
|
mall + promotion：
1、mock 优惠劵模版分页
2、mock 批量删除收藏
|
2023-06-25 17:40:04 +08:00 |
|
YunaiV
|
4a3703e302
|
mall + promotion：review 页面装修
|
2023-06-25 11:24:55 +08:00 |
|
jason
|
050f0bb6a2
|
页面装修 review 修改
|
2023-06-24 21:09:49 +08:00 |
|
YunaiV
|
b582206003
|
mall + promotion：review 页面装修
|
2023-06-24 12:54:59 +08:00 |
|
jason
|
ad1f656dfa
|
页面装修修改,后端只负责存取
|
2023-06-24 00:11:04 +08:00 |
|
YunaiV
|
2efdbf93cb
|
mall + promotion：review 秒杀、评论代码
|
2023-06-23 21:14:36 +08:00 |
|
芋道源码
|
b16632ea41
|
!522 mall seckill
Merge pull request !522 from puhui999/feature/mall_product
|
2023-06-23 06:04:47 +00:00 |
|
jason
|
6b1d996b66
|
页面装修数据结构定义
|
2023-06-23 10:53:29 +08:00 |
|
puhui999
|
26f563df57
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
|
2023-06-23 00:57:49 +08:00 |
|
puhui999
|
ab30ff6480
|
fix：完善 mall seckill 相关 ②
|
2023-06-23 00:57:27 +08:00 |
|
YunaiV
|
b0fcd96dfe
|
mall + promotion：增加砍价记录的 mock
|
2023-06-23 00:26:04 +08:00 |
|
YunaiV
|
f5b2bb4d7d
|
mall + promotion：增加砍价记录的 mock
|
2023-06-22 23:06:16 +08:00 |
|
YunaiV
|
c33bd38b5d
|
mall + promotion：增加砍价记录的 mock
|
2023-06-21 23:45:59 +08:00 |
|
puhui999
|
b44ad3a0f7
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
|
2023-06-21 08:42:36 +08:00 |
|
puhui999
|
666925da6e
|
fix：mall vo @Schema required = true => requiredMode = Schema.RequiredMode.REQUIRED
|
2023-06-21 08:41:45 +08:00 |
|
YunaiV
|
772a982b5f
|
mall + promotion：增加拼团记录的 mock
|
2023-06-21 00:29:50 +08:00 |
|
puhui999
|
700d95a43d
|
fix：完善商品评论 review 提到的问题
|
2023-06-20 18:12:39 +08:00 |
|
puhui999
|
8dfb298376
|
fix：完善 mall seckill 相关 ①
|
2023-06-20 09:08:15 +08:00 |
|
puhui999
|
9517ffdfb8
|
fix：修复 mall product promotion 测试 sql
|
2023-06-20 09:06:32 +08:00 |
|
YunaiV
|
bf7f68a04b
|
mall + promotion：增加拼团的 mock 返回
|
2023-06-19 23:35:28 +08:00 |
|
YunaiV
|
8a7f7fd641
|
mall + promotion：增加拼团的 mock 返回
|
2023-06-19 20:35:43 +08:00 |
|
puhui999
|
331be53b8b
|
fix：完善时段配置管理
|
2023-06-19 08:58:11 +08:00 |
|
puhui999
|
49d726019a
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
|
2023-06-19 08:33:48 +08:00 |
|
YunaiV
|
fc570b6062
|
mall + promotion：完善秒杀活动的 mock 返回
|
2023-06-18 21:23:50 +08:00 |
|
YunaiV
|
d795dbc7ac
|
mall + promotion：优化限购、库存的返回结果
|
2023-06-18 20:15:34 +08:00 |
|
puhui999
|
cd4940d710
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
|
2023-06-18 13:17:36 +08:00 |
|
YunaiV
|
a93acd2a74
|
mall + promotion：mock 秒杀列表
|
2023-06-18 02:05:10 +08:00 |
|
YunaiV
|
6573849f56
|
mall + promotion：mock 拼团列表
|
2023-06-18 00:35:22 +08:00 |
|
puhui999
|
1871a01944
|
fix：seckill：调整相关类属性和表字段对齐
|
2023-06-17 22:14:23 +08:00 |
|
puhui999
|
16f2a5b91a
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
|
2023-06-17 21:19:02 +08:00 |
|
puhui999
|
32cca12cd2
|
fix：seckillTime => seckillConfig
|
2023-06-17 21:17:02 +08:00 |
|
YunaiV
|
07fe52939d
|
mall + promotion：mock banner mock 接口
|
2023-06-17 00:47:47 +08:00 |
|
YunaiV
|
5b324f90a4
|
mall + promotion：mock 拼团活动列表
|
2023-06-16 23:27:27 +08:00 |
|
YunaiV
|
8ec3733882
|
mall + trade：mock 拼团记录列表的接口
|
2023-06-16 20:32:03 +08:00 |
|
YunaiV
|
af9334c9b2
|
mall + trade：mock 拼团记录详情的接口
|
2023-06-16 00:12:49 +08:00 |
|
YunaiV
|
af0eeb6e3b
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-06-14 23:08:28 +08:00 |
|
YunaiV
|
b74991e242
|
mall + trade：mock 拼团活动详情的接口
|
2023-06-14 23:08:22 +08:00 |
|
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
|
2023-06-14 15:18:12 +08:00 |
|
YunaiV
|
b6c7a940be
|
mall + promotion：增加秒杀活动的 mock 接口
|
2023-06-11 23:19:04 +08:00 |
|
YunaiV
|
5ffc1ac9f3
|
mall + promotion：增加秒杀活动的 mock 接口
|
2023-06-11 00:22:45 +08:00 |
|
YunaiV
|
4f5ac0edbb
|
mall + promotion：增加营销活动的 mock 接口
|
2023-06-10 17:51:15 +08:00 |
|
YunaiV
|
9e894e0430
|
mall + promotion：增加优惠劵的 mock 接口
|
2023-06-10 09:57:37 +08:00 |
|
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
|
2023-06-03 20:55:45 +08:00 |
|
YunaiV
|
73a781cbbe
|
mall + trade：增加 TradeRewardActivityPriceCalculatorTest 的单元测试
|
2023-06-03 13:36:07 +08:00 |
|
YunaiV
|
0d08c814ec
|
mall + trade：增加 TradeDiscountActivityPriceCalculator 的单元测试
|
2023-06-03 13:14:47 +08:00 |
|
YunaiV
|
1452f6b231
|
mall + trade：增肌爱 TradeCouponPriceCalculator 的单元测试
|
2023-06-03 11:53:40 +08:00 |
|
YunaiV
|
2a9a869e01
|
mall + trade：获得订单结算信息，接入支付接口
|
2023-06-03 00:46:56 +08:00 |
|
YunaiV
|
5de8fa2e42
|
mall + trade：解决报错问题
|
2023-05-31 21:17:35 +08:00 |
|
puhui999
|
35daee84e7
|
fix: 解决合并代码后项目运行失败的问题，相关问题已标注 TODO
|
2023-05-30 10:26:42 +08:00 |
|
YunaiV
|
0631c51d93
|
mall + trade：review 配置管理列表
|
2023-05-28 23:16:11 +08:00 |
|
YunaiV
|
02fa6fc5c6
|
mall + trade：调整价格字段，更易懂
|
2023-05-26 23:58:26 +08:00 |
|
YunaiV
|
7fef594390
|
订单接口的梳理
|
2023-05-14 17:35:34 +08:00 |
|
xingyu
|
0b3640a522
|
fix: required = true ==> requiredMode = Schema.RequiredMode.REQUIRED
|
2023-05-08 10:06:17 +08:00 |
|
YunaiV
|
102d56ff7d
|
修复单测报错的问题
|
2023-03-05 19:39:00 +08:00 |
|
YunaiV
|
6bf5eb0133
|
适配 mall 模块的 openapi
|
2023-02-04 13:06:54 +08:00 |
|
xingyu
|
854ba3315c
|
marge master
|
2023-01-04 10:57:19 +08:00 |
|
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
|
2023-01-04 10:48:18 +08:00 |
|
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 |
|