Commits · f284b690b47229dd9f9fedd92bd32da8c89be42a · order-group-application / order-group · GitLab

13 Oct, 2020 3 commits
- Merge remote-tracking branch 'origin/feature/2.0.1-collageOrder-刘鹏飞' into… · f284b690
```
Merge remote-tracking branch 'origin/feature/2.0.1-collageOrder-刘鹏飞' into feature/2.0.1-collageOrder-刘鹏飞
```
  刘鹏飞 committed Oct 13, 2020
  f284b690 Browse Files
- 拼单详情去除分摊金额 · 1b463e64
  刘鹏飞 committed Oct 13, 2020
  
  1b463e64 Browse Files
- 拼单购物车获取用户昵称字段适配修改 · b747f7ae
  缪晖 committed Oct 13, 2020
  
  b747f7ae Browse Files
12 Oct, 2020 11 commits
- 拼单购物车版本号加添加有效时间-拼单的有效时间 · 9bc3acb8
  刘鹏飞 committed Oct 12, 2020
  
  9bc3acb8 Browse Files
- 清除拼单订单缓存接口提交 · e1097059
  缪晖 committed Oct 12, 2020
  
  e1097059 Browse Files
- Merge remote-tracking branch 'origin/feature/2.0.1-collageOrder-刘鹏飞' into… · 8bd501f5
```
Merge remote-tracking branch 'origin/feature/2.0.1-collageOrder-刘鹏飞' into feature/2.0.1-collageOrder-刘鹏飞
```
  刘鹏飞 committed Oct 12, 2020
  8bd501f5 Browse Files
- 加入拼单，会员结构修改 · ab36f29c
  刘鹏飞 committed Oct 12, 2020
  
  ab36f29c Browse Files
- 拼单订单创建对象转换添加marketing信息 · 279927e6
  缪晖 committed Oct 12, 2020
  
  279927e6 Browse Files
- 获取拼单订单详情 · 0625bdc0
  刘鹏飞 committed Oct 12, 2020
  
  0625bdc0 Browse Files
- 购物车商品行添加购物人头像 · c03e8fa7
  刘鹏飞 committed Oct 12, 2020
  
  c03e8fa7 Browse Files
- 针对用户选好了的状态修改 · fe353c5d
  刘鹏飞 committed Oct 12, 2020
  
  fe353c5d Browse Files
- 判断同一门店下用户拼单超期逻辑修改 · f0f26b45
  缪晖 committed Oct 12, 2020
  
  f0f26b45 Browse Files
- 拼单创建加购人信息初始化修改 · 1c83c06a
  缪晖 committed Oct 12, 2020
  
  1c83c06a Browse Files
- 订单聚合创建订单涉及拼单新增加购人参数添加 · f652f48c
  缪晖 committed Oct 12, 2020
  
  f652f48c Browse Files
10 Oct, 2020 2 commits
- 订单聚合服务添加拼单加购人信息字段 · 068cd952
  缪晖 committed Oct 10, 2020
  
  068cd952 Browse Files
- redis操作改为RedisCache进行操作 · c5ebf3d4
  刘鹏飞 committed Oct 10, 2020
  
  c5ebf3d4 Browse Files
09 Oct, 2020 9 commits
- 拼单订单初始化TTL · 366cde99
  缪晖 committed Oct 09, 2020
  
  366cde99 Browse Files
- Merge branch 'feature/2.0.1-collageOrder-刘鹏飞' of… · 4a8751c3
```
Merge branch 'feature/2.0.1-collageOrder-刘鹏飞' of http://gitlab.freemud.com/order-group-application/order-group into feature/2.0.1-collageOrder-刘鹏飞
```
  缪晖 committed Oct 09, 2020
  4a8751c3 Browse Files
- Revert "拼单初始化TTL设置" · 40e4f6b9
```
This reverts commit 26097f03.
```
  缪晖 committed Oct 09, 2020
  40e4f6b9 Browse Files
- 拼单初始化TTL设置 · 26097f03
  缪晖 committed Oct 09, 2020
  
  26097f03 Browse Files
- 修改方法名 · a9c97ac5
  刘鹏飞 committed Oct 09, 2020
  
  a9c97ac5 Browse Files
- 购物车添加创单时调用的接口 · ea26e3f0
  刘鹏飞 committed Oct 09, 2020
  
  ea26e3f0 Browse Files
- 订单创建时初始化发起人餐位以及门店拼单客户列表，拼单取消时添加清除操作 · f4e45717
  缪晖 committed Oct 09, 2020
  
  f4e45717 Browse Files
- 加入、退出拼单 · 5c68844c
  刘鹏飞 committed Oct 09, 2020
  
  5c68844c Browse Files
- 拼单购物车清空增加点餐位的清空 · b950e0ec
  刘鹏飞 committed Oct 09, 2020
  
  b950e0ec Browse Files
30 Sep, 2020 3 commits
- 拼单购物车个人清除清除 · 80cb7cc5
  刘鹏飞 committed Sep 30, 2020
  
  80cb7cc5 Browse Files
- 拼单购物车出参添加用户区分商品行 · 5b4aa878
  刘鹏飞 committed Sep 30, 2020
  
  5b4aa878 Browse Files
- 拼单购物车人员标识改为userId · dd4bb338
  刘鹏飞 committed Sep 30, 2020
  
  dd4bb338 Browse Files
29 Sep, 2020 7 commits
- 【ID1010972】多人拼单添加拼单锁定状态返回 · 0061ea47
  缪晖 committed Sep 29, 2020
  
  0061ea47 Browse Files
- 【ID1010972】多人拼单订单锁定解锁代码优化 · d1d12ff8
  缪晖 committed Sep 29, 2020
  
  d1d12ff8 Browse Files
- 【ID1010972】多人拼单错误信息提示类型添加 · 9be1aa42
  缪晖 committed Sep 29, 2020
  
  9be1aa42 Browse Files
- 拼单购物车方法判断修改 · 3175c831
  刘鹏飞 committed Sep 29, 2020
  
  3175c831 Browse Files
- 冲突解决 · df54eac0
  刘鹏飞 committed Sep 29, 2020
  
  df54eac0 Browse Files
- 【ID1010972】多人拼单处理冲突 · 72a57bf1
  缪晖 committed Sep 29, 2020
  
  72a57bf1 Browse Files
- 【ID1010972】多人拼单订单购物车代码分离结构调整 · 39f92567
  缪晖 committed Sep 29, 2020
  
  39f92567 Browse Files
28 Sep, 2020 5 commits
- 冲突解决 · 3b205551
  刘鹏飞 committed Sep 28, 2020
  
  3b205551 Browse Files
- 拼单购物车相关 · f52b99a4
  刘鹏飞 committed Sep 28, 2020
  
  f52b99a4 Browse Files
- 【ID1010972】多人拼单 · 3358e20b
  缪晖 committed Sep 28, 2020
  
  3358e20b Browse Files
- 【ID1010972】多人拼单 · 4a576e8f
```
购物车聚合拼单订单相关接口swagger注解补充
```
  缪晖 committed Sep 28, 2020
  4a576e8f Browse Files
- 1010972 多人拼单拼单订单相关 · 1ae09d3c
```
1、拼单订单创建
2、拼单订单信息查询
3、拼单订单取消
```
  缪晖 committed Sep 28, 2020
  1ae09d3c Browse Files