354 Commits

Author SHA1 Message Date
5107322ee9 fix:【pay 支付】兼容微信支付 V3 可能 header 大小写多情况 2025-08-17 16:35:22 +08:00
be39a26380 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop 2025-08-09 16:06:46 +08:00
784a9964ba feat:【mp 公众号】添加用户 ID 筛选条件以提升消息查询功能 2025-08-09 10:22:05 +08:00
9d26bf9224 fix:【pay 支付】修复 expireOrder logger 文案错误的问题 2025-08-04 18:41:17 +08:00
e79005a0a0 reactor:@MockBean => @MockitoBean 2025-08-02 17:32:12 +08:00
8ffe9272e8 feat:【pay 支付】增加 userid、usertype,并额外支持权限校验 2025-07-27 19:18:04 +08:00
b8889a94c7 !1362 feat: 使用 fastExcel 替换 easyExcel (<a href="https://gitee.com/link?target=https%3A%2F%2Fgithub.com%2Ffast-excel%2Ffastexcel">https://github.com/fast-excel/fastexcel</a>)
Merge pull request !1362 from xingyu/master-jdk17-excel
2025-07-26 09:20:20 +00:00
a10e7aedaa fix:【Pay 支付】去除 54 强制 id 转账校验 2025-07-16 00:02:57 +08:00
f38485ffd5 Merge branch 'refs/heads/master-jdk17' into master-jdk17-excel
# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/handler/SelectSheetWriteHandler.java
2025-06-15 18:54:13 +08:00
a8a3720ecd !1359 fix(mall):用户余额充值(虚拟物品)订单上传发货信息到微信小程序订单 2025-06-15 10:10:51 +08:00
d8436659db !1359 fix(mall):用户余额充值(虚拟物品)订单上传发货信息到微信小程序订单
Merge pull request !1359 from SuchJack/master-jdk17-dev2
2025-06-15 02:07:23 +00:00
9dec02d02e feat: 使用 fastExcel 替换 easyExcel (https://github.com/fast-excel/fastexcel) 2025-06-10 14:51:41 +08:00
01b9119713 fix(mall):用户余额充值(虚拟物品)订单上传发货信息到微信小程序订单 2025-06-01 19:42:19 +08:00
5caf990920 fix: selectBatchIds 已过期 2025-05-26 14:06:02 +08:00
837f155668 fix:【PAY 支付】支付渠道配置的解析 2025-05-24 09:29:16 +08:00
86f88ea590 reactor:移除 pay 的 api 包 2025-05-17 09:48:32 +08:00
d4ed2c49f1 reactor:将 pay starter 融合到 pay-module 的 framework/pay 里 2025-05-16 23:27:00 +08:00
6c6babb4c3 reactor:yudao-common 增加 biz 包,将 framework 依赖的 api 统一迁移,方便后续 yudao-framework 独立仓库 2025-05-14 19:23:40 +08:00
51c1091430 fix:【PAY 支付】PayDemoWithdrawServiceImpl 拼写错误 2025-05-11 20:48:51 +08:00
44548ee03f feat:【MALL 商城】商城分佣提现,完成对微信转账(小程序)的对接 2025-05-11 12:39:05 +08:00
fd8567f0fa fix:【PAY 支付】wxjava v3 微信支付,connection pool shutdown 问题 2025-05-11 08:52:52 +08:00
4d25e810e3 feat:【MALL 商城】商城分佣提现,初步对接成功微信支付 2025-05-11 08:12:42 +08:00
b91a30dd3e feat:【PAY 支付】增加 channelPackageInfo 字段,对接微信新的转账 API(太难了!!!!!!!!!!!!!!!!!!!!) 2025-05-10 20:05:17 +08:00
0e7ce63719 feat:【PAY 支付】转账单,支持导出功能 2025-05-10 17:15:30 +08:00
288d8e3132 reactor:【PAY 支付】优化退款回调接口,增加 merchantRefundId 退款编号参数
reactor:【MALL 商城】售后退款时,基于回调处理
2025-05-10 16:43:55 +08:00
423c0b7ea7 feat:【MALL 商城】佣金提现,优化字段,以及支持更多 API 自动打款 2025-05-10 10:07:11 +08:00
d2b668a676 feat:【PAY 支付】提现示例,拆分 create 和 transfer 两个状态,更符合实际场景 2025-05-09 22:03:01 +08:00
38c76806a3 feat:【PAY 支付】微信支付的转账,接入新的 API(需要继续测试,= = 真麻烦)
feat:【PAY 支付】钱包支持转账功能
2025-05-08 23:31:23 +08:00
f81dc105a2 feat:【PAY 支付】AbstractAlipayPayClient,支付宝增加回调解析 2025-05-08 13:57:49 +08:00
7653be9d48 feat:【PAY 支付】示例转账单,改成示例提现单,理解成本更低 2025-05-08 13:09:14 +08:00
1e7f22cde0 feat:【PAY 支付】完善支付转账示例,以及转账功能(支付宝) 2025-05-07 23:37:24 +08:00
ffee189589 reactor:移除 PayClient 获取转账时的 type 字段,只有支付宝会区分,后续通过 channelExtras 区分 2025-05-07 09:21:29 +08:00
a34de9f223 feat:【MALL 商城】增加微信物流的对接(和社区同学,一起测试中。。。) 2025-05-06 20:49:13 +08:00
9847d4cdb1 fix:【PAY 支付】支付宝回调时,区分公钥模式、证书模式 2025-05-05 23:52:36 +08:00
be86acb9b6 fix:【PAY 支付】支付宝回调时,区分公钥模式、证书模式 2025-05-05 23:37:40 +08:00
a2bfa7a95a feat:weixin-java from 4.7.2.B => 4.7.4.B
feat:微信支付 v3 从平台证书切换成微信支付公钥
feat:微信支付 v3 增加 header 解析
2025-05-05 22:35:49 +08:00
be86cdfd51 reactor:@TenantIgnore 添加在 Controller 时,自动添加到 TenantProperties 中 2025-05-05 09:33:34 +08:00
1138376f7a fix:【PAY 支付】支付示例订单退款时,校验 payRefundId 不正确的问题 2025-05-04 10:39:28 +08:00
eb7269083a Merge branch 'feature/iot' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17 2025-03-17 08:54:10 +08:00
bd93257a26 【缺陷修复】PAY:WxAppPayClient 返回结果不读id问题 2025-03-16 10:42:10 +08:00
bb11fdd3fa Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/iot
# Conflicts:
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/thinkmodelfunction/IotThinkModelFunctionController.http
2025-02-09 07:23:17 +08:00
4e43958fe3 fix typo: adminTenentId -> adminTenantId, appTenentId -> appTenantId 2025-02-05 11:42:59 +08:00
8236154ae8 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/iot
# Conflicts:
#	yudao-dependencies/pom.xml
#	yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/enums/product/IotProductStatusEnum.java
#	yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/enums/thingmodel/IotThingModelTypeEnum.java
2025-01-28 03:54:16 +08:00
bb798681f7 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/bpm
# Conflicts:
#	yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmSimpleModeConditionTypeEnum.java
#	yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmSimpleModelNodeTypeEnum.java
#	yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmUserTaskRejectHandlerTypeEnum.java
2025-01-24 22:48:37 +08:00
d83b7cd5b9 【代码优化】InEnum 不必须指定 int 类型,通过泛型指定 2025-01-24 17:31:41 +08:00
25c86c05b3 【拼写修正】全局:遇到改成芋道,拼写错误 2025-01-17 19:57:33 +08:00
9b9fd30c90 【代码重构】IoT:产品放到 product 子目录下 2024-12-07 18:50:31 +08:00
87cee4628a 【代码优化】商城:优化分销提现的逻辑(余额) 2024-11-25 19:30:55 +08:00
c239d9cc56 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop
# Conflicts:
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/kefu/AppKeFuMessageController.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/combination/CombinationActivityConvert.java
2024-11-19 09:26:44 +08:00
8895312017 【新增功能】微信转账到零钱:主动查询转账状态
Signed-off-by: 杨宇庆 <hiyyq@qq.com>
2024-10-29 18:45:20 +00:00