Commits · 6c9a9c84f9da4dbaa11deefc0a1a6ee7b6f9593d · order-group-application / order-group · GitLab

07 Dec, 2020 1 commit
- 餐道价格 · 6c9a9c84
  徐康 committed Dec 07, 2020
  
  6c9a9c84 Browse Files
05 Dec, 2020 2 commits
- 套餐价格 · 1344b16f
  徐康 committed Dec 05, 2020
  
  1344b16f Browse Files
- 使用购物车套餐价格 · f39d88f9
  徐康 committed Dec 05, 2020
  
  f39d88f9 Browse Files
02 Dec, 2020 1 commit
- 取消grilling检测 · f449043d
  徐康 committed Dec 02, 2020
  
  f449043d Browse Files
30 Nov, 2020 1 commit
- grilling字段长度检测 · 7aea9838
  徐康 committed Nov 30, 2020
  
  7aea9838 Browse Files
27 Nov, 2020 1 commit
- PayVoucher可能为空 · 01e3fa51
  徐康 committed Nov 27, 2020
  
  01e3fa51 Browse Files
26 Nov, 2020 1 commit
- 对接餐道grilling · 8f0166ab
  徐康 committed Nov 26, 2020
  
  8f0166ab Browse Files
25 Nov, 2020 2 commits
- 对接餐道grilling · eca63bfc
  徐康 committed Nov 25, 2020
  
  eca63bfc Browse Files
- 对接支付点餐类型 · a2bf9b4e
  徐康 committed Nov 25, 2020
  
  a2bf9b4e Browse Files
23 Nov, 2020 9 commits
- 升级sdk · 6328fd1a
  徐康 committed Nov 23, 2020
  
  6328fd1a Browse Files
- Merge branch 'bugfix/20201118_xukang_下单加锁防止重复下单' · 4bcd1669
  徐康 committed Nov 23, 2020
  
  4bcd1669 Browse Files
- Merge branch 'feature/20201013_麦咖啡p4v1问题修复_xukangg' · d7c0fbb0
  徐康 committed Nov 23, 2020
  
  d7c0fbb0 Browse Files
- 权益卡金额 · 0ec414fd
  徐康 committed Nov 23, 2020
  
  0ec414fd Browse Files
- 恢复代码 · ec7d481f
  徐康 committed Nov 23, 2020
  
  ec7d481f Browse Files
- Revert "sdk版本回复" · 3fc5c902
```
This reverts commit 3f766143
```
  徐康 committed Nov 23, 2020
  3fc5c902 Browse Files
- 恢复代码 · 71994236
  徐康 committed Nov 23, 2020
  
  71994236 Browse Files
- 商品券重复加车校验和恢复代码 · b465bb38
  徐康 committed Nov 23, 2020
  
  b465bb38 Browse Files
- 商品券重复加车校验和恢复代码 · ae2ca9e3
  徐康 committed Nov 23, 2020
  
  ae2ca9e3 Browse Files
19 Nov, 2020 16 commits
- Merge branch 'feature/20201013_麦咖啡p4v1问题修复_xukangg' · 35f621bc
  徐康 committed Nov 19, 2020
  
  35f621bc Browse Files
- Merge branch 'bugfix/20201118_xukang_下单加锁防止重复下单' · c02fcb27
  徐康 committed Nov 19, 2020
  
  c02fcb27 Browse Files
- 功能代码恢复 · 371ab1a9
  徐康 committed Nov 19, 2020
  
  371ab1a9 Browse Files
- 功能代码恢复 · 4bb3e6f6
  徐康 committed Nov 19, 2020
  
  4bb3e6f6 Browse Files
- Merge branch 'feature/20201013_麦咖啡p4v1问题修复_xukangg' · ca5249f8
  徐康 committed Nov 19, 2020
  
  ca5249f8 Browse Files
- sdk版本回复 · 3f766143
  徐康 committed Nov 19, 2020
  
  3f766143 Browse Files
- Merge branch 'feature/20201013_麦咖啡p4v1问题修复_xukangg' · 99b5cd02
  徐康 committed Nov 19, 2020
  
  99b5cd02 Browse Files
- 功能暂时不上线 · 34a15520
  徐康 committed Nov 19, 2020
  
  34a15520 Browse Files
- Merge branch 'feature/20201013_麦咖啡p4v1问题修复_xukangg' · ec761c0b
  徐康 committed Nov 19, 2020
  
  ec761c0b Browse Files
- Merge branch 'bugfix/20201118_xukang_下单加锁防止重复下单' · efe967c8
  徐康 committed Nov 19, 2020
  
  efe967c8 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/gatherSpot-刘鹏飞' into master · bdab5e5c
  刘鹏飞 committed Nov 19, 2020
  
  bdab5e5c Browse Files
- 集点活动筛选需要判断活动的类型不能为空 · 8f79b24d
  刘鹏飞 committed Nov 19, 2020
  
  8f79b24d Browse Files
- Merge remote-tracking branch 'origin/feature/gatherSpot-刘鹏飞' into feature/gatherSpot-刘鹏飞 · 3397ebb8
  刘鹏飞 committed Nov 19, 2020
  
  3397ebb8 Browse Files
- 集点活动筛选需要判断活动的类型不能为空 · b601fcc6
  刘鹏飞 committed Nov 19, 2020
  
  b601fcc6 Browse Files
- 预计送达时间 · 489b1b8f
  徐康 committed Nov 19, 2020
  
  489b1b8f Browse Files
- 订单完成时间 · e65d790b
  徐康 committed Nov 19, 2020
  
  e65d790b Browse Files
18 Nov, 2020 6 commits
- 权益卡金额 · 70cdc677
  徐康 committed Nov 18, 2020
  
  70cdc677 Browse Files
- 商品id截取 · 71c0a3a9
  徐康 committed Nov 18, 2020
  
  71c0a3a9 Browse Files
- 下单加锁 · f3ace699
  徐康 committed Nov 18, 2020
  
  f3ace699 Browse Files
- 权益卡金额 · df9535d0
  徐康 committed Nov 18, 2020
  
  df9535d0 Browse Files
- 升级assortment-ordercenter-sdk为2.1.4-RELEASE · 632ec565
  刘鹏飞 committed Nov 18, 2020
  
  632ec565 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/gatherSpot-刘鹏飞' into master · 94e65b6d
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/enums/QueryOrderAccountType.java
#	order-application-service/pom.xml
```
  刘鹏飞 committed Nov 18, 2020
  94e65b6d Browse Files