Commits · 0ba4cae852064711a65e82a8dab3e82b87765f7a · order-group-application / order-group

28 Nov, 2020 10 commits
- Merge branch 'feature/2.0.1-collageOrder-刘鹏飞' into 'develop' · 0ba4cae8
```
groupBuy test

See merge request !16
```
  缪晖 committed Nov 28, 2020
  0ba4cae8 Browse Files
- groupBuy test · f89be0a0
  缪晖 committed Nov 28, 2020
  
  f89be0a0 Browse Files
- Merge branch 'feature/2.0.1-collageOrder-刘鹏飞' into 'develop' · d0607c1c
```
调整测试

See merge request !15
```
  缪晖 committed Nov 28, 2020
  d0607c1c Browse Files
- 调整测试 · 6134465a
  缪晖 committed Nov 28, 2020
  
  6134465a Browse Files
- Merge branch 'feature/2.0.1-collageOrder-刘鹏飞' into 'develop' · f79abb78
```
测试接口调整

See merge request !14
```
  缪晖 committed Nov 28, 2020
  f79abb78 Browse Files
- 测试接口调整 · 6b44955d
  缪晖 committed Nov 28, 2020
  
  6b44955d Browse Files
- dev环境sdk版本升级 · abe63277
  缪晖 committed Nov 28, 2020
  
  abe63277 Browse Files
- Merge branch 'feature/2.0.1-collageOrder-刘鹏飞' into develop · 7d6b21f6
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/thirdparty/WeChatClient.java
```
  缪晖 committed Nov 28, 2020
  7d6b21f6 Browse Files
- 发起群收款测试 · b01a52bf
  缪晖 committed Nov 28, 2020
  
  b01a52bf Browse Files
- 拼单查询接口调整 · 1c51a7bb
  缪晖 committed Nov 28, 2020
  
  1c51a7bb Browse Files
27 Nov, 2020 4 commits
- Merge branch 'feature/20201110_混合支付退款_张志恒' into develop · 0dc266a2
```
# Conflicts:
#	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/src/main/java/com/freemud/application/sdk/api/ordercenter/response/orderInfo/OrderInfoReqs.java
```
  zhiheng.zhang committed Nov 27, 2020
  0dc266a2 Browse Files
- dev购物车jar包版本更新 · 1ffbb59e
  缪晖 committed Nov 27, 2020
  
  1ffbb59e Browse Files
- Merge branch 'feature/2.0.1-collageOrder-刘鹏飞' into 'develop' · b593c27e
```
拼单订单修改内容提交

See merge request !12
```
  缪晖 committed Nov 27, 2020
  b593c27e Browse Files
- 拼单订单修改内容提交 · 6421e937
  缪晖 committed Nov 27, 2020
  
  6421e937 Browse Files
26 Nov, 2020 17 commits
- 引用对象修改为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
- Merge branch 'feature/2.0.1-collageOrder-刘鹏飞' into 'develop' · 6656556e
```
移除拼单参与人接口调整

See merge request !11
```
  缪晖 committed Nov 26, 2020
  6656556e Browse Files
- 移除拼单参与人接口调整 · 62aa3a19
  缪晖 committed Nov 26, 2020
  
  62aa3a19 Browse Files
- Merge branch 'feature/20201123-添加美团点评渠道' into develop · 7b70bc80
  chongfu.liang committed Nov 26, 2020
  
  7b70bc80 Browse Files
- 添加美团点评智慧餐厅渠道 · e1423820
  chongfu.liang committed Nov 26, 2020
  
  e1423820 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/2.0.1-collageOrder-刘鹏飞' into develop · 0d5c8db9
  刘鹏飞 committed Nov 26, 2020
  
  0d5c8db9 Browse Files
- 拼单购物车增加用户id返回 · bbe5ba2e
  刘鹏飞 committed Nov 26, 2020
  
  bbe5ba2e Browse Files
- ordercenter sdk 升级 · 52187e21
  张志恒 committed Nov 26, 2020
  
  52187e21 Browse Files
- Merge remote-tracking branch 'origin/feature/2020-1104-混合支付' into develop · d1df7f9e
  张志恒 committed Nov 26, 2020
  
  d1df7f9e Browse Files
- jar包版本更新 · d6d2dcba
  张志恒 committed Nov 26, 2020
  
  d6d2dcba Browse Files
- 支付金额上报 · 4619fcb7
  xiaoer.li@freemud.com committed Nov 26, 2020
  
  4619fcb7 Browse Files
- Merge remote-tracking branch 'origin/feature/2020-1104-混合支付' into feature/20201110_混合支付退款_张志恒 · d046b832
```
# 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
```
  张志恒 committed Nov 26, 2020
  d046b832 Browse Files
- Merge branch 'feature/2020-1104-混合支付' into feature/20201110_混合支付退款_张志恒 · 88ef657c
```
# 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
```
  zhiheng.zhang committed Nov 26, 2020
  88ef657c Browse Files
- 纯svc卡支付入混合支付 · cd45b4df
  xiaoer.li@freemud.com committed Nov 26, 2020
  
  cd45b4df Browse Files
- 混合支付添加退款日志 · 2bb50c92
  张志恒 committed Nov 26, 2020
  
  2bb50c92 Browse Files
- 创建订单添加操作人 · 651c7c07
  张志恒 committed Nov 26, 2020
  
  651c7c07 Browse Files
25 Nov, 2020 9 commits
- 纯svc卡支付入混合支付 · 7dde4144
  xiaoer.li@freemud.com committed Nov 25, 2020
  
  7dde4144 Browse Files
- 引用对象修改为orderPayItem · 4728c848
  zhiheng.zhang committed Nov 25, 2020
  
  4728c848 Browse Files
- 引用对象修改为orderPayItem · 6532105e
  zhiheng.zhang committed Nov 25, 2020
  
  6532105e Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · 8fb323ff
  zhiheng.zhang committed Nov 25, 2020
  
  8fb323ff Browse Files
- 引用对象修改为orderPayItem · 88a433b8
  zhiheng.zhang committed Nov 25, 2020
  
  88a433b8 Browse Files
- Merge branch 'feature/20201110_混合支付退款_张志恒' into develop · bbc0cf64
```
# Conflicts:
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
```
  zhiheng.zhang committed Nov 25, 2020
  bbc0cf64 Browse Files
- 引用对象修改为orderPayItem · 182d0fba
  zhiheng.zhang committed Nov 25, 2020
  
  182d0fba Browse Files
- 纯svc卡支付入混合支付 · 151e38c6
  xiaoer.li@freemud.com committed Nov 25, 2020
  
  151e38c6 Browse Files
- 混合支付金额上报 · 6dcdbe3f
  xiaoer.li@freemud.com committed Nov 25, 2020
  
  6dcdbe3f Browse Files