Commits · 4687f2c3b7a0caaf3b1c6ab7eb9039bbbf1876e5 · order-group-application / order-group

22 Dec, 2020 1 commit
- 收货地址校验 · 4687f2c3
  徐康 committed Dec 22, 2020
  
  4687f2c3 Browse Files
21 Dec, 2020 5 commits
- 餐具商品 · 3df2f0fd
  徐康 committed Dec 21, 2020
  
  3df2f0fd Browse Files
- 餐具商品 · bbd62f5e
  徐康 committed Dec 21, 2020
  
  bbd62f5e Browse Files
- 餐具商品bug修复 · bcdcc9bc
  徐康 committed Dec 21, 2020
  
  bcdcc9bc Browse Files
- Merge remote-tracking branch 'origin/feature/20201209_xukang_麦咖啡p4v2' into… · a3bf7fec
```
Merge remote-tracking branch 'origin/feature/20201209_xukang_麦咖啡p4v2' into feature/20201209_xukang_麦咖啡p4v2
```
  徐康 committed Dec 21, 2020
  a3bf7fec Browse Files
- 餐具商品bug修复 · b5b7ff5e
  徐康 committed Dec 21, 2020
  
  b5b7ff5e Browse Files
18 Dec, 2020 2 commits
- 餐具商品 · 00795633
  徐康 committed Dec 18, 2020
  
  00795633 Browse Files
- 餐具商品 · 4c96ccb3
  徐康 committed Dec 18, 2020
  
  4c96ccb3 Browse Files
15 Dec, 2020 5 commits
- 餐具商品 · dc2c5a04
  徐康 committed Dec 15, 2020
  
  dc2c5a04 Browse Files
- 餐具商品 · fa4d5965
  徐康 committed Dec 15, 2020
  
  fa4d5965 Browse Files
- 切换门店移除餐具商品 · bbd27e62
  徐康 committed Dec 15, 2020
  
  bbd27e62 Browse Files
- 餐具商品 · dc16c446
  徐康 committed Dec 15, 2020
  
  dc16c446 Browse Files
- 餐具商品 · 4fcc0db1
  徐康 committed Dec 15, 2020
  
  4fcc0db1 Browse Files
09 Dec, 2020 1 commit
- 商品券使用标签展示 · 7cf8e9e4
  徐康 committed Dec 09, 2020
  
  7cf8e9e4 Browse Files
01 Dec, 2020 4 commits
- 购物车sdk升级 · 6c40a8aa
  xiaoer.li@freemud.com committed Dec 01, 2020
  
  6c40a8aa Browse Files
- Merge branch 'feature/new-fixbig' · 1f21a016
  xiaoer.li@freemud.com committed Dec 01, 2020
  
  1f21a016 Browse Files
- 删除相关debug日志 · aef94ff7
  xiaoer.li@freemud.com committed Dec 01, 2020
  
  aef94ff7 Browse Files
- fix:商品原价取促销价 · dba0a19b
  xiaoer.li@freemud.com committed Dec 01, 2020
  
  dba0a19b Browse Files
30 Nov, 2020 2 commits
- fix:套餐类型 · 7d46133e
  xiaoer.li@freemud.com committed Nov 30, 2020
  
  7d46133e Browse Files
- 对账标识上线 · b599b2ee
  徐康 committed Nov 30, 2020
  
  b599b2ee Browse Files
29 Nov, 2020 1 commit
- fix · 5d6d1c9a
  xiaoer.li committed Nov 29, 2020
  
  5d6d1c9a Browse Files
28 Nov, 2020 2 commits
- fix · f36736f2
  xiaoer.li committed Nov 28, 2020
  
  f36736f2 Browse Files
- fix · deff5416
  xiaoer.li committed Nov 28, 2020
  
  deff5416 Browse Files
27 Nov, 2020 2 commits
- 增加混合支付开关 · d1a4fca3
  xiaoer.li@freemud.com committed Nov 27, 2020
  
  d1a4fca3 Browse Files
- Merge branch 'master' of http://gitlab.freemud.com/order-group-application/order-group · 9d45ef7a
  xiaoer.li@freemud.com committed Nov 27, 2020
  
  9d45ef7a Browse Files
26 Nov, 2020 15 commits
- Merge branch 'feature/20201110_混合支付退款_张志恒' · 9ce8b24a
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/order/QueryOrdersResponse.java
#	call-back-service/pom.xml
#	order-application-service/pom.xml
#	order-management/pom.xml
#	ordercenter-sdk/pom.xml
#	ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/response/orderInfo/OrderInfoReqs.java
```
  zhiheng.zhang committed Nov 26, 2020
  9ce8b24a Browse Files
- 引用对象修改为orderPayItem · 934ca1b4
  zhiheng.zhang committed Nov 26, 2020
  
  934ca1b4 Browse Files
- Merge remote-tracking branch 'origin/feature/20201110_混合支付退款_张志恒' into feature/20201110_混合支付退款_张志恒 · 16ed77d3
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/order/QueryOrdersResponse.java
#	order-application-service/pom.xml
#	order-management/pom.xml
#	ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/response/orderInfo/OrderInfoReqs.java
```
  zhiheng.zhang committed Nov 26, 2020
  16ed77d3 Browse Files
- 删除不符合条件的套餐 · 3a00db69
  xiaoer.li@freemud.com committed Nov 26, 2020
  
  3a00db69 Browse Files
- 套餐商品增加商品类型 · 472253db
  xiaoer.li@freemud.com committed Nov 26, 2020
  
  472253db Browse Files
- Merge branch 'feature/2020-1104-混合支付' · 636ded1a
  xiaoer.li@freemud.com committed Nov 26, 2020
  
  636ded1a Browse Files
- fix · 80914e08
  xiaoer.li@freemud.com committed Nov 26, 2020
  
  80914e08 Browse Files
- fix · a9b49734
  xiaoer.li@freemud.com committed Nov 26, 2020
  
  a9b49734 Browse Files
- fix · 40a5c97a
  xiaoer.li@freemud.com committed Nov 26, 2020
  
  40a5c97a Browse Files
- fix · 42c5e571
  xiaoer.li@freemud.com committed Nov 26, 2020
  
  42c5e571 Browse Files
- Merge branch 'feature/2020-1104-混合支付' · e05671f0
  xiaoer.li@freemud.com committed Nov 26, 2020
  
  e05671f0 Browse Files
- fix · ad92be70
  xiaoer.li@freemud.com committed Nov 26, 2020
  
  ad92be70 Browse Files
- 升级sdk · 04086a6b
  xiaoer.li@freemud.com committed Nov 26, 2020
  
  04086a6b Browse Files
- Merge remote-tracking branch 'origin/feature/20201110_混合支付退款_张志恒' · 9ee3fd46
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/order/QueryOrdersResponse.java
#	order-application-service/pom.xml
#	order-management/pom.xml
#	ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/response/orderInfo/OrderInfoReqs.java
```
  xiaoer.li@freemud.com committed Nov 26, 2020
  9ee3fd46 Browse Files
- Merge branch 'feature/2020-1104-混合支付' · dedb9331
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	order-application-service/pom.xml
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
#	order-management/pom.xml
#	ordercenter-sdk/pom.xml
```
  xiaoer.li@freemud.com committed Nov 26, 2020
  dedb9331 Browse Files