Commit Graph

4913 Commits

Author SHA1 Message Date
芋道源码
e2ed0b7afb
!530 完成拼团活动和秒杀活动 CRUD
Merge pull request !530 from puhui999/feature/mall_product
2023-07-26 05:01:00 +00:00
芋道源码
c42ff645d1
Merge pull request #252 from zqd123/master
fix: yudao-ui-admin前端-Cron表达式-周选择第4项,#号两边的值颠倒了
2023-07-26 12:36:22 +08:00
芋道源码
91769f0b75
!543 适配postgres数据库sql脚本
Merge pull request !543 from 御码滴汉子/dev-fix-sql4pg
2023-07-25 23:54:08 +00:00
congqing
1dee258c18 适配postgres数据库sql脚本
infra_codegen_table表增加front_type字段
member_user表部分字段增加默认值
system_menu表permission增加默认值
2023-07-26 01:22:42 +08:00
YunaiV
d9522808eb 优化 LambdaQueryWrapperX 的 inIfPresent 判空逻辑 2023-07-25 20:58:44 +08:00
YunaiV
8e51de5349 修复“删除流程模型方法 有注释写错” 2023-07-25 20:33:41 +08:00
YunaiV
91aacefc3d Merge branch 'master-cq' of https://gitee.com/congqinggit/ruoyi-vue-pro
 Conflicts:
	sql/postgresql/ruoyi-vue-pro.sql
2023-07-25 20:13:17 +08:00
芋道源码
eb0a1eb293
!533 vue3代码生成器表单Editor属性修正为v-model
Merge pull request !533 from 赤鷹/master
2023-07-25 12:06:23 +00:00
芋道源码
d1796e51ff
!536 update yudao-ui-admin/src/components/VideoUpload/index.vue.
Merge pull request !536 from zbk/N/A
2023-07-25 12:05:11 +00: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
芋道源码
999dfd7c4a
!542 同步支付中心、商城最新实现
Merge pull request !542 from 芋道源码/feature/mall_product
2023-07-25 11:09:10 +00:00
YunaiV
7f0901e0bb 优化项目启动速度, 2023-07-25 08:39:28 +08:00
YunaiV
7c165fb1f6 1. 完善 PayNotifyServiceImpl 的单元测试 2023-07-24 23:04:38 +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
zhijiantianya@gmail.com
73e1158836 by gateway:
1. notify 部分单元测试
2023-07-24 20:11:21 +08:00
puhui999
c9c176ea05 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 2023-07-24 17:30:54 +08:00
puhui999
7957cfa50d fix:优化拼团与订单集成逻辑 2023-07-24 17:29:51 +08:00
puhui999
8d13ecc9c8 fix:优化订单发货逻辑使其支持一单分发 2023-07-24 15:14:16 +08:00
YunaiV
00e1c30f57 1. 修复创建支付应用,界面会报错的问题
2. 同步最新 SQL 文件
2023-07-24 12:51:14 +08:00
YunaiV
3f988a890d 完善“支付系统”的说明 2023-07-24 08:46:12 +08:00
YunaiV
3a24d05bdc mall + pay:
1. 修复单元测试的报错
2023-07-24 07:04:11 +08:00
YunaiV
6aea461e8d mall + pay:
1. 完善 PayRefundServiceTest 的单元测试
2023-07-23 23:20:52 +08:00
YunaiV
ebeb14be2f mall + pay:
1. 完善 PayRefundServiceTest 的单元测试
2023-07-23 22:29:33 +08:00
YunaiV
9812881094 mall + pay:
1. 增加退款同步的 Job
2023-07-23 21:16:03 +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
ac5646b84d mall + pay:
1. 支付订单的过期关闭 Job[单测]
2023-07-22 19:53:48 +08:00
YunaiV
cc853a2b92 mall + pay:
1. 支付订单的状态同步 Job[单测]
2023-07-22 17:47:58 +08:00
YunaiV
15cca8f3de mall + pay:
1. 支付订单的状态同步 Job
2. 支付订单的过期关闭 Job
2023-07-22 15:48:45 +08:00
YunaiV
348d073718 mall + pay:
1. 发起支付时,增加实际已支付的二次校验,避免重复支付
2023-07-22 13:19:22 +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
zhijiantianya@gmail.com
b426c63eeb Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-07-21 22:02:50 +08:00
zhijiantianya@gmail.com
e27ec2fd50 by gateway:
1. 完善部分 refund 单元测试
2023-07-21 22:02:39 +08:00
YunaiV
f92a5899f3 mall + pay:
1. 简化微信支付的配置界面
2023-07-21 21:50:05 +08:00
xingyu
d556877b13 chore: use xingyuv jushauth 2023-07-21 17:55:47 +08:00
xingyu
c95a1d0a7d chore: up springboot 2.10.13 2023-07-21 17:53:40 +08:00
xingyu
6c5ea2bc11 Merge remote-tracking branch 'origin/master' into feature/captcha 2023-07-21 17:43:05 +08:00
xingyu
91b4280625 fix: vben form bug 2023-07-21 17:40:27 +08:00
puhui999
f23e1b857a fix:合并差异修正 2023-07-21 16:54:58 +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
puhui999
259807600a feat:拼团订单集成 2023-07-21 16:47:04 +08:00
YunaiV
29d61beb11 mall + pay:
1. 简化支付宝支付的配置界面
2023-07-21 13:49:42 +08:00
YunaiV
da529851bd mall + pay:
1. 简化支付宝支付的配置界面
2023-07-21 09:19:59 +08:00
YunaiV
654b70c514 mall + pay:
1. 增加通知管理
2023-07-20 22:48:06 +08:00
zhijiantianya@gmail.com
b54f7e9256 by gateway:
1. 完善部分 order 单元测试
2. 增加支付订单的 no 生成逻辑
2023-07-20 20:07:44 +08:00