huangge1199/vue-pro
1
0
Fork 0
mirror of https://gitee.com/huangge1199_admin/vue-pro.git synced 2024-11-23 07:41:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
4,756 Commits 1 Branch 0 Tags 176 MiB
0e8755972c
Commit Graph

4756 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
puhui999
0e8755972c 营销活动+订单：完善大部分 TODO 提到的问题 2023-09-08 00:35:54 +08:00
puhui999
2591ab5d36 订单中心+营销活动：完善部分 TODO 提到的问题 2023-09-06 11:29:51 +08:00
YunaiV
c25bf38f50 code review：交易订单的取消 2023-09-02 00:52:31 +08:00
YunaiV
9c0d0c809a Merge branch 'mall_order_cancel' of https://gitee.com/CrazyWorld/ruoyi-vue-pro into feature/mall_product 
 Conflicts:
	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponService.java
	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponServiceImpl.java
	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java
	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java
 2023-09-02 00:45:26 +08:00
YunaiV
68c1113ed1 code review：优惠劵发放 2023-09-02 00:32:16 +08:00
YunaiV
a6ec3fefcf code review：优惠劵发放 2023-09-02 00:31:23 +08:00
芋道源码
c06d3c3d26
!602 mall: 发送优惠券功能优化 
Merge pull request !602 from 疯狂的世界/mall_coupon_take
 2023-09-01 16:19:40 +00:00
owen
3fbce643ee mall: 发送优惠券功能优化 2023-09-01 23:45:50 +08:00
YunaiV
76f510f247 code review：优惠劵发放 2023-09-01 22:51:28 +08:00
owen
b3fcefa677 trade: 会员取消订单 2023-09-01 20:37:20 +08:00
芋道源码
af0771a175
!597 优惠券 
Merge pull request !597 from 疯狂的世界/owen_dev
 2023-09-01 12:12:02 +00:00
YunaiV
28adfff10e code review：订单逻辑 2023-09-01 20:00:04 +08:00
芋道源码
8dd600a300
!600 订单中心：修改获取售后订单详情接口，修改订单管理后台物流获取接口 
Merge pull request !600 from puhui999/feature/mall_product
 2023-09-01 11:49:23 +00:00
zhijiantianya@gmail.com
dd6adb8ee6 code review order 2023-09-01 19:08:27 +08:00
puhui999
e26814be31 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 2023-09-01 12:13:11 +08:00
puhui999
1f9968d784 订单中心：修改获取售后订单详情接口，修改订单管理后台物流获取接口 2023-09-01 12:12:15 +08:00
YunaiV
361ad2e22a 同步最新商城演示图 2023-09-01 00:33:17 +08:00
YunaiV
e6f1e5d968 同步最新商城演示图 2023-09-01 00:28:39 +08:00
YunaiV
ba444c9538 code review：支付钱包 2023-08-31 20:13:12 +08:00
YunaiV
bca6fb4698 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-08-31 20:06:10 +08:00
YunaiV
f28b960319 调整最新图片 url 2023-08-31 20:06:02 +08:00
jason
457312d5aa 修改 PayClientFactory 创建 PayClient 方法 2023-08-31 14:30:12 +08:00
jason
7d4d3bea55 Revert "创建 PayClient 迁移到 PayChannelService" 
This reverts commit 716727bfa7.
 2023-08-31 08:27:22 +08:00
YunaiV
60d4aa97fb code review：售后详情接口 2023-08-30 20:18:40 +08:00
YunaiV
059202a588 购物车：调整购物车接口 2023-08-30 19:14:28 +08:00
chenchen
73f1636daa 售后日志添加售前售后状态 2023-08-30 10:58:37 +08:00
YunaiV
3e4b1c0552 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-08-30 08:43:13 +08:00
YunaiV
5a788af084 购物车：简化 cart 表命名 2023-08-30 08:43:07 +08:00
jason
278f2af8f8 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-08-29 15:29:02 +08:00
jason
716727bfa7 创建 PayClient 迁移到 PayChannelService 2023-08-29 15:28:24 +08:00
芋道源码
3e488d4308
!595 订单售后退款：添加获取售后订单详情接口 
Merge pull request !595 from puhui999/feature/mall_product
 2023-08-29 02:00:41 +00:00
puhui999
9507b6d800 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 2023-08-29 09:54:39 +08:00
puhui999
d5fe7708ce 订单售后退款：添加获取售后订单详情接口 2023-08-29 09:54:14 +08:00
YunaiV
cc71aabd3d 钱包：钱包流水 api 2023-08-29 00:31:54 +08:00
YunaiV
ddcb3e69f9 会员等级 app 接口 2023-08-28 21:01:46 +08:00
YunaiV
6132443d26 code review：钱包实现 2023-08-28 18:54:40 +08:00
puhui999
0411b3464a 订单售后退款：添加获取售后订单详情接口 2023-08-28 17:21:29 +08:00
jason
9077f14bae 钱包支付 Client 失败问题修改 2023-08-28 13:54:25 +08:00
jason
7237bc07bb 钱包退款的实现 2023-08-28 10:25:50 +08:00
puhui999
498edfffb1 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 2023-08-28 09:24:04 +08:00
puhui999
655eefc340 订单管理：完善订单管理提到的一些问题 2023-08-28 09:23:30 +08:00
jason
c7f6f92159 钱包支付 Client 的实现 2023-08-28 07:39:03 +08:00
YunaiV
1baa7f4aee 优化 AlipayPcPayClientTest 的方法命名，补全 assert 断言 2023-08-27 16:33:19 +08:00
YunaiV
35c1ba44d3 优化 AbstractAlipayClientTest、AlipayBarPayClientTest 的方法命名，补全 assert 断言 2023-08-27 16:15:41 +08:00
owen
530ec7ab24 mall: 完善后台发送优惠券 2023-08-26 22:29:56 +08:00
YunaiV
f5c5d38303 code review：商品评论 2023-08-26 21:23:01 +08:00
芋道源码
806228be8b
!593 商品评论表增加冗余 SKU 的图片地址, 规格 
Merge pull request !593 from 疯狂的世界/owen_dev
 2023-08-26 13:00:07 +00:00
YunaiV
99dd33c408 code review：会员中心的详情返回 totalPoint 积分 2023-08-26 20:57:49 +08:00
芋道源码
bef7937835
!592 获得会员用户接口增加经验值字段 
Merge pull request !592 from 风狗/feature/mall_product
 2023-08-26 12:44:32 +00:00
owen
1e2c83d90f mall: 商品评论表增加冗余 SKU 的图片地址, 规格 2023-08-26 14:40:16 +08:00