1013 Commits (c4688d887ca4c10a8a2fbb6b5c4acde59b026c32)

Author SHA1 Message Date
zhijiantianya@gmail.com 00e18a480f code review:钱包、充值、转账的实现 2 years ago
owen 0c4713b7e0 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
# Conflicts:
#	sql/mysql/mall.sql
2 years ago
owen 0612a13cce 交易:核销订单 2 years ago
zhijiantianya@gmail.com 4b0333f3e9 code review:订单统计 2 years ago
zhijiantianya@gmail.com 0af205ede1 Merge remote-tracking branch 'origin/master' 2 years ago
owen 6fbb7d6d6d 终端类型参数改为从Controller传入 2 years ago
owen 76f512fc7a 1. APP增加终端Header[terminal]
2. 订单、会员注册记录来源终端
2 years ago
YunaiV 7e312aae02 初始化 crm 模块 2 years ago
YunaiV 1ac2f2b5c2 code review:会员统计 2 years ago
YunaiV 7a9dbfe41d Merge remote-tracking branch 'origin/master' 2 years ago
owen 4be709b815 统计:Review修改 2 years ago
YunaiV fef808d88c code review:统计代码 2 years ago
YunaiV 704087ce86 Merge branch 'feature/mall_product' of https://gitee.com/CrazyWorld/ruoyi-vue-pro into feature/mall_product
# Conflicts:
#	yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/api/order/TradeOrderApi.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/api/order/TradeOrderApiImpl.java
2 years ago
puhui999 bccd270fc7 营销活动:完成砍价、秒杀库存回滚。完成拼团过期和虚拟成团处理 2 years ago
youkehai 599d13b1ac feat: 随便测试 2 years ago
youkehai bc781d9473 fix: 【工作流】按 review 修改代码 2 years ago
owen 74a5e40d8d Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
# Conflicts:
#	yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/api/order/TradeOrderApi.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/api/order/TradeOrderApiImpl.java
2 years ago
owen df16278a03 统计:会员统计 2 years ago
zhijiantianya@gmail.com 6388950ab2 code review:【工作流】—— 加签的实现 2 years ago
puhui999 2e559ebe06 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
# Conflicts:
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationRecordServiceImpl.java
2 years ago
puhui999 c8a9d68933 拼团活动:完善 review 提到的问题 2 years ago
YunaiV 01e6140d67 code review:拼团记录流程 2 years ago
YunaiV 99649bfdb8 code review:拼团记录流程 2 years ago
puhui999 6636ee7420 拼团记录(APP):新增一个取消拼团的接口 2 years ago
YunaiV c8f1269d6e promotion:修复砍价活动返回的 combinationPrice 为空的问题 2 years ago
YunaiV 1bda3c8b53 promotion:完善砍价 API ~ 提交下,准备出门吃饭!!!! 2 years ago
YunaiV a1e9bedf34 promotion:完善秒杀的 uniapp 接口 2 years ago
YunaiV 1bc1be14fb Merge branch 'feature/mall_product' of https://gitee.com/lanxindx/ruoyi-vue-pro into feature/mall_product
# Conflicts:
#	yudao-server/src/main/resources/application-local.yaml
2 years ago
owen b7359706db Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2 years ago
owen d0f0bc5888 分销:调整推广人列表查询方式 2 years ago
YunaiV 1f910992d6 trade:新增是否自提的配置项 2 years ago
j-sentinel 2f0483ce9f [新增][定时任务]重新申请 ApiAccessLog、ApiErrorLog、JobLog 3个日志的定时清理 2 years ago
YunaiV 6f4c04d944 trade:完善退款详情 2 years ago
YunaiV f8b4a08fae code review:访问日志、错误日志的清理 Job 实现 2 years ago
YunaiV d4417d2474 code review:积分、优惠劵、佣金等逻辑 2 years ago
YunaiV 057952bdeb Merge branch 'feature/mall_product' of https://gitee.com/CrazyWorld/ruoyi-vue-pro into feature/mall_product
# Conflicts:
#	yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/date/LocalDateTimeUtils.java
2 years ago
芋道源码 4f7d6b4959
!643 订单:完善拼团活动和一些 TODO
Merge pull request !643 from puhui999/feature/mall_product
2 years ago
j-sentinel 11921fab5a [新增][定时任务]ApiAccessLog、ApiErrorLog、JobLog 3个日志的定时清理 2 years ago
puhui999 d3f03540f8 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 2 years ago
owen cafa938ff4 common:LocalDateTimeUtils 增加方法:月份开始时间、月份结束时间 2 years ago
YunaiV 3489144757 新任务:日志的清理 job 2 years ago
puhui999 597eacaaeb Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
# Conflicts:
#	yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/ErrorCodeConstants.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java
2 years ago
puhui999 0b35d4a7e3 订单:完善拼团活动部分 TODO 2 years ago
owen 26628913cb 错误码分段 2 years ago
kehaiyou 7d497ce09b feat: 【工作流】--加签 2 years ago
jason 57d782bc94 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
# Conflicts:
#	yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/enums/ErrorCodeConstants.java
2 years ago
jason aa2f651124 Pay: 转账单实现 2 years ago
YunaiV 5913ee0706 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/jackson/config/YudaoJacksonAutoConfiguration.java
#	yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/ErrorCodeConstants.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/vo/activity/AppBargainActivityDetailRespVO.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/vo/activity/AppBargainActivityRespVO.java
#	yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/ErrorCodeConstants.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderSettlementReqVO.java
#	yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java
#	yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/enums/ErrorCodeConstants.java
#	yudao-server/src/main/resources/application-local.yaml
2 years ago
YunaiV 53bd1b9ec1 trade:订单评论超时时,自动评论 2 years ago
jason 437185cb1d Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2 years ago
jason 6fcff0863a 支付宝统一退款接口 subCode == ACQ.SYSTEM_ERROR 返回 WAITING 状态 2 years ago
YunaiV e384b810bf code review:分销逻辑 2 years ago
jason 0f0e6eb8ba Pay Client 新增转账接口 2 years ago
YunaiV 83a133b344 bpm:优化 BpmnModelUtils 2 years ago
owen e9fd377772 分销:Review代码修改 2 years ago
YunaiV 0b649fd3e1 bpm:简化获得可回退节点的实现 2 years ago
YunaiV 421bb7d154 code review:分销逻辑 2 years ago
owen f7296d18b9 Merge remote-tracking branch 'origin/feature/mall_product' into brokerate
# Conflicts:
#	yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/common/PromotionTypeEnum.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderDO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderItemDO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/bo/TradePriceCalculateRespBO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradePriceCalculatorHelper.java
#	yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/user/dto/MemberUserRespDTO.java
2 years ago
owen 29b806e675 Framework:增加LocalDate、LocalTime序列化 2 years ago
kehaiyou b13f71424b feat: 工作流-》流程实例的任务节点回退 2 years ago
owen f30fa39067 修改Review代码 2 years ago
puhui999 6ef94ade6a 完善订单和活动 review 提到的问题 2 years ago
YunaiV c766f7daa5 code review:砍价、秒杀的逻辑 2 years ago
YunaiV 2278ad4652 Merge branch 'feature/mall_product' of https://gitee.com/puhui999/ruoyi-vue-pro into feature/mall_product
 Conflicts:
	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java
