Commits · 36a27fc37eebe58460cec45b741c09f26efdaf7d · order-group-application / order-group · GitLab

24 Nov, 2020 1 commit
- Merge branch 'feature/20201123-svc卡券核销fix-lcf' into develop · 36a27fc3
  chongfu.liang committed Nov 24, 2020
  
  36a27fc3 Browse Files
23 Nov, 2020 16 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
- 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
- 升级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
- 权益卡金额 · 0ec414fd
  徐康 committed Nov 23, 2020
  
  0ec414fd Browse Files
- 恢复代码 · ec7d481f
  徐康 committed Nov 23, 2020
  
  ec7d481f Browse Files
- 针对coco需求，拓展固定配送费 · e8935d75
  刘鹏飞 committed Nov 23, 2020
  
  e8935d75 Browse Files
- Revert "sdk版本回复" · 3fc5c902
```
This reverts commit 3f766143
```
  徐康 committed Nov 23, 2020
  3fc5c902 Browse Files
- 恢复代码 · 71994236
  徐康 committed Nov 23, 2020
  
  71994236 Browse Files
20 Nov, 2020 11 commits
- 转换对象添加取餐码 · 885aae9c
  zhiheng.zhang committed Nov 20, 2020
  
  885aae9c Browse Files
- 转换对象添加取餐码 · ab861ed4
  zhiheng.zhang committed Nov 20, 2020
  
  ab861ed4 Browse Files
- Merge branch 'feature/20201110_混合支付退款_张志恒' into develop · e8aa8730
```
# Conflicts:
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
```
  zhiheng.zhang committed Nov 20, 2020
  e8aa8730 Browse Files
- 转换对象添加取餐码 · 7d6e24e3
  zhiheng.zhang committed Nov 20, 2020
  
  7d6e24e3 Browse Files
- Merge branch 'feature/20201110_混合支付退款_张志恒' into develop · c0aad8c1
```
# Conflicts:
#	order-management/src/main/java/cn/freemud/management/service/handle/PaymentHandle.java
```
  zhiheng.zhang committed Nov 20, 2020
  c0aad8c1 Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · 92960e20
  zhiheng.zhang committed Nov 20, 2020
  
  92960e20 Browse Files
- sdk添加取餐码 · 1797707f
  zhiheng.zhang committed Nov 20, 2020
  
  1797707f Browse Files
- oms退款金额修改日志打印修改 · f9ec2687
  zhiheng.zhang committed Nov 20, 2020
  
  f9ec2687 Browse Files
- oms退款金额修改 · fc91c25d
  zhiheng.zhang committed Nov 20, 2020
  
  fc91c25d Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/2.0.1-collageOrder-刘鹏飞' into develop · cd22e516
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	order-application-service/pom.xml
```
  刘鹏飞 committed Nov 20, 2020
  cd22e516 Browse Files
- svc卡支付拼单购物车查询 · c691b31e
  刘鹏飞 committed Nov 20, 2020
  
  c691b31e Browse Files
19 Nov, 2020 12 commits
- 修改包装费 · f4185ad6
  刘鹏飞 committed Nov 19, 2020
  
  f4185ad6 Browse Files
- 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/2020-1104-混合支付' into develop · 0ad9d806
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartGoodsResponseVo.java
```
  zhiheng.zhang committed Nov 19, 2020
  0ad9d806 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