Commits · d8afc5bc4430d3cd44a7ebc48f67c502fd37256c · order-group-application / order-group

29 Nov, 2020 1 commit

Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into develop · d8afc5bc

# 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/request/order/BaseCreateOrderRequest.java
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/order/QueryOrdersResponse.java
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
#	order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
#	ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/create/CreateOrderRequest.java
#	ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/response/orderInfo/OrderInfoReqs.java

committed Nov 29, 2020

d8afc5bc Browse Files

28 Nov, 2020 20 commits
- 买一赠一寄件商品返回购物车行 · f8addb98
  刘鹏飞 committed Nov 29, 2020
  
  f8addb98 Browse Files
- 订单详情查询增加买一赠一寄件送券的返参 · 15fc1ac3
  刘鹏飞 committed Nov 29, 2020
  
  15fc1ac3 Browse Files
- 订单查询增加买一赠一寄件送券的返参 · f8081797
  刘鹏飞 committed Nov 29, 2020
  
  f8081797 Browse Files
- 增加更新买一赠一寄件服送券信息接口 · e317d086
  刘鹏飞 committed Nov 28, 2020
  
  e317d086 Browse Files
- Merge branch 'feature/2.0.1-collageOrder-刘鹏飞' into develop · 8739e74e
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/controller/test/TestController.java
```
  缪晖 committed Nov 28, 2020
  8739e74e Browse Files
- desc · be105679
  缪晖 committed Nov 28, 2020
  
  be105679 Browse Files
- 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
- Merge remote-tracking branch 'origin/feature/coco-payGift-刘鹏飞' into feature/coco-payGift-刘鹏飞 · 7f0da2ac
  刘鹏飞 committed Nov 28, 2020
  
  7f0da2ac Browse Files
- 添加商品名称参数 · daae96d2
  刘鹏飞 committed Nov 28, 2020
  
  daae96d2 Browse Files
- 拼单查询接口调整 · 1c51a7bb
  缪晖 committed Nov 28, 2020
  
  1c51a7bb Browse Files
- 创单获取购物数据增加买一赠一寄件用户选择的验证,总的活动对象要判空 · d4629a76
  刘鹏飞 committed Nov 28, 2020
  
  d4629a76 Browse Files
- 创单获取购物数据增加买一赠一寄件用户选择的验证 · 131e11f1
  刘鹏飞 committed Nov 28, 2020
  
  131e11f1 Browse Files
27 Nov, 2020 6 commits
- 创单增加买一赠一寄件信息传递到订单基础 · f0c19ab4
  刘鹏飞 committed Nov 28, 2020
  
  f0c19ab4 Browse Files
- 创单增加用户买一赠一寄杯活动选择的商品和券 · 96540de7
  刘鹏飞 committed Nov 27, 2020
  
  96540de7 Browse Files
- 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 13 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
- 购物车查询增加买一赠一寄杯活动 · f33d6f7e
  刘鹏飞 committed Nov 26, 2020
  
  f33d6f7e 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