BJ_ZTEITS-Developers / parking-cloud-yudao | GitLab

22 Sep, 2023

19 commits

Merge remote-tracking branch 'origin/feature/mall_product' into brokerate
dc46dff6

owen authored
2023-09-22 23:15:31 +0800
Browse Code »
修改Review代码
f30fa390

owen authored
2023-09-22 23:15:10 +0800
Browse Code »
分佣: 简化推广用户关系树查询方式
bbd18afb

owen authored
2023-09-22 23:13:39 +0800
Browse Code »
Trade: 完善配置
6e6486cc

owen authored
2023-09-22 22:51:46 +0800
Browse Code »
分佣: 推广人列表
ad0513c8

owen authored
2023-09-22 22:12:15 +0800
Browse Code »
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
bf40767f

YunaiV authored
2023-09-22 21:56:17 +0800
Browse Code »
trade：物流费用计算，增加金额 divide 分拆逻辑
7c4fbc63

YunaiV authored
2023-09-22 21:56:09 +0800
Browse Code »
分佣: 推广人排行
ee15b802

owen authored
2023-09-22 21:12:09 +0800
Browse Code »
分佣: 佣金排行
972b01c0

owen authored
2023-09-22 20:55:05 +0800
Browse Code »
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
92f6c8f4

jason authored
2023-09-22 19:05:20 +0800
Browse Code »
钱包充值退款
910ffa7a

jason authored
2023-09-22 19:04:59 +0800
Browse Code »
分佣: 佣金记录
7a8a440e

owen authored
2023-09-22 18:49:26 +0800
Browse Code »
分佣: 提现记录
eddc897c

owen authored
2023-09-22 18:48:16 +0800
Browse Code »
分佣: 提现记录
637ae8ce

owen authored
2023-09-22 18:35:43 +0800
Browse Code »
分佣: 提现
c146c98b

owen authored
2023-09-22 18:06:11 +0800
Browse Code »
分佣: 我的推广统计接口
f72a0870

owen authored
2023-09-22 15:42:59 +0800
Browse Code »
system: uniapp增加字典数据查询接口
594e4d5f

owen authored
2023-09-22 15:11:06 +0800
Browse Code »
trade: 分销业务 - 提现申请
a7de9559

owen authored
2023-09-22 00:27:45 +0800
Browse Code »
trade: 分销业务 - 整理包名
5ed99a91

owen authored
2023-09-22 00:26:32 +0800
Browse Code »

21 Sep, 2023

4 commits

Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
24111c15

YunaiV authored
2023-09-21 22:02:30 +0800
Browse Code »
trade：全局配送价格配置
5949727c

YunaiV authored
2023-09-21 22:02:22 +0800
Browse Code »
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
c880dbfa

jason authored
2023-09-21 17:32:43 +0800
Browse Code »
code review 修改
dbd7ab5f

jason authored
2023-09-21 17:31:58 +0800
Browse Code »

20 Sep, 2023

5 commits

trade：下单时，如果是门店自提，增加核销码的生成
35569c5e

YunaiV authored
2023-09-20 23:21:00 +0800
Browse Code »
trade：优化下单逻辑的实现
1b477aaa

YunaiV authored
2023-09-20 20:21:41 +0800
Browse Code »
code review：砍价、秒杀的逻辑
c766f7da

YunaiV authored
2023-09-20 01:07:41 +0800
Browse Code »
code review：处理错误的 mysql 连接
1b154699

YunaiV authored
2023-09-20 00:10:18 +0800
Browse Code »
Merge branch 'feature/mall_product' of https://gitee.com/puhui999/ruoyi-vue-pro … ...
2278ad46
```
…into feature/mall_product

 Conflicts:
	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java
```
YunaiV authored
2023-09-20 00:03:18 +0800
Browse Code »

19 Sep, 2023

12 commits

code review：提现逻辑
962f2bbf

YunaiV authored
2023-09-19 23:58:16 +0800
Browse Code »
!624 trade: 分销业务 - 佣金提现 ...
de7699d9
```
Merge pull request !624 from 疯狂的世界/brokerate
```
芋道源码 authored
2023-09-19 14:25:43 +0000
Browse Code »
trade: 分销业务 - 佣金提现后台管理
e22c577f

owen authored
2023-09-19 22:20:32 +0800
Browse Code »
code review：分销逻辑
8cfb738d

YunaiV authored
2023-09-19 22:16:25 +0800
Browse Code »
trade: 分销业务 - 佣金提现后台管理
32e1fc66

owen authored
2023-09-19 22:03:28 +0800
Browse Code »
!622 trade: 分销业务review代码修改 ...
581f9d41
```
Merge pull request !622 from 疯狂的世界/brokerate
```
芋道源码 authored
2023-09-19 13:48:07 +0000
Browse Code »
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product ...
04a391cd
```
# Conflicts:
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/api/combination/CombinationActivityApiImpl.java
```
puhui999 authored
2023-09-19 18:58:53 +0800
Browse Code »
秒杀活动: 完善 app 端获取活动分页、列表、详情接口
408df683

puhui999 authored
2023-09-19 18:57:28 +0800
Browse Code »
infra: 修正查询实体列表方法，传入的ID集合为空时，会导致异常的问题
f998d43e

owen authored
2023-09-19 17:14:42 +0800
Browse Code »
trade: 分销业务review代码修改
a3e161a9

owen authored
2023-09-19 16:50:43 +0800
Browse Code »
trade: 分销业务review代码修改
a3e8b42b

owen authored
2023-09-19 16:37:51 +0800
Browse Code »
砍价活动: 完善 app 端获取活动分页、列表、详情接口
af6016bb

puhui999 authored
2023-09-19 16:35:21 +0800
Browse Code »