owen
|
dc46dff62c
|
Merge remote-tracking branch 'origin/feature/mall_product' into brokerate
|
2 years ago |
|
owen
|
f30fa39067
|
修改Review代码
|
2 years ago |
|
owen
|
bbd18afbcc
|
分佣: 简化推广用户关系树查询方式
|
2 years ago |
|
owen
|
6e6486ccae
|
Trade: 完善配置
|
2 years ago |
|
owen
|
ad0513c87c
|
分佣: 推广人列表
|
2 years ago |
YunaiV
|
bf40767fa1
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2 years ago |
|
YunaiV
|
7c4fbc63dc
|
trade：物流费用计算，增加金额 divide 分拆逻辑
|
2 years ago |
|
owen
|
ee15b802b2
|
分佣: 推广人排行
|
2 years ago |
|
owen
|
972b01c001
|
分佣: 佣金排行
|
2 years ago |
jason
|
92f6c8f4d6
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2 years ago |
|
jason
|
910ffa7a5a
|
钱包充值退款
|
2 years ago |
|
owen
|
7a8a440eb6
|
分佣: 佣金记录
|
2 years ago |
|
owen
|
eddc897cd8
|
分佣: 提现记录
|
2 years ago |
|
owen
|
637ae8ce1d
|
分佣: 提现记录
|
2 years ago |
|
owen
|
c146c98b72
|
分佣: 提现
|
2 years ago |
|
owen
|
f72a087007
|
分佣: 我的推广统计接口
|
2 years ago |
|
owen
|
594e4d5fee
|
system: uniapp增加字典数据查询接口
|
2 years ago |
|
owen
|
a7de955926
|
trade: 分销业务 - 提现申请
|
2 years ago |
|
owen
|
5ed99a9105
|
trade: 分销业务 - 整理包名
|
2 years ago |
|
YunaiV
|
24111c1548
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2 years ago |
|
YunaiV
|
5949727c8d
|
trade：全局配送价格配置
|
2 years ago |
|
jason
|
c880dbfa60
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2 years ago |
|
jason
|
dbd7ab5f23
|
code review 修改
|
2 years ago |
|
YunaiV
|
35569c5ec8
|
trade：下单时，如果是门店自提，增加核销码的生成
|
2 years ago |
|
YunaiV
|
1b477aaa0d
|
trade：优化下单逻辑的实现
|
2 years ago |
|
YunaiV
|
c766f7daa5
|
code review：砍价、秒杀的逻辑
|
2 years ago |
|
YunaiV
|
1b154699c6
|
code review：处理错误的 mysql 连接
|
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
|
962f2bbf69
|
code review：提现逻辑
|
2 years ago |
|
芋道源码
|
de7699d972
|
!624 trade: 分销业务 - 佣金提现
Merge pull request !624 from 疯狂的世界/brokerate
|
2 years ago |
|
owen
|
e22c577f7a
|
trade: 分销业务 - 佣金提现后台管理
|
2 years ago |
|
YunaiV
|
8cfb738db3
|
code review：分销逻辑
|
2 years ago |
|
owen
|
32e1fc66ce
|
trade: 分销业务 - 佣金提现后台管理
|
2 years ago |
|
芋道源码
|
581f9d4101
|
!622 trade: 分销业务review代码修改
Merge pull request !622 from 疯狂的世界/brokerate
|
2 years ago |
puhui999
|
04a391cd4b
|
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/api/combination/CombinationActivityApiImpl.java
|
2 years ago |
|
puhui999
|
408df683d8
|
秒杀活动: 完善 app 端获取活动分页、列表、详情接口
|
2 years ago |
|
owen
|
f998d43e68
|
infra: 修正 查询实体列表方法，传入的ID集合为空时，会导致异常的问题
|
2 years ago |
|
owen
|
a3e161a9a3
|
trade: 分销业务review代码修改
|
2 years ago |
|
owen
|
a3e8b42be6
|
trade: 分销业务review代码修改
|
2 years ago |
|
puhui999
|
af6016bba5
|
砍价活动: 完善 app 端获取活动分页、列表、详情接口
|
2 years ago |
|
owen
|
75874035a4
|
Merge remote-tracking branch 'origin/feature/mall_product' into brokerate
|
2 years ago |
|
YunaiV
|
be1ecf96d4
|
code review：会员签到逻辑
|
2 years ago |
|
YunaiV
|
477342d324
|
Merge branch 'feature/mall_product' of https://gitee.com/SummerQing/ruoyi-vue-pro into feature/mall_product
|
2 years ago |
|
YunaiV
|
080c32b9f3
|
code review：钱包充值
|
2 years ago |
|
owen
|
a52e490c86
|
Merge remote-tracking branch 'origin/feature/mall_product' into brokerate
|
2 years ago |
xiaqing
|
d4a891e6c4
|
新增两个APP端接口
1.获取用户个人签到信息
2.用户签到接接口
|
2 years ago |
|
xiaqing
|
0907ca2081
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2 years ago |
|
jason
|
bbc16bb937
|
钱包充值 Mapper 类
|
2 years ago |
|
owen
|
73e4976ae4
|
Merge remote-tracking branch 'origin/feature/mall_product' into brokerate
|
2 years ago |
|
xiaqing
|
e893cfd757
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
# Conflicts:
# yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/signin/MemberSignInRecordConvert.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/signin/MemberSignInRecordMapper.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/signin/MemberSignInRecordService.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/signin/MemberSignInRecordServiceImpl.java
|
2 years ago |