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
|
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 |
|
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
|
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 |
|
puhui999
|
666925da6e
|
fix：mall vo @Schema required = true => requiredMode = Schema.RequiredMode.REQUIRED
|
2023-06-21 08:41:45 +08:00 |
|
puhui999
|
700d95a43d
|
fix：完善商品评论 review 提到的问题
|
2023-06-20 18:12:39 +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 |
|
YunaiV
|
fc570b6062
|
mall + promotion：完善秒杀活动的 mock 返回
|
2023-06-18 21:23:50 +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 |
|
陈賝
|
59e16795be
|
!514 mall交易日志封装
* 交易日志封装
* 交易日志封装
* 交易日志模块
|
2023-06-17 14:00:10 +00:00 |
|
YunaiV
|
35df912be7
|
code review：商品评价哈
|
2023-06-17 21:57:52 +08:00 |
|
芋道源码
|
08535d6019
|
!509 完善商品评论
Merge pull request !509 from puhui999/feature/mall_product
|
2023-06-17 13:39:35 +00:00 |
|
YunaiV
|
0d47d6cead
|
mall + trade：code review 快递客户端的实现，没啥问题咧，搞下单测就 ok 拉
|
2023-06-17 11:59:38 +08:00 |
|
YunaiV
|
59d5fef592
|
mall + trade：优化运费模版的代码
|
2023-06-17 11:35:31 +08:00 |
|
YunaiV
|
8ec3733882
|
mall + trade：mock 拼团记录列表的接口
|
2023-06-16 20:32:03 +08:00 |
|
jason
|
1662d17fc9
|
快递客户端 review 修改
|
2023-06-15 14:59:31 +08:00 |
|
jason
|
e69e6d880b
|
快递价格计算 review 修改
|
2023-06-15 10:49:24 +08:00 |
|
xingyu
|
e23fb5024a
|
fix: required = true 已过期
|
2023-06-14 15:21:41 +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 |
|
puhui999
|
60172274ec
|
fix：合并代码后修改差异完善商品评论相关
|
2023-06-12 17:02:46 +08:00 |
|
puhui999
|
5cfcaa1a6e
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
# Conflicts:
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/comment/AppCommentController.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/comment/vo/AppProductCommentBaseVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/comment/vo/AppProductCommentRespVO.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/test/java/cn/iocoder/yudao/module/product/service/comment/ProductCommentServiceImplTest.java
|
2023-06-12 12:18:27 +08:00 |
|
puhui999
|
20100aa78b
|
fix：完善商品评论
|
2023-06-12 12:08:55 +08:00 |
|
YunaiV
|
dcb1660880
|
mall + trade：code review 快递计算逻辑
|
2023-06-12 00:20:20 +08:00 |
|
YunaiV
|
e1a8e45ac7
|
mall + trade：快递价格计算
|
2023-06-11 23:40:38 +08:00 |
|
jason
|
644d976a78
|
快递100 快递查询实现
|
2023-06-11 18:15:33 +08:00 |
|
jason
|
45e5578cb4
|
快递查询、 通过快递鸟查询实现
|
2023-06-11 10:22:33 +08:00 |
|
YunaiV
|
5ffc1ac9f3
|
mall + promotion：增加秒杀活动的 mock 接口
|
2023-06-11 00:22:45 +08:00 |
|