Commit Graph

424 Commits

Author SHA1 Message Date
YunaiV
20eb0a2a88 mall + pay:
1、调整 returnUrl 的实现
2023-07-04 23:43:16 +08:00
YunaiV
9b90320985 mall + trade:
1、增加配送信息
2023-07-02 12:55:15 +08:00
YunaiV
6fc724545b mall + trade:
1、取消订单 mock 接口
2、删除订单 mock 接口
2023-07-02 00:15:28 +08:00
YunaiV
6206dd94e2 mall + trade:
1、获取订单结算信息,增加门店自提编号
2023-07-01 00:26:09 +08:00
YunaiV
3750dc76c7 mall + trade:
1、获取订单结算信息,增加积分的 mock 返回
2023-06-30 22:45:03 +08:00
YunaiV
ef656cf762 mall + promotion:
1、增加获得符合条件的优惠劵
2023-06-29 20:20:00 +08:00
YunaiV
b3c1be108c mall + trade:
1、增加门店自提的 mock 接口
2023-06-29 00:24:45 +08:00
YunaiV
5ffea93731 mall + product:
1、完善商品评论列表的 mock
2023-06-28 00:25:44 +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
bb0bb2a4fa mall + promotion:商品列表 2023-06-25 11:25:13 +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
1dfbe45913 mall + order:review 售后日志 2023-06-23 21:50:57 +08:00
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
2023-06-23 21:37:21 +08:00
YunaiV
bc54e2fb35 mall + order:订单详情 2023-06-23 21:34:30 +08:00
芋道源码
b92ed60136
!519 订单详情后端修改
Merge pull request !519 from 矿泉水/feature/mall_product
2023-06-23 13:30:53 +00: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
chenchen
2f0aaee823 售后日志优化 2023-06-19 17:04:07 +08:00
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
2023-06-19 13:06:00 +08:00
xiaobai
6b3af71735 订单详情修改20230619 2023-06-19 12:50:28 +08:00
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
2023-06-19 10:22:05 +08:00
chenchen
a93b9a616f 售后日志优化 2023-06-19 10:19:29 +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
chenchen
7d0e9ea762 fix 依赖启动问题 2023-06-17 23:47:38 +08:00
YunaiV
60b24e36d5 code review:售后日志逻辑 2023-06-17 22:15:03 +08:00