Commits · fc1daee393cfd0f6d231cf4038b59e354d46f2b0 · order-group-application / order-group

30 Nov, 2020 8 commits
- jar包版本更新 · fc1daee3
  缪晖 committed Nov 30, 2020
  
  fc1daee3 Browse Files
- Merge branch 'feature/2.0.1-collageOrder-刘鹏飞' into develop · d67de635
```
# 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 30, 2020
  d67de635 Browse Files
- 聚合层openId透传 · 744539c7
  缪晖 committed Nov 30, 2020
  
  744539c7 Browse Files
- Merge branch 'feature/20201123-svc卡券核销fix-lcf' into develop · 5f7c1097
  chongfu.liang committed Nov 30, 2020
  
  5f7c1097 Browse Files
- 核销fix · 2490399b
  chongfu.liang committed Nov 30, 2020
  
  2490399b Browse Files
- Merge branch 'feature/2.0.1-collageOrder-刘鹏飞' into develop · e44c57d0
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/controller/test/TestController.java
```
  缪晖 committed Nov 30, 2020
  e44c57d0 Browse Files
- 删除测试桩 · 2daef541
  缪晖 committed Nov 30, 2020
  
  2daef541 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into develop · fcb8635e
  刘鹏飞 committed Nov 30, 2020
  
  fcb8635e Browse Files
29 Nov, 2020 15 commits
- Update CollageOrderServiceImpl.java · 804f81d7
  缪晖 committed Nov 30, 2020
  
  804f81d7 Browse Files
- 创单查询购物车的时候增加批量使用优惠券的参数 · eba5ca0f
  刘鹏飞 committed Nov 29, 2020
  
  eba5ca0f Browse Files
- Merge remote-tracking branch 'origin/feature/coco-payGift-刘鹏飞' into feature/coco-payGift-刘鹏飞 · d181a0ee
  刘鹏飞 committed Nov 29, 2020
  
  d181a0ee Browse Files
- 创建订单增加批量使用优惠券参数 · f70985fb
  刘鹏飞 committed Nov 29, 2020
  
  f70985fb Browse Files
- Merge branch 'feature/2.0.1-collageOrder-刘鹏飞' into 'develop' · ebb62116
```
群收款接口

See merge request !19
```
  缪晖 committed Nov 29, 2020
  ebb62116 Browse Files
- 群收款接口 · cdbd5da5
  缪晖 committed Nov 29, 2020
  
  cdbd5da5 Browse Files
- Merge branch 'develop' of… · 1bbf44b1
```
Merge branch 'develop' of http://gitlab.freemud.com/order-group-application/order-group into develop
```
  刘鹏飞 committed Nov 29, 2020
  1bbf44b1 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into develop · 34646721
  刘鹏飞 committed Nov 29, 2020
  
  34646721 Browse Files
- Merge remote-tracking branch 'origin/feature/coco-payGift-刘鹏飞' into feature/coco-payGift-刘鹏飞 · 6dc4876b
  刘鹏飞 committed Nov 29, 2020
  
  6dc4876b Browse Files
- 查询购物车的时候增加批量使用优惠券的参数 · 6519b53c
  刘鹏飞 committed Nov 29, 2020
  
  6519b53c Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into develop · 21d5e4db
  刘鹏飞 committed Nov 29, 2020
  
  21d5e4db Browse Files
- 买一赠一寄件信息判空 · 44b4c123
  刘鹏飞 committed Nov 29, 2020
  
  44b4c123 Browse Files
- Merge branch 'feature/2.0.1-collageOrder-刘鹏飞' into 'develop' · 3006b98e
```
拼单接口调整

See merge request !18
```
  缪晖 committed Nov 29, 2020
  3006b98e Browse Files
- 拼单接口调整 · 7462c451
  缪晖 committed Nov 29, 2020
  
  7462c451 Browse Files
- 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 17 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