Commits · d3c040a56876b5ba9cc18a2b38504275d714b284 · order-group-application / order-group

30 Nov, 2020 27 commits
- Merge branches 'feature/20201125_多规格商品下添加单规格商品_yu.sun' and 'qa' of… · d3c040a5
```
Merge branches 'feature/20201125_多规格商品下添加单规格商品_yu.sun' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
```
  ping.wu committed Nov 30, 2020
  d3c040a5 Browse Files
- 套餐中有单品组成的多规格，加料商品取值修改 · 0336c80f
  ping.wu committed Nov 30, 2020
  
  0336c80f Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 1ae7b2a2
  徐康 committed Nov 30, 2020
  
  1ae7b2a2 Browse Files
- 加料 · 91cd5a5c
  徐康 committed Nov 30, 2020
  
  91cd5a5c Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 7d209271
  xiaoer.li@freemud.com committed Nov 30, 2020
  
  7d209271 Browse Files
- Merge branch 'feature/new-fixbig' into qa · de9e6b0d
  xiaoer.li@freemud.com committed Nov 30, 2020
  
  de9e6b0d Browse Files
- fix:套餐类型 · 7d46133e
  xiaoer.li@freemud.com committed Nov 30, 2020
  
  7d46133e Browse Files
- Merge branch 'feature/2.0.9-外卖拒单-lcf' into qa · 6c15cb68
  chongfu.liang committed Nov 30, 2020
  
  6c15cb68 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · b8b2fd54
  xiaoer.li@freemud.com committed Nov 30, 2020
  
  b8b2fd54 Browse Files
- Merge branch 'feature/fix-混合支付核销券优化' into qa · bbe2163e
  xiaoer.li@freemud.com committed Nov 30, 2020
  
  bbe2163e Browse Files
- Merge branch 'qa' of gitlab.freemud.com:order-group-application/order-group into qa · 10123143
  孙昱 committed Nov 30, 2020
  
  10123143 Browse Files
- fix:提示 · c8eeb86c
  xiaoer.li@freemud.com committed Nov 30, 2020
  
  c8eeb86c Browse Files
- sunyu::fix bug ::rollback · 9eac6adb
  孙昱 committed Nov 30, 2020
  
  9eac6adb Browse Files
- 外卖拒单接口修改参数 · cb5143b8
  chongfu.liang committed Nov 30, 2020
  
  cb5143b8 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 4d04afc8
  xiaoer.li@freemud.com committed Nov 30, 2020
  
  4d04afc8 Browse Files
- Building assortment-ordercenter-sdk 2.2.12-SNAPSHOT · 9c7329f3
  xiaoer.li@freemud.com committed Nov 30, 2020
  
  9c7329f3 Browse Files
- Merge branch 'feature/fix-混合支付核销券优化' into qa · 1db7fbc3
  xiaoer.li@freemud.com committed Nov 30, 2020
  
  1db7fbc3 Browse Files
- Merge branch 'feature/20201125_多规格商品下添加单规格商品_yu.sun' into qa · d99e7b8b
  孙昱 committed Nov 30, 2020
  
  d99e7b8b Browse Files
- sunyu::fixbug::fixbug about material product info is empty · 50e178af
  孙昱 committed Nov 30, 2020
  
  50e178af Browse Files
- 优化：混合支付 svc卡全额支付直接核销优惠券 · b5105340
  xiaoer.li@freemud.com committed Nov 30, 2020
  
  b5105340 Browse Files
- 对账标识上线 · b599b2ee
  徐康 committed Nov 30, 2020
  
  b599b2ee Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 2b9f33ef
  徐康 committed Nov 30, 2020
  
  2b9f33ef Browse Files
- Merge branch 'feature/20201124_xukang_麦咖啡p3v3' into qa · be01e6db
  徐康 committed Nov 30, 2020
  
  be01e6db Browse Files
- grilling字段长度检测 · 7aea9838
  徐康 committed Nov 30, 2020
  
  7aea9838 Browse Files
- Merge branch 'feature/20201123-svc卡券核销fix-lcf' into qa · f85480f6
  chongfu.liang committed Nov 30, 2020
  
  f85480f6 Browse Files
- 核销fix · 2490399b
  chongfu.liang committed Nov 30, 2020
  
  2490399b Browse Files
- Merge branch 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa · 5bfaa621
  徐康 committed Nov 30, 2020
  
  5bfaa621 Browse Files
29 Nov, 2020 1 commit
- fix · 5d6d1c9a
  xiaoer.li committed Nov 29, 2020
  
  5d6d1c9a Browse Files
28 Nov, 2020 9 commits
- Merge branch 'feature/20201110_混合支付退款_张志恒' into qa · 08571363
  zhiheng.zhang committed Nov 28, 2020
  
  08571363 Browse Files
- 退款单号修改自定义生成 · cc4ac416
  zhiheng.zhang committed Nov 28, 2020
  
  cc4ac416 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/switch' into qa · 70411e69
  xiaoer.li committed Nov 28, 2020
  
  70411e69 Browse Files
- fix · f36736f2
  xiaoer.li committed Nov 28, 2020
  
  f36736f2 Browse Files
- fix · c810695d
  xiaoer.li committed Nov 28, 2020
  
  c810695d Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/switch' into qa · af52a4ea
  xiaoer.li committed Nov 28, 2020
  
  af52a4ea Browse Files
- fix · deff5416
  xiaoer.li committed Nov 28, 2020
  
  deff5416 Browse Files
- Merge branch 'feature/20201110_混合支付退款_张志恒' into qa · 49e17a28
  zhiheng.zhang committed Nov 28, 2020
  
  49e17a28 Browse Files
- 退款单号修改自定义生成 · f33e600e
  zhiheng.zhang committed Nov 28, 2020
  
  f33e600e Browse Files
27 Nov, 2020 3 commits

Merge branch 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa · bf2ee748

 Conflicts:
	assortment-ordercenter-sdk/pom.xml
	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/order/QueryOrdersResponse.java
	ordercenter-sdk/pom.xml

committed Nov 27, 2020

bf2ee748 Browse Files

Merge branch 'feature/20201110_混合支付退款_张志恒' into qa · 154e98a1

# 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-management/pom.xml
#	ordercenter-sdk/pom.xml
#	ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/response/orderInfo/OrderInfoReqs.java

committed Nov 27, 2020

154e98a1 Browse Files

Merge branch 'feature/switch' into qa · 7aea696e

# 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
#	call-back-service/pom.xml
#	order-application-service/pom.xml
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
#	order-management/pom.xml
#	ordercenter-sdk/pom.xml
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java

committed Nov 27, 2020

7aea696e Browse Files