puhui999
|
2591ab5d36
|
订单中心+营销活动:完善部分 TODO 提到的问题
|
2023-09-06 11:29:51 +08:00 |
|
jason
|
4a0fa2a3a4
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-09-06 08:50:33 +08:00 |
|
jason
|
3f51be6a2d
|
钱包。删除不需要的类
|
2023-09-06 08:50:22 +08:00 |
|
YunaiV
|
e4b153a866
|
分佣:增加获得分销排行分页 API mock
|
2023-09-05 23:49:35 +08:00 |
|
YunaiV
|
5308e309ea
|
同步 https://gitee.com/zhijiantianya/yudao-cloud/pulls/51/files
|
2023-09-03 18:44:03 +08:00 |
|
YunaiV
|
4db3de8d86
|
Merge branch 'master' of https://github.com/YunaiV/ruoyi-vue-pro
|
2023-09-03 18:30:46 +08:00 |
|
芋道源码
|
a1f6826e14
|
Merge pull request #337 from freesme/fix-master-#319-wx-pay-client-error
修复:#319 微信支付初始化 client 客户端错误,导致发起支付报错
|
2023-09-03 18:30:32 +08:00 |
|
YunaiV
|
b69d4e0852
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
|
2023-09-03 17:59:50 +08:00 |
|
芋道源码
|
7870283bfa
|
!594 兼容spring web 配置上下文根路径的情况
Merge pull request !594 from suyh/master
|
2023-09-03 09:55:39 +00:00 |
|
owen
|
6a7be19d3a
|
common: 增加InEnumCollectionValidator,用于校验枚举值列表参数的取值范围是否有䇅
|
2023-09-02 08:44:02 +08:00 |
|
YunaiV
|
d982a95fdd
|
Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2023-08-31 20:38:59 +08:00 |
|
YunaiV
|
ba444c9538
|
code review:支付钱包
|
2023-08-31 20:13:12 +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 |
|
jason
|
716727bfa7
|
创建 PayClient 迁移到 PayChannelService
|
2023-08-29 15:28:24 +08:00 |
|
Krane
|
e8662e35e1
|
修复:微信支付初始化 client 客户端错误,导致发起支付报错
|
2023-08-29 11:45:04 +08:00 |
|
YunaiV
|
6132443d26
|
code review:钱包实现
|
2023-08-28 18:54:40 +08:00 |
|
jason
|
7237bc07bb
|
钱包退款的实现
|
2023-08-28 10:25:50 +08:00 |
|
jason
|
c7f6f92159
|
钱包支付 Client 的实现
|
2023-08-28 07:39:03 +08:00 |
|
YunaiV
|
8b98d13d8b
|
Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2023-08-27 21:05:42 +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 |
|
苏云弘
|
2acf5c878f
|
兼容spring boot web 提供的上下文根路径的匹配
spring.servlet.content-path
|
2023-08-27 11:59:38 +08:00 |
|
YunaiV
|
3dd273a30d
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2023-08-27 11:10:57 +08:00 |
|
YunaiV
|
7d99c6dbe8
|
Merge branch 'master' of https://github.com/YunaiV/ruoyi-vue-pro
|
2023-08-27 10:52:37 +08:00 |
|
芋道源码
|
544e650e15
|
Merge pull request #326 from Lemon-cc-hang/base
fix: 在调用 selectList() 的时候 如果 Collection 参数为空会报错 sql 异常
|
2023-08-27 10:52:15 +08:00 |
|
YunaiV
|
acee734554
|
Merge branch 'master' of https://github.com/YunaiV/ruoyi-vue-pro
|
2023-08-27 10:44:48 +08:00 |
|
JUNHAO
|
5cc3e6510b
|
使用Parenthesis为原有表达式添加括号
|
2023-08-24 14:38:47 +08:00 |
|
jason
|
b119aadba5
|
支付宝 条码支付 Client 单元测试
|
2023-08-23 12:30:15 +08:00 |
|
shizhong
|
eb4434ecbc
|
解决MapStruct的时区问题
|
2023-08-23 12:11:47 +08:00 |
|
jason
|
c0ffaf8ea9
|
支付宝 PC 网站 Client 单元测试
|
2023-08-22 22:17:27 +08:00 |
|
jason
|
c7f0b5c73d
|
支付宝 H5 Client 单元测试
|
2023-08-22 22:17:27 +08:00 |
|
jason
|
eff9fafde8
|
创建支付宝 Client 抽象类测试类, 测试公共方法
|
2023-08-22 08:40:41 +08:00 |
|
YunaiV
|
e8c1bdde3d
|
会员中心:会员管理 50%
|
2023-08-19 14:12:03 +08:00 |
|
jason
|
6fbf7b261b
|
扫码支付统一退款单元测试, 修复退款失败,渠道错误未赋值bug
|
2023-08-17 21:52:53 +08:00 |
|
jason
|
1b03fdb08b
|
支付宝 扫码支付 统一下单 单元测试
|
2023-08-16 08:51:27 +08:00 |
|
YunaiV
|
e4a2c738b2
|
订单:
1. 增加查询物流接口
|
2023-08-15 20:18:22 +08:00 |
|
lemoncc
|
5b9106fdb5
|
fix: 在调用 selectList() 的时候 如果 Collection 参数为空会报错 sql 异常
|
2023-08-15 17:54:55 +08:00 |
|
YunaiV
|
5fcd0a21da
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
|
2023-08-11 22:44:20 +08:00 |
|
YunaiV
|
9ff67b479f
|
!562 优化 redisCache
|
2023-08-11 21:46:53 +08:00 |
|
芋道源码
|
8960a82978
|
!562 优化 redisCache
Merge pull request !562 from wanwan/feature/redis_cache_optimize_20230810
|
2023-08-11 12:09:10 +00:00 |
|
wanwan
|
134e5ca20f
|
feat: 将 redisCache 的扫描策略设置成 scan
|
2023-08-10 15:27:19 +08:00 |
|
wanwan
|
64c8dd6292
|
feat: 拓展 支持自定义过期时间的 RedisCacheManager 使支持自定义过期时间单位
|
2023-08-10 15:27:03 +08:00 |
|
wanwan
|
c4a7da9233
|
Revert "feat: 拓展 支持自定义过期时间的 RedisCacheManager 使支持自定义过期时间单位"
This reverts commit 47698bfc6c .
|
2023-08-10 15:26:31 +08:00 |
|
wanwan
|
e1fe21f24c
|
Revert "feat: 将 redisCache 的扫描策略设置成 scan"
This reverts commit 72d2dcc68f .
|
2023-08-10 15:26:25 +08:00 |
|
jlc@yoc.tech
|
47698bfc6c
|
feat: 拓展 支持自定义过期时间的 RedisCacheManager 使支持自定义过期时间单位
|
2023-08-10 11:50:18 +08:00 |
|
jlc@yoc.tech
|
72d2dcc68f
|
feat: 将 redisCache 的扫描策略设置成 scan
|
2023-08-10 11:26:44 +08:00 |
|
xlsea
|
ead8741393
|
调用微信App v3支付渠道返回参数解析错误
|
2023-08-08 09:12:50 +08:00 |
|
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
|
222d1cf69b
|
增加对比新老数组的 C/U/D 对象
|
2023-08-06 00:25:23 +08:00 |
|
YunaiV
|
5e2fa48f20
|
code review:拼团、秒杀活动的代码
|
2023-08-05 20:51:48 +08:00 |
|
芋道源码
|
7a7ae3b8ec
|
!545 完善 review 拼团、秒杀活动的实现提到的问题
Merge pull request !545 from puhui999/feature/mall_product
|
2023-08-05 11:54:13 +00:00 |
|
YunaiV
|
105f1a2707
|
fix: banner 日志打印
|
2023-08-05 16:35:11 +08:00 |
|
puhui999
|
92b10e2ecf
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
|
2023-07-31 18:37:13 +08:00 |
|
puhui999
|
d156d43d63
|
fix:完善 review 拼团、秒杀活动的实现提到的问题
|
2023-07-31 18:34:56 +08:00 |
|
YunaiV
|
68049b85b9
|
基于 Redis 实现的 pubsub、stream 消息队列,支持开启或关闭。默认为关闭状态,项目启动更快
|
2023-07-29 12:04:50 +08:00 |
|
YunaiV
|
ae98315616
|
增加模拟支付的订单号、退款号返回
|
2023-07-29 11:32:48 +08:00 |
|
YunaiV
|
bf3e848c17
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
|
2023-07-29 11:06:59 +08:00 |
|
YunaiV
|
5e7e3d816c
|
彻底移除 RedisKeyDefine
|
2023-07-29 07:16:10 +08:00 |
|
YunaiV
|
95edd1d451
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-redis
Conflicts:
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/auth/AuthConvert.java
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImpl.java
|
2023-07-28 22:31:18 +08:00 |
|
wcz
|
a6ffb5d650
|
BaseMapperX.java少了几个方法,TradeCartMapper.java方法调整,BpmProcessInstanceServiceImpl.java多了
|
2023-07-28 19:33:23 +08:00 |
|
puhui999
|
446951bd11
|
fix:封装函数 convertCDUMap 作用:数据划分为需要新增的、还是删除的、还是更新的。
|
2023-07-28 16:30:38 +08:00 |
|
YunaiV
|
7f657ee931
|
优化 mp-java 库的依赖管理
|
2023-07-27 23:15:49 +08:00 |
|
YunaiV
|
c33186569d
|
优化 mp 账号的刷新机制,使用 Job 轮询,替换 MQ 广播
|
2023-07-27 20:25:15 +08:00 |
|
YunaiV
|
859cf74a6c
|
对齐 boot 与 cloud 的代码
|
2023-07-27 13:00:52 +08:00 |
|
jason
|
6a38738760
|
新增模拟支付渠道,通知查询为空bug 修改
|
2023-07-27 08:19:24 +08:00 |
|
YunaiV
|
21b3744544
|
1.8.0 版本发布
|
2023-07-27 07:45:04 +08:00 |
|
YunaiV
|
14d7db0c60
|
对齐 boot 与 cloud 的代码
|
2023-07-26 23:27:06 +08:00 |
|
YunaiV
|
114f1e4833
|
对齐 boot 与 cloud 的代码
|
2023-07-26 22:36:34 +08:00 |
|
YunaiV
|
a0417f182e
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
|
2023-07-26 19:36:11 +08:00 |
|
YunaiV
|
b84f7825c5
|
review 拼团、秒杀活动的实现
|
2023-07-26 19:09:47 +08:00 |
|
lwf
|
414c1be128
|
feature(使用redis缓存): 功能合并
1、缓存改为Redis缓存,不在启动时缓存,使用时候根据数据源缓存
2、前端登录接口调整
|
2023-07-26 17:20:54 +08:00 |
|
芋道源码
|
e2ed0b7afb
|
!530 完成拼团活动和秒杀活动 CRUD
Merge pull request !530 from puhui999/feature/mall_product
|
2023-07-26 05:01:00 +00:00 |
|
YunaiV
|
d9522808eb
|
优化 LambdaQueryWrapperX 的 inIfPresent 判空逻辑
|
2023-07-25 20:58:44 +08:00 |
|
芋道源码
|
bd1153fbe2
|
!541 api记录日志耗时单位修改为毫秒
Merge pull request !541 from kinlon92/master
|
2023-07-25 11:56:11 +00:00 |
|
芋道源码
|
870873e480
|
!540 修复部分问题,升级依赖
Merge pull request !540 from xingyu/feature/captcha
|
2023-07-25 11:20:04 +00:00 |
|
YunaiV
|
7f0901e0bb
|
优化项目启动速度,
|
2023-07-25 08:39:28 +08:00 |
|
zjl
|
9d10c85be8
|
接口日志持续时间修改为毫秒单位
|
2023-07-24 23:00:24 +08:00 |
|
YunaiV
|
3a1694dea3
|
1. 微信 App 支付 WxAppPayClient 实现
2. 优化微信支付的下单逻辑,增加 build request 公用方法
|
2023-07-24 22:07:54 +08:00 |
|
YunaiV
|
0fcc0072c2
|
1. AlipayBarPayClient 增加小额支付的成功返回
|
2023-07-24 21:44:09 +08:00 |
|
YunaiV
|
5ae43a238d
|
1. 修复支付宝 App 发起报错的问题
2. 移除微信 H5 支付,基本没人使用,减少复杂性
|
2023-07-24 20:54:04 +08:00 |
|
puhui999
|
c9c176ea05
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
|
2023-07-24 17:30:54 +08:00 |
|
YunaiV
|
3a24d05bdc
|
mall + pay:
1. 修复单元测试的报错
|
2023-07-24 07:04:11 +08:00 |
|
YunaiV
|
0e5e6c7ce0
|
mall + pay:
1. 增加微信退款的查询接口
|
2023-07-23 20:39:52 +08:00 |
|
YunaiV
|
5b066ea693
|
mall + pay:
1. 增加支付宝退款查询接口
|
2023-07-22 20:46:38 +08:00 |
|
YunaiV
|
15cca8f3de
|
mall + pay:
1. 支付订单的状态同步 Job
2. 支付订单的过期关闭 Job
|
2023-07-22 15:48:45 +08:00 |
|
YunaiV
|
717caf527a
|
mall + pay:
1. 增加微信支付 Client 的查询订单接口
|
2023-07-22 12:07:18 +08:00 |
|
YunaiV
|
f46a037164
|
mall + pay:
1. 增加支付宝 Client 的查询订单接口
|
2023-07-22 11:19:42 +08:00 |
|
xingyu
|
c95a1d0a7d
|
chore: up springboot 2.10.13
|
2023-07-21 17:53:40 +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 |
|
zhijiantianya@gmail.com
|
b54f7e9256
|
by gateway:
1. 完善部分 order 单元测试
2. 增加支付订单的 no 生成逻辑
|
2023-07-20 20:07:44 +08:00 |
|
YunaiV
|
b84da30234
|
mall + pay:
1. 优化订单管理的接口实现
2. 支付状态增加 refund 类型,将 refund status 合并进去
|
2023-07-19 21:09:02 +08:00 |
|
YunaiV
|
888c488206
|
mall + pay:
1. 优化 PayClient 退款逻辑,返回业务失败 errorCode + errorMsg 错误码
|
2023-07-18 22:36:03 +08:00 |
|
zhijiantianya@gmail.com
|
3f410c2735
|
by gateway:
1. 补全 channel 单元测试
2. 完善部分 order 单元测试
|
2023-07-18 20:21:25 +08:00 |
|
YunaiV
|
1c282bd3cb
|
mall + pay:
1. 优化 PayClient 退款逻辑,返回业务失败 errorCode + errorMsg 错误码
|
2023-07-18 13:00:22 +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 |
|
YunaiV
|
7cf4c5415e
|
mall + pay:
1. 将 payNotifyUrl 统一改成 orderNotifyUrl
|
2023-07-17 16:38:31 +08:00 |
|
YunaiV
|
d0a7f41875
|
mall + pay:
1. 完善微信支付的 V3 支付回调、退款回调
|
2023-07-17 16:27:51 +08:00 |
|
YunaiV
|
68a4ef98ca
|
mall + pay:
1. 拆分支付回调、退款回调的 URL
2. 修复微信支付回调的时间解析错误
|
2023-07-17 11:47:45 +08:00 |
|
YunaiV
|
66ed61c641
|
mall + pay:
1. 微信支付配置,补全 apiclient_cert.p12 证书
|
2023-07-17 07:56:33 +08:00 |
|
YunaiV
|
7caf8e900f
|
mall + pay:
1. 增加微信 bar 和 native 的集成测试,方便调试配置
|
2023-07-16 19:24:29 +08:00 |
|
YunaiV
|
ecdc39612f
|
mall + pay:
1. 后台的收银台,接入微信扫码支付
|
2023-07-15 23:14:42 +08:00 |
|
YunaiV
|
c44ace6011
|
mall + pay:
1. 完成支付宝的退款重构
2. 完成 demo 模块的退款接入
|
2023-07-15 20:36:04 +08:00 |
|
YunaiV
|
518e89dc4b
|
mall + pay:
1. 重构支付回调的逻辑,将回调解析改成 PayOrderRespDTO,为后续轮询做铺垫
2. 调整退款单的表结构
3. 调整退款调用的实现
|
2023-07-15 10:35:41 +08:00 |
|
puhui999
|
927f71c7e2
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
|
2023-07-14 14:28:26 +08:00 |
|
zhijiantianya@gmail.com
|
47ba5b7b44
|
by gateway: 支付渠道的代码优化
|
2023-07-12 20:34:43 +08:00 |
|
zhijiantianya@gmail.com
|
35ceef371c
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-07-12 12:52:58 +08:00 |
|
zhijiantianya@gmail.com
|
052e4689ee
|
by gateway: 支付应用的代码优化
|
2023-07-12 12:52:48 +08:00 |
|
YunaiV
|
0ac599a3d9
|
mall + pay:
1. 修复支付宝沙箱地址的调整
2. 收银台的前端 URL 支付走整个网页跳转
3. 收银台的支付成功后,增加 returnUrl 回跳
4. 修复 PayNotifyTask 首次通知时,可能会失败的情况;原因:租户未传递;
|
2023-07-12 00:04:19 +08:00 |
|
YunaiV
|
cad508def6
|
mall + pay:
1. bar 扫码支付成功后,额外返回 notify
2. notify 在支付回调时,增加幂等处理
|
2023-07-10 23:06:00 +08:00 |
|
puhui999
|
e7d8643665
|
fix:修复 mall review @puhui999
|
2023-07-10 16:35:49 +08:00 |
|
YunaiV
|
4682650e11
|
mall + pay:
1. 先添加 WxAppPayClient、WxH5PayClient 的类,暂未实现
|
2023-07-09 00:47:31 +08:00 |
|
YunaiV
|
b06a21f9af
|
mall + pay:
1. 实现 WxNativePayClient 的支付功能
|
2023-07-09 00:36:40 +08:00 |
|
YunaiV
|
e31b40eefa
|
mall + pay:
1. 实现 WxBarPayClient 的支付功能
|
2023-07-08 23:37:25 +08:00 |
|
YunaiV
|
4014137a4c
|
mall + pay:调整异常的处理
1. 在 PayOrderUnifiedRespDTO 增加 status 字段,用于后续微信付款码支付时,直接支付成功的场景。
|
2023-07-08 22:40:27 +08:00 |
|
YunaiV
|
efb221b1fe
|
mall + pay:调整异常的处理
1. 如果是业务异常,则统一转换成 ServiceException
2. 如果是系统异常,则使用 PayException 包装成无需 check 的异常
|
2023-07-08 19:26:42 +08:00 |
|
YunaiV
|
d76bc7aa82
|
mall + pay:
1、初步完成微信扫码支付,暂时缺少状态的处理
|
2023-07-08 00:08:05 +08:00 |
|
YunaiV
|
3f33ca2d6b
|
mall + pay:
1、增加获得支付渠道接口
|
2023-07-06 23:16:53 +08:00 |
|
YunaiV
|
d224b6b9be
|
mall + pay:
1、调整微信 Lite 小程序支付的实现
|
2023-07-06 20:55:23 +08:00 |
|
YunaiV
|
cbc61184bd
|
mall + pay:
1、优化微信公众号 MP 支付的实现
|
2023-07-06 19:11:32 +08:00 |
|
YunaiV
|
67d60e32f8
|
mall + pay:
1、调整微信支付,修复 v2 传递的时间不正确
2、调整 mp js ticket 接口到 system 模块
|
2023-07-06 00:19:05 +08:00 |
|
YunaiV
|
20eb0a2a88
|
mall + pay:
1、调整 returnUrl 的实现
|
2023-07-04 23:43:16 +08:00 |
|
YunaiV
|
23e3c4d0d9
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
|
2023-07-02 23:45:48 +08:00 |
|
芋道源码
|
11c4c950b7
|
回退 'Pull Request !518 : 添加华为云 maven 升级依赖'
|
2023-07-02 15:41:26 +00:00 |
|
xingyu
|
3e9768374b
|
chore: up justauth 1.0.1 captcha-plus 1.0.5
|
2023-06-26 22:19:20 +08:00 |
|
xingyu
|
7ad3b6ad2b
|
chore: use com.xingyuv.justauth
|
2023-06-26 21:08:56 +08:00 |
|
xingyu
|
c1782c432f
|
chore: up deps version
|
2023-06-26 16:50:20 +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 |
|
jason
|
6b1d996b66
|
页面装修数据结构定义
|
2023-06-23 10:53:29 +08:00 |
|
chenchen
|
2f0aaee823
|
售后日志优化
|
2023-06-19 17:04:07 +08:00 |
|
chenchen
|
a93b9a616f
|
售后日志优化
|
2023-06-19 10:19:29 +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
|
ecfe0b864b
|
优化 RedisPendingMessageResendJob 代码排版,以及注释
|
2023-06-17 12:41:56 +08:00 |
|
芋道源码
|
a978c99617
|
!480 解决RedisPendingMessageResendJob 任务可能会导致消息重复的问题
Merge pull request !480 from 天气真好/redis-stream-mq
|
2023-06-17 04:36:51 +00:00 |
|
YunaiV
|
16dd86a8db
|
498 解决解决 Set access token expire time to 0 报错问题和邮件发送用户编号为空问题
|
2023-06-17 12:36:13 +08:00 |
|
芋道源码
|
09776a73b5
|
!511 fix:修改第1点描述错误, 【用户看到 】改为 【用户看不到】
Merge pull request !511 from Syriana_Zh/N/A
|
2023-06-17 04:26:36 +00:00 |
|
YunaiV
|
749fe9d515
|
回退验证码到 1.0.2
|
2023-06-17 12:19:46 +08:00 |
|
YunaiV
|
8ec3733882
|
mall + trade:mock 拼团记录列表的接口
|
2023-06-16 20:32:03 +08:00 |
|
xingyu
|
b892a6d2bd
|
feat: captcha-plus 1.0.4
|
2023-06-14 18:00:14 +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 |
|
Syriana钟亨
|
df6d63068d
|
fix:修改第1点描述错误, 【用户看到 】改为 【用户看不到】
Signed-off-by: Syriana钟亨 <4916681+sairupe@user.noreply.gitee.com>
|
2023-06-13 08:36:20 +00:00 |
|
YunaiV
|
dcb1660880
|
mall + trade:code review 快递计算逻辑
|
2023-06-12 00:20:20 +08:00 |
|