821 Commits (abfebebdd5d3fd2f668dd5f71879d64f8bce1ebf)

Author SHA1 Message Date
owen cafa938ff4 common:LocalDateTimeUtils 增加方法:月份开始时间、月份结束时间 2 years ago
YunaiV 3489144757 新任务:日志的清理 job 2 years ago
owen 26628913cb 错误码分段 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