wcz
|
a6ffb5d650
|
BaseMapperX.java少了几个方法，TradeCartMapper.java方法调整，BpmProcessInstanceServiceImpl.java多了
|
2023-07-28 19:33:23 +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
|
f23e1b857a
|
fix：合并差异修正
|
2023-07-21 16:54:58 +08:00 |
|
puhui999
|
a73e078593
|
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/service/order/TradeOrderServiceImpl.java
|
2023-07-21 16:53:36 +08:00 |
|
puhui999
|
259807600a
|
feat：拼团订单集成
|
2023-07-21 16:47:04 +08:00 |
|
zhijiantianya@gmail.com
|
3f410c2735
|
by gateway:
1. 补全 channel 单元测试
2. 完善部分 order 单元测试
|
2023-07-18 20:21:25 +08:00 |
|
puhui999
|
d80bf5a368
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
|
2023-07-18 09:06:02 +08:00 |
|
YunaiV
|
6f475f8c85
|
mall + pay：
1. 优化 PayClient 支付逻辑，返回业务失败 errorCode + errorMsg 错误码
|
2023-07-18 07:37:03 +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
|
927f71c7e2
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
|
2023-07-14 14:28:26 +08:00 |
|
YunaiV
|
ca4afc2909
|
mall + pay：
1. 调整 cashier 的 channels 的读取实现方式
|
2023-07-10 18:28:43 +08:00 |
|
YunaiV
|
2485a5ebc9
|
mall + pay：
1. 将 amount 统一都修改成 price
2. 将 payed 统一改成 payStatus
|
2023-07-10 17:35:26 +08:00 |
|
puhui999
|
e7d8643665
|
fix：修复 mall review @puhui999
|
2023-07-10 16:35:49 +08:00 |
|
puhui999
|
b697ee3298
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
# Conflicts:
# yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderServiceTest.java
|
2023-07-05 22:08:12 +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 |
|
YunaiV
|
20eb0a2a88
|
mall + pay：
1、调整 returnUrl 的实现
|
2023-07-04 23:43:16 +08:00 |
|
puhui999
|
41d996f7f3
|
feat：mall promotion CombinationProduct
|
2023-07-04 11:21:03 +08:00 |
|
puhui999
|
c563051841
|
feat：mall product 新增通过 spuIds 获取相关 spu 详情列表的接口
|
2023-07-03 14:44:27 +08:00 |
|
puhui999
|
409ec555e8
|
feat：mall CombinationActivity
|
2023-07-03 08:07:05 +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 |
|