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

25 Nov, 2020 4 commits
- readme · d94c0701
  徐康 committed Nov 25, 2020
  
  d94c0701 Browse Files
- 升级sdk · c4078691
  徐康 committed Nov 25, 2020
  
  c4078691 Browse Files
- Merge branch 'feature/20201124_xukang_麦咖啡p3v3' into develop · e1337b6c
```
# Conflicts:
#	order-management/src/main/java/cn/freemud/management/service/handle/PaymentHandle.java
```
  徐康 committed Nov 25, 2020
  e1337b6c Browse Files
- 对接支付点餐类型 · a2bf9b4e
  徐康 committed Nov 25, 2020
  
  a2bf9b4e Browse Files
24 Nov, 2020 21 commits
- Merge branch 'feature/20201124-撤单添加撤单详情-张志恒' into develop · a1b0dc60
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	order-application-service/pom.xml
#	ordercenter-sdk/pom.xml
#	ordercenter-sdk/readme.md
```
  zhiheng.zhang committed Nov 24, 2020
  a1b0dc60 Browse Files
- 订单取消注释 · 7a7ebdb8
  zhiheng.zhang committed Nov 24, 2020
  
  7a7ebdb8 Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · c1276daf
  zhiheng.zhang committed Nov 24, 2020
  
  c1276daf Browse Files
- 订单取消注释 · 8bcae7ff
  zhiheng.zhang committed Nov 24, 2020
  
  8bcae7ff Browse Files
- 转换对象添加取餐码 · e33baf13
  zhiheng.zhang committed Nov 24, 2020
  
  e33baf13 Browse Files
- 升级sdk · 61617f9d
  chongfu.liang committed Nov 24, 2020
  
  61617f9d Browse Files
- Merge branch 'feature/20201123-添加美团点评渠道' into develop · 8a33c19f
  chongfu.liang committed Nov 24, 2020
  
  8a33c19f Browse Files
- 添加美团点评渠道 · a232db35
  chongfu.liang committed Nov 24, 2020
  
  a232db35 Browse Files
- 升级购物车sdk · 91331611
  xiaoer.li@freemud.com committed Nov 24, 2020
  
  91331611 Browse Files
- Merge branch 'feature/new-fixbig' into develop · 48f8f80c
  xiaoer.li@freemud.com committed Nov 24, 2020
  
  48f8f80c Browse Files
- fix:套餐历史bug · b303a1a8
  xiaoer.li@freemud.com committed Nov 24, 2020
  
  b303a1a8 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into develop · ed245ec3
  刘鹏飞 committed Nov 24, 2020
  
  ed245ec3 Browse Files
- 将促销返回的总的活动信息返回给前端,需要判空 · 9c4e27ba
  刘鹏飞 committed Nov 24, 2020
  
  9c4e27ba Browse Files
- Merge branch 'develop' of… · c6d6f86b
```
Merge branch 'develop' of http://gitlab.freemud.com/order-group-application/order-group into develop
```
  刘鹏飞 committed Nov 24, 2020
  c6d6f86b Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into develop · 3f9d1063
  刘鹏飞 committed Nov 24, 2020
  
  3f9d1063 Browse Files
- 将促销返回的总的活动信息返回给前端,需要判空 · dcb5f8d8
  刘鹏飞 committed Nov 24, 2020
  
  dcb5f8d8 Browse Files
- Merge branch 'feature/new-fixbig' · 6f457559
  xiaoer.li@freemud.com committed Nov 24, 2020
  
  6f457559 Browse Files
- fix · 8ce0a122
  xiaoer.li@freemud.com committed Nov 24, 2020
  
  8ce0a122 Browse Files
- debug · c68750a7
  xiaoer.li@freemud.com committed Nov 24, 2020
  
  c68750a7 Browse Files
- Merge branch 'feature/20201123-svc卡券核销fix-lcf' into develop · 36a27fc3
  chongfu.liang committed Nov 24, 2020
  
  36a27fc3 Browse Files
- 添加美团点评渠道 · 48a51443
  chongfu.liang committed Nov 24, 2020
  
  48a51443 Browse Files
23 Nov, 2020 15 commits
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into develop · 5473b44b
  刘鹏飞 committed Nov 23, 2020
  
  5473b44b Browse Files
- 将促销返回的活动返回给前端 · 96ba80d6
  刘鹏飞 committed Nov 23, 2020
  
  96ba80d6 Browse Files
- 升级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
- Merge branch 'feature/2.0.6-农工商商品兑换券' into develop · 8598b6da
  chongfu.liang committed Nov 23, 2020
  
  8598b6da Browse Files
- 修改商品id和名称 · 46fbc758
  chongfu.liang committed Nov 23, 2020
  
  46fbc758 Browse Files
- Merge branch 'feature/20201120-甩手添加事件通知-lcf' into develop · b3b61e54
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	order-application-service/pom.xml
```
  chongfu.liang committed Nov 23, 2020
  b3b61e54 Browse Files
- 甩手 · a06a0b8d
  chongfu.liang committed Nov 23, 2020
  
  a06a0b8d Browse Files
- 修改库存冲正逻辑 · 63dae486
  chongfu.liang committed Nov 23, 2020
  
  63dae486 Browse Files
- 套餐取finalPrice · 828558a0
  xiaoer.li@freemud.com committed Nov 23, 2020
  
  828558a0 Browse Files
- 升级sdk · 06be40cf
  徐康 committed Nov 23, 2020
  
  06be40cf Browse Files
- 升级sdk · 3a4bee1f
  徐康 committed Nov 23, 2020
  
  3a4bee1f Browse Files
- Merge branch 'feature/20201013_麦咖啡p4v1问题修复_xukangg' into develop · ffd45045
```
# Conflicts:
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
```
  徐康 committed Nov 23, 2020
  ffd45045 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into develop · df2da0fe
  刘鹏飞 committed Nov 23, 2020
  
  df2da0fe Browse Files