Commits · 4bcd1669536b482ee4fbe76ca73776912b12501f · order-group-application / order-group · GitLab

23 Nov, 2020 8 commits
- 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
17 Nov, 2020 5 commits
- 入机流程问题 · 679c6861
  徐康 committed Nov 17, 2020
  
  679c6861 Browse Files
- 入机流程问题 · 03207121
  徐康 committed Nov 17, 2020
  
  03207121 Browse Files
- 权益卡金额 · b1c4ba43
  徐康 committed Nov 17, 2020
  
  b1c4ba43 Browse Files
- 外卖单入机失败不限制订单必须是下单状态 · 2dab3dc9
  徐康 committed Nov 17, 2020
  
  2dab3dc9 Browse Files
- 线上问题修复 · 827afaa7
  徐康 committed Nov 17, 2020
  
  827afaa7 Browse Files
16 Nov, 2020 2 commits
- 麦咖啡适配 · 0d4538a7
  徐康 committed Nov 16, 2020
  
  0d4538a7 Browse Files
- 付款单号条形码 · 48a6466a
  徐康 committed Nov 16, 2020
  
  48a6466a Browse Files
12 Nov, 2020 3 commits
- Merge remote-tracking branch 'origin/feature/20201112_fixbug-getCouponNameByCode_yu.sun' · aa39d0e3
  yu.sun committed Nov 12, 2020
  
  aa39d0e3 Browse Files
- Merge branch 'feature/20201112_优惠为0的券也要核销_xukang' · 8920c151
  徐康 committed Nov 12, 2020
  
  8920c151 Browse Files
- sunyu::fixbug::fix bug about getCouponNameByCode · 7ddf01d5
  yu.sun committed Nov 12, 2020
  
  7ddf01d5 Browse Files