puhui999
|
c8a9d68933
|
拼团活动:完善 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 |
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 |