2 years ago
YunaiV 9630f236f8 Merge branch 'feature/auth' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
 Conflicts:
	README.md
2 years ago
YunaiV 8cfb738db3 code review:分销逻辑 2 years ago
puhui999 408df683d8 秒杀活动: 完善 app 端获取活动分页、列表、详情接口 2 years ago
owen a3e8b42be6 trade: 分销业务review代码修改 2 years ago
YunaiV b81ebe6f19 修复 common 下的 test 引入不正确的问题,减少包依赖大小 2 years ago
YunaiV 436fef7efa 1. 移除 netty-all,减少依赖
2. 修复 xss 无法禁用的问题
2 years ago
YunaiV 222daa5366 pay 缓存,使用 guava 替代 job 扫描,目的:提升启动速度,加快缓存失效 2 years ago
YunaiV ab800aa891 1. 简化 JsonUtils 初始化方式,去掉 BeanPostProcessor
2. 减少日志打印

目的:优化启动速度
2 years ago
YunaiV 50371b3676 1. 禁用 member 模块
2. 减少 mybatis 日志打印
3. 降低 local 环境的初始连接

目的:提升项目的启动速度
2 years ago
YunaiV ebb3a04251 优化多租户 Job 的实现,采用 AOP 替代 BeanPostProcessor,提升启动速度 2 years ago
YunaiV 808ff6abb9 默认禁用 lock4j 依赖,保证启动速度 2 years ago
YunaiV f0f5b52150 默认禁用 quartz 依赖,保证启动速度 2 years ago
YunaiV 08d39d4593 默认禁用 resilience4j 依赖,保证启动速度 2 years ago
xingyu 437131cc7a Merge remote-tracking branch 'origin/master' into feature/auth
# Conflicts:
#	yudao-dependencies/pom.xml
2 years ago
YunaiV 8b50cd9661 Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
 Conflicts:
	yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/ErrorCodeConstants.java
	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/combination/AppCombinationRecordController.java
	yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/ErrorCodeConstants.java
	yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java
	yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/enums/ErrorCodeConstants.java
