Commits · b55771a9d41d2ef54d7828942789ab4bf9af91d1 · order-group-application / order-group

07 Dec, 2020 2 commits
- Merge branch 'feature/混合支付增加门店名称' into qa · b55771a9
  xiaoer.li@freemud.com committed Dec 07, 2020
  
  b55771a9 Browse Files
- 混合支付增加门店名称 · c0ba56ad
  xiaoer.li@freemud.com committed Dec 07, 2020
  
  c0ba56ad Browse Files
04 Dec, 2020 7 commits
- 升级sdk · 0555cd9d
  xiaoer.li@freemud.com committed Dec 04, 2020
  
  0555cd9d Browse Files
- Merge branch 'feature/2.1.0_核销优惠券增加参数' into qa · 96bae7ec
```
# Conflicts:
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java
```
  xiaoer.li@freemud.com committed Dec 04, 2020
  96bae7ec Browse Files
- Modify:带券订单下单成功直接锁券，支付完成核销 · 952c4dfd
  xiaoer.li@freemud.com committed Dec 04, 2020
  
  952c4dfd Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa · 5b1f2b6f
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
```
  刘鹏飞 committed Dec 04, 2020
  5b1f2b6f Browse Files
- 购物车查询返回参数coco定制 · 372399fe
  刘鹏飞 committed Dec 04, 2020
  
  372399fe Browse Files
- Merge branch 'feature/2.0.1-collageOrder-刘鹏飞' into 'qa' · a11c56e8
```
修改拼单完成之后失效时间1分钟

See merge request !34
```
  缪晖 committed Dec 04, 2020
  a11c56e8 Browse Files
- 修改拼单完成之后失效时间1分钟 · 1970bc66
  缪晖 committed Dec 04, 2020
  
  1970bc66 Browse Files
03 Dec, 2020 27 commits
- Merge branch 'feature/20201125_多规格商品下添加单规格商品_yu.sun' into qa · b7344fc1
  孙昱 committed Dec 03, 2020
  
  b7344fc1 Browse Files
- sunyu::update::fix bug about add singleSpec product to multipleSpec product · b4954e8e
  孙昱 committed Dec 03, 2020
  
  b4954e8e Browse Files
- Merge branch 'feature/20201112_套餐价格计算_yu.sun' into qa · 91ce7bc9
  孙昱 committed Dec 03, 2020
  
  91ce7bc9 Browse Files
- sunyu::update::fix bug about combox-product price calculate · 24654fa6
  孙昱 committed Dec 03, 2020
  
  24654fa6 Browse Files
- Merge branch 'feature/20201119-mixue-zhw' of gitlab.freemud.com:order-group-application/order-group · 93835de2
  张洪旺 committed Dec 03, 2020
  
  93835de2 Browse Files
- Merge remote-tracking branch 'origin/feature/coco-payGift-刘鹏飞' into feature/coco-payGift-刘鹏飞 · 5ff2597f
  刘鹏飞 committed Dec 03, 2020
  
  5ff2597f Browse Files
- coco订单详情赠品要合并到主商品 · 81d15b3d
  刘鹏飞 committed Dec 03, 2020
  
  81d15b3d Browse Files
- Merge branch '20201127_coco配送进程' into qa · 84c729d6
  邓杰 committed Dec 03, 2020
  
  84c729d6 Browse Files
- 合并 · fb393951
  邓杰 committed Dec 03, 2020
  
  fb393951 Browse Files
- 合并 · 6fa48ed0
  邓杰 committed Dec 03, 2020
  
  6fa48ed0 Browse Files
- Merge branch 'feature/20201125_多规格商品下添加单规格商品_yu.sun' into qa · a7246be6
  孙昱 committed Dec 03, 2020
  
  a7246be6 Browse Files
- sunyu::fix bug::fix bug about add singleSpec-product to multipleSpec product · aea4eb17
  孙昱 committed Dec 03, 2020
  
  aea4eb17 Browse Files
- 创建订单查询购物车增加购物车行返回 · 9379c4d4
  刘鹏飞 committed Dec 03, 2020
  
  9379c4d4 Browse Files
- Merge branch 'qa' of gitlab.freemud.com:order-group-application/order-group into qa · 7ba4cf3e
  孙昱 committed Dec 03, 2020
  
  7ba4cf3e Browse Files
- Merge branch 'feature/20201125_多规格商品下添加单规格商品_yu.sun' into qa · 8182f851
  孙昱 committed Dec 03, 2020
  
  8182f851 Browse Files
- sunyu::fixbug::fix bug about singleSpec-product and multipleSpec-product add to shoppingCart · 6b6b1dc4
  yu.sun committed Dec 03, 2020
  
  6b6b1dc4 Browse Files
- Merge remote-tracking branch 'origin/feature/fix-混合支付优化券核销' · d8cab34d
  xiaoer.li@freemud.com committed Dec 03, 2020
  
  d8cab34d Browse Files
- Merge branch 'feature/2.0.1-collageOrder-刘鹏飞' into qa · 0d65d727
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
```
  缪晖 committed Dec 03, 2020
  0d65d727 Browse Files
- 拼单类型标识和包装费透传 · ed33ca76
  缪晖 committed Dec 03, 2020
  
  ed33ca76 Browse Files
- QA分支方法代码合并补充 · 1d48df10
  缪晖 committed Dec 03, 2020
  
  1d48df10 Browse Files
- 合并 · f33b69c2
  邓杰 committed Dec 03, 2020
  
  f33b69c2 Browse Files
- Merge branch '20201127_coco配送进程' into qa · c38e5e1a
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/Orderservice.java
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
#	order-application-service/src/main/java/cn/freemud/service/thirdparty/DeliveryFeiginClient.java
```
  邓杰 committed Dec 03, 2020
  c38e5e1a Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 972ba660
  徐康 committed Dec 03, 2020
  
  972ba660 Browse Files
- Merge branch 'feature/20201201_xukang_麦咖啡p4v1' into qa · 8304d0bd
  徐康 committed Dec 03, 2020
  
  8304d0bd Browse Files
- 退款优化 · 3b9fa352
  徐康 committed Dec 03, 2020
  
  3b9fa352 Browse Files
- Merge branch 'feature/20201125_多规格商品下添加单规格商品_yu.sun' into qa · 2e3028eb
  孙昱 committed Dec 03, 2020
  
  2e3028eb Browse Files
- sunyu::update::add log info line · d5d858ed
  孙昱 committed Dec 03, 2020
  
  d5d858ed Browse Files
02 Dec, 2020 4 commits

qa sdk版本更新 · a95876aa
缪晖 committed Dec 02, 2020

a95876aa Browse Files

Merge branch 'feature/2.0.1-collageOrder-刘鹏飞' into qa · 269f0958

# 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/CreateOrderProductRequest.java
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
#	order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java

committed Dec 02, 2020

269f0958 Browse Files

拼单加购人包装费 · f3a6f275
缪晖 committed Dec 02, 2020

f3a6f275 Browse Files
Merge branch 'feature/20201112_套餐价格计算_yu.sun' into qa · 6bd458fd
孙昱 committed Dec 02, 2020

6bd458fd Browse Files