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
5,431 Commits 1 Branch 0 Tags 176 MiB
989d7c44d0
Commit Graph

884 Commits

Author SHA1 Message Date
owen
d0f0bc5888 分销：调整推广人列表查询方式 2023-10-02 23:51:49 +08:00
YunaiV
1f910992d6 trade：新增是否自提的配置项 2023-10-02 21:18:52 +08:00
j-sentinel
2f0483ce9f [新增][定时任务]重新申请 ApiAccessLog、ApiErrorLog、JobLog 3个日志的定时清理 2023-10-02 19:18:36 +08:00
YunaiV
6f4c04d944 trade：完善退款详情 2023-10-02 15:44:41 +08:00
YunaiV
f8b4a08fae code review：访问日志、错误日志的清理 Job 实现 2023-10-02 00:06:28 +08:00
YunaiV
d4417d2474 code review：积分、优惠劵、佣金等逻辑 2023-10-01 23:31:07 +08:00
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
 2023-10-01 22:00:31 +08:00
芋道源码
4f7d6b4959
!643 订单：完善拼团活动和一些 TODO 
Merge pull request !643 from puhui999/feature/mall_product
 2023-10-01 13:56:43 +00:00
j-sentinel
11921fab5a [新增][定时任务]ApiAccessLog、ApiErrorLog、JobLog 3个日志的定时清理 2023-10-01 16:53:17 +08:00
puhui999
d3f03540f8 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 2023-09-30 23:35:19 +08:00
owen
cafa938ff4 common：LocalDateTimeUtils 增加方法：月份开始时间、月份结束时间 2023-09-30 22:21:47 +08:00
YunaiV
3489144757 新任务：日志的清理 job 2023-09-30 12:31:18 +08:00
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
 2023-09-30 11:35:51 +08:00
puhui999
0b35d4a7e3 订单：完善拼团活动部分 TODO 2023-09-30 11:27:24 +08:00
owen
26628913cb 错误码分段 2023-09-29 21:34:38 +08:00
kehaiyou
7d497ce09b feat: 【工作流】--加签 2023-09-29 14:57:28 +08:00
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
 2023-09-29 14:06:12 +08:00
jason
aa2f651124 Pay: 转账单实现 2023-09-29 13:50:06 +08:00
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
 2023-09-28 15:18:59 +08:00
YunaiV
53bd1b9ec1 trade：订单评论超时时，自动评论 2023-09-26 23:50:54 +08:00
jason
437185cb1d Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-09-25 10:48:32 +08:00
jason
6fcff0863a 支付宝统一退款接口 subCode == ACQ.SYSTEM_ERROR 返回 WAITING 状态 2023-09-25 10:43:23 +08:00
YunaiV
e384b810bf code review：分销逻辑 2023-09-25 09:39:39 +08:00
jason
0f0e6eb8ba Pay Client 新增转账接口 2023-09-25 08:34:58 +08:00
YunaiV
83a133b344 bpm：优化 BpmnModelUtils 2023-09-24 23:06:04 +08:00
owen
e9fd377772 分销：Review代码修改 2023-09-24 20:28:44 +08:00
YunaiV
0b649fd3e1 bpm：简化获得可回退节点的实现 2023-09-24 16:08:50 +08:00
YunaiV
421bb7d154 code review：分销逻辑 2023-09-24 11:56:00 +08:00
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
 2023-09-24 10:10:53 +08:00
owen
29b806e675 Framework：增加LocalDate、LocalTime序列化 2023-09-24 09:57:09 +08:00
kehaiyou
b13f71424b feat: 工作流-》流程实例的任务节点回退 2023-09-23 14:47:34 +08:00
owen
f30fa39067 修改Review代码 2023-09-22 23:15:10 +08:00
puhui999
6ef94ade6a 完善订单和活动 review 提到的问题 2023-09-20 16:06:29 +08:00
YunaiV
c766f7daa5 code review：砍价、秒杀的逻辑 2023-09-20 01:07:41 +08:00
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
 2023-09-20 00:03:18 +08:00
YunaiV
9630f236f8 Merge branch 'feature/auth' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
 Conflicts:
	README.md
 2023-09-19 22:28:45 +08:00
YunaiV
8cfb738db3 code review：分销逻辑 2023-09-19 22:16:25 +08:00
puhui999
408df683d8 秒杀活动: 完善 app 端获取活动分页、列表、详情接口 2023-09-19 18:57:28 +08:00
owen
a3e8b42be6 trade: 分销业务review代码修改 2023-09-19 16:37:51 +08:00
YunaiV
b81ebe6f19 修复 common 下的 test 引入不正确的问题，减少包依赖大小 2023-09-17 01:37:10 +08:00
YunaiV
436fef7efa 1. 移除 netty-all，减少依赖 
2. 修复 xss 无法禁用的问题
 2023-09-17 00:37:11 +08:00
YunaiV
222daa5366 pay 缓存，使用 guava 替代 job 扫描，目的：提升启动速度，加快缓存失效 2023-09-16 23:22:58 +08:00
YunaiV
ab800aa891 1. 简化 JsonUtils 初始化方式，去掉 BeanPostProcessor 
2. 减少日志打印

目的：优化启动速度
 2023-09-16 18:05:50 +08:00
YunaiV
50371b3676 1. 禁用 member 模块 
2. 减少 mybatis 日志打印
3. 降低 local 环境的初始连接

目的：提升项目的启动速度
 2023-09-16 17:04:59 +08:00
YunaiV
ebb3a04251 优化多租户 Job 的实现，采用 AOP 替代 BeanPostProcessor，提升启动速度 2023-09-16 14:06:15 +08:00
YunaiV
808ff6abb9 默认禁用 lock4j 依赖，保证启动速度 2023-09-16 13:14:40 +08:00
YunaiV
f0f5b52150 默认禁用 quartz 依赖，保证启动速度 2023-09-16 12:50:36 +08:00
YunaiV
08d39d4593 默认禁用 resilience4j 依赖，保证启动速度 2023-09-16 12:01:49 +08:00
xingyu
437131cc7a Merge remote-tracking branch 'origin/master' into feature/auth 
# Conflicts:
#	yudao-dependencies/pom.xml
 2023-09-13 12:00:10 +08:00
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
 2023-09-11 16:19:55 +08:00
xingyu
5e9e41c045 fix: required 过期 2023-09-11 12:30:33 +08:00
xingyu
1184b46c40 chore: up justauth 1.0.4 2023-09-11 12:21:46 +08:00
YunaiV
314dee430e bugfix：微信公众号登录报 access token 的问题 2023-09-11 11:06:42 +08:00
YunaiV
a5e33f6d3a 引入 mybatis plus join 作为基类 2023-09-09 14:56:30 +08:00
YunaiV
55f8585ea8 同步 2023-09-09 10:34:58 +08:00
芋道源码
3b5215db21
!611 分销用户管理、Review代码修改 
Merge pull request !611 from 疯狂的世界/brokerate
 2023-09-09 00:48:00 +00:00
YunaiV
87c55784c4 code review：营销活动+订单 2023-09-09 01:27:55 +08:00
owen
ddcebb1986 common: MoneyUtils 移到 common 模块 2023-09-08 12:46:43 +08:00
puhui999
5d6bb84d25 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 2023-09-08 00:59:53 +08:00
YunaiV
5808f77ade code review：订单分佣 2023-09-08 00:29:25 +08:00
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
 2023-09-06 23:50:55 +08:00
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
 2023-09-06 21:40:53 +08:00
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