2 years ago
xingyu 5e9e41c045 fix: required 过期 2 years ago
xingyu 1184b46c40 chore: up justauth 1.0.4 2 years ago
YunaiV 314dee430e bugfix:微信公众号登录报 access token 的问题 2 years ago
YunaiV a5e33f6d3a 引入 mybatis plus join 作为基类 2 years ago
YunaiV 55f8585ea8 同步 2 years ago
芋道源码 3b5215db21
!611 分销用户管理、Review代码修改
Merge pull request !611 from 疯狂的世界/brokerate
2 years ago
YunaiV 87c55784c4 code review:营销活动+订单 2 years ago
owen ddcebb1986 common: MoneyUtils 移到 common 模块 2 years ago
puhui999 5d6bb84d25 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 2 years ago
YunaiV 5808f77ade code review:订单分佣 2 years ago
YunaiV eb342d5abf Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
# Conflicts:
#	yudao-module-member/yudao-module-member-biz/src/test/resources/sql/create_tables.sql
2 years ago
YunaiV bf92727b27 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
 Conflicts:
	yudao-module-member/yudao-module-member-biz/src/test/resources/sql/create_tables.sql
2 years ago
puhui999 2591ab5d36 订单中心+营销活动:完善部分 TODO 提到的问题 2 years ago
jason 4a0fa2a3a4 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2 years ago
jason 3f51be6a2d 钱包。删除不需要的类 2 years ago
YunaiV e4b153a866 分佣:增加获得分销排行分页 API mock 2 years ago
YunaiV 5308e309ea 同步 https://gitee.com/zhijiantianya/yudao-cloud/pulls/51/files 2 years ago
YunaiV 4db3de8d86 Merge branch 'master' of https://github.com/YunaiV/ruoyi-vue-pro 2 years ago
芋道源码 a1f6826e14
Merge pull request #337 from freesme/fix-master-#319-wx-pay-client-error
修复:#319 微信支付初始化 client 客户端错误,导致发起支付报错
2 years ago
YunaiV b69d4e0852 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product 2 years ago
芋道源码 7870283bfa
!594 兼容spring web 配置上下文根路径的情况
Merge pull request !594 from suyh/master
2 years ago
owen 6a7be19d3a common: 增加InEnumCollectionValidator,用于校验枚举值列表参数的取值范围是否有䇅 2 years ago
YunaiV d982a95fdd Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2 years ago
YunaiV ba444c9538 code review:支付钱包 2 years ago
jason 457312d5aa 修改 PayClientFactory 创建 PayClient 方法 2 years ago
jason 7d4d3bea55 Revert "创建 PayClient 迁移到 PayChannelService"
This reverts commit 716727bfa7.
2 years ago
jason 716727bfa7 创建 PayClient 迁移到 PayChannelService 2 years ago
Krane e8662e35e1 修复:微信支付初始化 client 客户端错误,导致发起支付报错 2 years ago
YunaiV 6132443d26 code review:钱包实现 2 years ago
jason 7237bc07bb 钱包退款的实现 2 years ago
jason c7f6f92159 钱包支付 Client 的实现 2 years ago
YunaiV 8b98d13d8b Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2 years ago
YunaiV 1baa7f4aee 优化 AlipayPcPayClientTest 的方法命名,补全 assert 断言 2 years ago
YunaiV 35c1ba44d3 优化 AbstractAlipayClientTest、AlipayBarPayClientTest 的方法命名,补全 assert 断言 2 years ago
苏云弘 2acf5c878f 兼容spring boot web 提供的上下文根路径的匹配
spring.servlet.content-path
2 years ago
YunaiV 3dd273a30d Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2 years ago
YunaiV 7d99c6dbe8 Merge branch 'master' of https://github.com/YunaiV/ruoyi-vue-pro 2 years ago
芋道源码 544e650e15
Merge pull request #326 from Lemon-cc-hang/base
fix: 在调用 selectList() 的时候 如果 Collection 参数为空会报错 sql 异常
2 years ago
YunaiV acee734554 Merge branch 'master' of https://github.com/YunaiV/ruoyi-vue-pro 2 years ago
JUNHAO 5cc3e6510b 使用Parenthesis为原有表达式添加括号 2 years ago
jason b119aadba5 支付宝 条码支付 Client 单元测试 2 years ago
shizhong eb4434ecbc 解决MapStruct的时区问题 2 years ago
jason c0ffaf8ea9 支付宝 PC 网站 Client 单元测试 2 years ago
jason c7f0b5c73d 支付宝 H5 Client 单元测试 2 years ago
jason eff9fafde8 创建支付宝 Client 抽象类测试类, 测试公共方法 2 years ago
YunaiV e8c1bdde3d 会员中心:会员管理 50% 3 years ago
jason 6fbf7b261b 扫码支付统一退款单元测试, 修复退款失败,渠道错误未赋值bug 3 years ago
jason 1b03fdb08b 支付宝 扫码支付 统一下单 单元测试 3 years ago
YunaiV e4a2c738b2 订单:
1. 增加查询物流接口
3 years ago
lemoncc 5b9106fdb5
fix: 在调用 selectList() 的时候 如果 Collection 参数为空会报错 sql 异常 3 years ago
YunaiV 5fcd0a21da Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product 3 years ago
YunaiV 9ff67b479f !562 优化 redisCache 3 years ago
芋道源码 8960a82978
!562 优化 redisCache
Merge pull request !562 from wanwan/feature/redis_cache_optimize_20230810
3 years ago
wanwan 134e5ca20f feat: 将 redisCache 的扫描策略设置成 scan 3 years ago
wanwan 64c8dd6292 feat: 拓展 支持自定义过期时间的 RedisCacheManager 使支持自定义过期时间单位 3 years ago
wanwan c4a7da9233 Revert "feat: 拓展 支持自定义过期时间的 RedisCacheManager 使支持自定义过期时间单位"
This reverts commit 47698bfc6c.
3 years ago
wanwan e1fe21f24c Revert "feat: 将 redisCache 的扫描策略设置成 scan"
This reverts commit 72d2dcc68f.
3 years ago
jlc@yoc.tech 47698bfc6c feat: 拓展 支持自定义过期时间的 RedisCacheManager 使支持自定义过期时间单位 3 years ago
jlc@yoc.tech 72d2dcc68f feat: 将 redisCache 的扫描策略设置成 scan 3 years ago
xlsea ead8741393 调用微信App v3支付渠道返回参数解析错误 3 years ago
zhijiantianya@gmail.com ba59ec85e0 code review 各种活动 3 years ago
puhui999 384359c9d4 fix: 完善拼团、秒杀、砍价活动管理 3 years ago
puhui999 5f9184904a fix: 完善拼团、秒杀、砍价活动管理 3 years ago
YunaiV 222d1cf69b 增加对比新老数组的 C/U/D 对象 3 years ago
YunaiV 5e2fa48f20 code review:拼团、秒杀活动的代码 3 years ago
芋道源码 7a7ae3b8ec
!545 完善 review 拼团、秒杀活动的实现提到的问题
Merge pull request !545 from puhui999/feature/mall_product
3 years ago
YunaiV 105f1a2707 fix: banner 日志打印 3 years ago
puhui999 92b10e2ecf Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 3 years ago
puhui999 d156d43d63 fix:完善 review 拼团、秒杀活动的实现提到的问题 3 years ago
YunaiV 68049b85b9 基于 Redis 实现的 pubsub、stream 消息队列,支持开启或关闭。默认为关闭状态,项目启动更快 3 years ago
YunaiV ae98315616 增加模拟支付的订单号、退款号返回 3 years ago
YunaiV bf3e848c17 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product 3 years ago
YunaiV 5e7e3d816c 彻底移除 RedisKeyDefine 3 years ago
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
3 years ago
wcz a6ffb5d650 BaseMapperX.java少了几个方法,TradeCartMapper.java方法调整,BpmProcessInstanceServiceImpl.java多了 3 years ago
puhui999 446951bd11 fix:封装函数 convertCDUMap 作用:数据划分为需要新增的、还是删除的、还是更新的。 3 years ago
YunaiV 7f657ee931 优化 mp-java 库的依赖管理 3 years ago
YunaiV c33186569d 优化 mp 账号的刷新机制,使用 Job 轮询,替换 MQ 广播 3 years ago
YunaiV 859cf74a6c 对齐 boot 与 cloud 的代码 3 years ago
jason 6a38738760 新增模拟支付渠道,通知查询为空bug 修改 3 years ago
YunaiV 21b3744544 1.8.0 版本发布 3 years ago
YunaiV 14d7db0c60 对齐 boot 与 cloud 的代码 3 years ago
YunaiV 114f1e4833 对齐 boot 与 cloud 的代码 3 years ago
YunaiV a0417f182e Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product 3 years ago
YunaiV b84f7825c5 review 拼团、秒杀活动的实现 3 years ago
lwf 414c1be128 feature(使用redis缓存): 功能合并
1、缓存改为Redis缓存,不在启动时缓存,使用时候根据数据源缓存
2、前端登录接口调整
3 years ago
芋道源码 e2ed0b7afb
!530 完成拼团活动和秒杀活动 CRUD
Merge pull request !530 from puhui999/feature/mall_product
3 years ago
YunaiV d9522808eb 优化 LambdaQueryWrapperX 的 inIfPresent 判空逻辑 3 years ago
芋道源码 bd1153fbe2
!541 api记录日志耗时单位修改为毫秒
Merge pull request !541 from kinlon92/master
3 years ago
芋道源码 870873e480
!540 修复部分问题,升级依赖
Merge pull request !540 from xingyu/feature/captcha
3 years ago
YunaiV 7f0901e0bb 优化项目启动速度, 3 years ago
zjl 9d10c85be8 接口日志持续时间修改为毫秒单位 3 years ago
YunaiV 3a1694dea3 1. 微信 App 支付 WxAppPayClient 实现
2. 优化微信支付的下单逻辑,增加 build request 公用方法
3 years ago
YunaiV 0fcc0072c2 1. AlipayBarPayClient 增加小额支付的成功返回 3 years ago
YunaiV 5ae43a238d 1. 修复支付宝 App 发起报错的问题
2. 移除微信 H5 支付,基本没人使用,减少复杂性
3 years ago
puhui999 c9c176ea05 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 3 years ago
YunaiV 3a24d05bdc mall + pay:
1. 修复单元测试的报错
3 years ago
YunaiV 0e5e6c7ce0 mall + pay:
1. 增加微信退款的查询接口
3 years ago
YunaiV 5b066ea693 mall + pay:
1. 增加支付宝退款查询接口
3 years ago
YunaiV 15cca8f3de mall + pay:
1. 支付订单的状态同步 Job
2. 支付订单的过期关闭 Job
3 years ago
YunaiV 717caf527a mall + pay:
1. 增加微信支付 Client 的查询订单接口
3 years ago
YunaiV f46a037164 mall + pay:
1. 增加支付宝 Client 的查询订单接口
3 years ago
xingyu c95a1d0a7d chore: up springboot 2.10.13 3 years ago
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
3 years ago
zhijiantianya@gmail.com b54f7e9256 by gateway:
1. 完善部分 order 单元测试
2. 增加支付订单的 no 生成逻辑
3 years ago
YunaiV b84da30234 mall + pay:
1. 优化订单管理的接口实现
2. 支付状态增加 refund 类型,将 refund status 合并进去
3 years ago
YunaiV 888c488206 mall + pay:
1. 优化 PayClient 退款逻辑,返回业务失败 errorCode + errorMsg 错误码
3 years ago
zhijiantianya@gmail.com 3f410c2735 by gateway:
1. 补全 channel 单元测试
2. 完善部分 order 单元测试
3 years ago
YunaiV 1c282bd3cb mall + pay:
1. 优化 PayClient 退款逻辑,返回业务失败 errorCode + errorMsg 错误码
3 years ago
puhui999 d80bf5a368 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 3 years ago
YunaiV 6f475f8c85 mall + pay:
1. 优化 PayClient 支付逻辑,返回业务失败 errorCode + errorMsg 错误码
3 years ago
YunaiV 7cf4c5415e mall + pay:
1. 将 payNotifyUrl 统一改成 orderNotifyUrl
3 years ago
YunaiV d0a7f41875 mall + pay:
1. 完善微信支付的 V3 支付回调、退款回调
3 years ago
YunaiV 68a4ef98ca mall + pay:
1. 拆分支付回调、退款回调的 URL
2. 修复微信支付回调的时间解析错误
3 years ago
YunaiV 66ed61c641 mall + pay:
1. 微信支付配置,补全 apiclient_cert.p12 证书
3 years ago
YunaiV 7caf8e900f mall + pay:
1. 增加微信 bar 和 native 的集成测试,方便调试配置
3 years ago
YunaiV ecdc39612f mall + pay:
1. 后台的收银台,接入微信扫码支付
3 years ago
YunaiV c44ace6011 mall + pay:
1. 完成支付宝的退款重构
2. 完成 demo 模块的退款接入
3 years ago
YunaiV 518e89dc4b mall + pay:
1. 重构支付回调的逻辑,将回调解析改成 PayOrderRespDTO,为后续轮询做铺垫
2. 调整退款单的表结构
3. 调整退款调用的实现
3 years ago
puhui999 927f71c7e2 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 3 years ago
zhijiantianya@gmail.com 47ba5b7b44 by gateway: 支付渠道的代码优化 3 years ago