YunaiV
|
d0caa77f80
|
Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2 years ago |
|
YunaiV
|
9697aee898
|
code review：钱包的逻辑
|
2 years ago |
|
YunaiV
|
3bb3e4caf6
|
code review：工作流的加减签
|
2 years ago |
kehaiyou
|
aca65a66b5
|
feat: 【工作流】--加减签review修改
|
2 years ago |
jason
|
db0fbf0596
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2 years ago |
|
jason
|
183206e2d3
|
转账 - 支付宝转账修改, 支付宝 Client 支持公钥证书模式
|
2 years ago |
|
芋道源码
|
8bd1942083
|
!676 交易：核销订单
Merge pull request !676 from 疯狂的世界/feature/mall_product
|
2 years ago |
|
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
|
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
|
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 接口
|
3 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
|
3 years ago |
|
owen
|
b7359706db
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
3 years ago |
|
owen
|
d0f0bc5888
|
分销：调整推广人列表查询方式
|
3 years ago |
|
YunaiV
|
1f910992d6
|
trade：新增是否自提的配置项
|
3 years ago |
j-sentinel
|
2f0483ce9f
|
[新增][定时任务]重新申请 ApiAccessLog、ApiErrorLog、JobLog 3个日志的定时清理
|
3 years ago |
|
YunaiV
|
6f4c04d944
|
trade：完善退款详情
|
3 years ago |
|
YunaiV
|
f8b4a08fae
|
code review：访问日志、错误日志的清理 Job 实现
|
3 years ago |
|
YunaiV
|
d4417d2474
|
code review：积分、优惠劵、佣金等逻辑
|
3 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
|
3 years ago |
|
芋道源码
|
4f7d6b4959
|
!643 订单：完善拼团活动和一些 TODO
Merge pull request !643 from puhui999/feature/mall_product
|
3 years ago |
|
j-sentinel
|
11921fab5a
|
[新增][定时任务]ApiAccessLog、ApiErrorLog、JobLog 3个日志的定时清理
|
3 years ago |
|
puhui999
|
d3f03540f8
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
|
3 years ago |
|
owen
|
cafa938ff4
|
common：LocalDateTimeUtils 增加方法：月份开始时间、月份结束时间
|
3 years ago |
|
YunaiV
|
3489144757
|
新任务：日志的清理 job
|
3 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
|
3 years ago |
|
puhui999
|
0b35d4a7e3
|
订单：完善拼团活动部分 TODO
|
3 years ago |
|
owen
|
26628913cb
|
错误码分段
|
3 years ago |
kehaiyou
|
7d497ce09b
|
feat: 【工作流】--加签
|
3 years ago |