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

01 Dec, 2020 16 commits
- Merge branch 'feature/2.0.1-collageOrder-刘鹏飞' into 'develop' · cf5aa074
```
清除自己的购物车调整

See merge request !27
```
  缪晖 committed Dec 01, 2020
  cf5aa074 Browse Files
- 清除自己的购物车调整 · 1389e782
  缪晖 committed Dec 01, 2020
  
  1389e782 Browse Files
- 购物车SDK版本升级 · 28ad0d9b
  缪晖 committed Dec 01, 2020
  
  28ad0d9b Browse Files
- Update OrderServiceImpl.java · afa8da80
  缪晖 committed Dec 01, 2020
  
  afa8da80 Browse Files
- Merge branch 'feature/2.0.1-collageOrder-刘鹏飞' into develop · 1a4309a3
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
```
  缪晖 committed Dec 01, 2020
  1a4309a3 Browse Files
- 拼单订单新增状态及订单编号回传机制 · 773ff967
  缪晖 committed Dec 01, 2020
  
  773ff967 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into develop · afd8fe1a
  刘鹏飞 committed Dec 01, 2020
  
  afd8fe1a Browse Files
- Merge remote-tracking branch 'origin/feature/coco-payGift-刘鹏飞' into feature/coco-payGift-刘鹏飞 · 5d3b043b
  刘鹏飞 committed Dec 01, 2020
  
  5d3b043b Browse Files
- 创单查询购物车赠品增加买一赠一寄件活动 · 2faf13d4
  刘鹏飞 committed Dec 01, 2020
  
  2faf13d4 Browse Files
- 被冲代码补上 · 539929ff
  缪晖 committed Dec 01, 2020
  
  539929ff Browse Files
- ordercenter sdk 升级 · f6fafe4d
  张志恒 committed Dec 01, 2020
  
  f6fafe4d Browse Files
- Merge branch 'feature/2.0.1-collageOrder-刘鹏飞' into develop · 6b689cb8
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/ActivityCalculationDiscountResponseDto.java
```
  缪晖 committed Dec 01, 2020
  6b689cb8 Browse Files
- 群收款去除门店ID · 9b003526
  缪晖 committed Dec 01, 2020
  
  9b003526 Browse Files
- 配送进程 · 02951072
  邓杰 committed Dec 01, 2020
  
  02951072 Browse Files
- Merge branch '20201127_coco配送进程' into develop · f2dd6fcf
  邓杰 committed Dec 01, 2020
  
  f2dd6fcf Browse Files
- 配送进程 · ec942dc6
  邓杰 committed Dec 01, 2020
  
  ec942dc6 Browse Files
30 Nov, 2020 24 commits
- 代码合并冲突丢失补全与createTime字段类型统一成Long,聚合订单sdk升级 · 3a6bc3c9
  ping.wu committed Nov 30, 2020
  
  3a6bc3c9 Browse Files
- Merge branches 'develop' and 'feature/20201125_多规格商品下添加单规格商品_yu.sun' of… · 3b093d25
```
Merge branches 'develop' and 'feature/20201125_多规格商品下添加单规格商品_yu.sun' of http://gitlab.freemud.com/order-group-application/order-group into develop
```
  ping.wu committed Nov 30, 2020
  3b093d25 Browse Files
- 套餐中有单品组成的多规格，加料商品取值修改 · 0336c80f
  ping.wu committed Nov 30, 2020
  
  0336c80f Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into develop · ceaf9b9c
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	ordercenter-sdk/pom.xml
```
  刘鹏飞 committed Nov 30, 2020
  ceaf9b9c Browse Files
- 买一赠一寄件活动只加券 · 6342f2ce
  刘鹏飞 committed Nov 30, 2020
  
  6342f2ce Browse Files
- Merge branches 'develop' and 'feature/20201125_多规格商品下添加单规格商品_yu.sun' of… · 4a5e3e68
```
Merge branches 'develop' and 'feature/20201125_多规格商品下添加单规格商品_yu.sun' of http://gitlab.freemud.com/order-group-application/order-group into develop
```
  ping.wu committed Nov 30, 2020
  4a5e3e68 Browse Files
- 配送进程 · 787d57fc
  邓杰 committed Nov 30, 2020
  
  787d57fc Browse Files
- Merge branch '20201127_coco配送进程' into develop · 925b153a
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
```
  邓杰 committed Nov 30, 2020
  925b153a Browse Files
- 配送进程 · 3482fb59
  邓杰 committed Nov 30, 2020
  
  3482fb59 Browse Files
- Merge branch 'develop' of… · 34ff8552
```
Merge branch 'develop' of http://gitlab.freemud.com/order-group-application/order-group into develop
```
  邓杰 committed Nov 30, 2020
  34ff8552 Browse Files
- Merge branch 'feature/2.0.1-collageOrder-刘鹏飞' into 'develop' · 85326828
```
购物车接口添加

See merge request !24
```
  缪晖 committed Nov 30, 2020
  85326828 Browse Files
- 购物车接口添加 · 93ef5c15
  缪晖 committed Nov 30, 2020
  
  93ef5c15 Browse Files
- Merge branch '20201127_coco配送进程' into develop · 4c20835f
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/Orderservice.java
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
```
  邓杰 committed Nov 30, 2020
  4c20835f Browse Files
- 配送进程 · 9ec4ebd6
  邓杰 committed Nov 30, 2020
  
  9ec4ebd6 Browse Files
- Merge branch 'develop' of… · 8744ebac
```
Merge branch 'develop' of http://gitlab.freemud.com/order-group-application/order-group into develop
```
  缪晖 committed Nov 30, 2020
  8744ebac Browse Files
- 拼单购物车SDK版本升级 · a4ac471d
  缪晖 committed Nov 30, 2020
  
  a4ac471d Browse Files
- Merge branch 'feature/2.0.1-collageOrder-刘鹏飞' into 'develop' · 41be6231
```
创建拼单时添加商户名称及门店名称

See merge request !23
```
  缪晖 committed Nov 30, 2020
  41be6231 Browse Files
- 创建拼单时添加商户名称及门店名称 · 6b0c1053
  缪晖 committed Nov 30, 2020
  
  6b0c1053 Browse Files
- assortment-ordercenter-sdk升级2.2.10-SNAPSHOT · 7409b784
  刘鹏飞 committed Nov 30, 2020
  
  7409b784 Browse Files
- ordercenter-sdk升级1.6.8-SNAPSHOT · ac07c09c
  刘鹏飞 committed Nov 30, 2020
  
  ac07c09c Browse Files
- Merge branch '20201125-coco-zhw' into 20201127_coco配送进程 · 9812b224
  邓杰 committed Nov 30, 2020
  
  9812b224 Browse Files
- Merge branch 'feature/2.0.9-外卖拒单-lcf' into develop · cd73e4a1
  chongfu.liang committed Nov 30, 2020
  
  cd73e4a1 Browse Files
- 外卖拒单接口修改参数 · cb5143b8
  chongfu.liang committed Nov 30, 2020
  
  cb5143b8 Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · 62e84d4b
  xiaoer.li@freemud.com committed Nov 30, 2020
  
  62e84d4b Browse Files