Commits · dccc2aae4b274b33f90e5e05022e11005878f66f · order-group-application / order-group

28 Dec, 2020 3 commits
- jar 包更新 · dccc2aae
  zhiheng.zhang committed Dec 28, 2020
  
  dccc2aae Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 4b2ef69a
  zhiheng.zhang committed Dec 28, 2020
  
  4b2ef69a Browse Files
- jar 包更新 · 82d7ed13
  zhiheng.zhang committed Dec 28, 2020
  
  82d7ed13 Browse Files
25 Dec, 2020 14 commits
- Merge remote-tracking branch 'origin/qa' into qa · c67395e7
  刘鹏飞 committed Dec 25, 2020
  
  c67395e7 Browse Files
- Merge remote-tracking branch 'origin/feature/coco_three' into qa · e4817b57
  刘鹏飞 committed Dec 25, 2020
  
  e4817b57 Browse Files
- coco不校验下单金额和起送金额 · 4ac6c077
  刘鹏飞 committed Dec 25, 2020
  
  4ac6c077 Browse Files
- Merge branch 'qa' of gitlab.freemud.com:order-group-application/order-group into qa · 271b8689
  yu.sun committed Dec 25, 2020
  
  271b8689 Browse Files
- Merge remote-tracking branch 'origin/feature/coco_three' into qa · bbccf1d8
  刘鹏飞 committed Dec 25, 2020
  
  bbccf1d8 Browse Files
- 测试类修改 · 2c5c35f2
  刘鹏飞 committed Dec 25, 2020
  
  2c5c35f2 Browse Files
- coco活动覆盖的商品数量要返回给购物车 · 3f3e32f9
  刘鹏飞 committed Dec 25, 2020
  
  3f3e32f9 Browse Files
- Merge branch 'feature/20201217_四个非常搭套餐需求_yu.sun' into qa · ee63866b
  yu.sun committed Dec 25, 2020
  
  ee63866b Browse Files
- Merge remote-tracking branch 'origin/fix/2.1.13-spu-sku' into qa · a9a30a61
  xiaoer.li@freemud.com committed Dec 25, 2020
  
  a9a30a61 Browse Files
- spuId->skuId · 77e1bb6c
  xiaoer.li@freemud.com committed Dec 25, 2020
  
  77e1bb6c Browse Files
- sunyu::fixbug::fix bug about productGroup price calculate · 37c0fe31
  yu.sun committed Dec 25, 2020
  
  37c0fe31 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 8f8da61f
  xiaoer.li@freemud.com committed Dec 25, 2020
  
  8f8da61f Browse Files
- Merge branch 'fix/2.13-pid' into qa · 9b9ff1a4
  xiaoer.li@freemud.com committed Dec 25, 2020
  
  9b9ff1a4 Browse Files
- xxoo · d0c7934b
  xiaoer.li@freemud.com committed Dec 25, 2020
  
  d0c7934b Browse Files
24 Dec, 2020 23 commits
- 支付jia更新 · b1465f47
  zhiheng.zhang committed Dec 24, 2020
  
  b1465f47 Browse Files
- 添加抖音支付 · a4feb4e6
  zhiheng.zhang committed Dec 24, 2020
  
  a4feb4e6 Browse Files
- 代码冲突合并 · 3e88826e
  zhiheng.zhang committed Dec 24, 2020
  
  3e88826e Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 582ec019
  zhiheng.zhang committed Dec 24, 2020
  
  582ec019 Browse Files
- 代码冲突合并 · 7696eb29
  zhiheng.zhang committed Dec 24, 2020
  
  7696eb29 Browse Files
- Merge branch 'qa' of gitlab.freemud.com:order-group-application/order-group into qa · 040f0f11
  张洪旺 committed Dec 24, 2020
  
  040f0f11 Browse Files
- Merge branch 'coco20201223-bug-zhw' of… · 5cdbb895
```
Merge branch 'coco20201223-bug-zhw' of gitlab.freemud.com:order-group-application/order-group into qa
```
  张洪旺 committed Dec 24, 2020
  5cdbb895 Browse Files
- fix 首日积点Bug · 88762810
  张洪旺 committed Dec 24, 2020
  
  88762810 Browse Files
- fix · 9cd2ee78
  xiaoer.li@freemud.com committed Dec 24, 2020
  
  9cd2ee78 Browse Files
- Merge branch 'qa' of gitlab.freemud.com:order-group-application/order-group into qa · 0c26f5ad
  yu.sun committed Dec 24, 2020
  
  0c26f5ad Browse Files
- sunyu::fix conflicts about setMealCalculation · 5523345c
  yu.sun committed Dec 24, 2020
  
  5523345c Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · d44bb539
  hanghang.wang committed Dec 24, 2020
  
  d44bb539 Browse Files
- 抖音支付新增抖音Id和openId · b606cfd1
  张志恒 committed Dec 24, 2020
  
  b606cfd1 Browse Files
- Merge branch 'feature/2020-12-14_order-group_wanghanghang' into qa · 169eb68e
```
# Conflicts:
#	assortment-ordercenter-sdk/readme.md
```
  hanghang.wang committed Dec 24, 2020
  169eb68e Browse Files
- Merge branch 'feature/20201217_四个非常搭套餐需求_yu.sun' into qa · 2eb71304
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/adapter/ShoppingCartMccafeAdapter.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CalculationServiceImpl.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/SetMealCalculation.java
```
  yu.sun committed Dec 24, 2020
  2eb71304 Browse Files
- Merge branch 'coco20201223-bug-zhw' of… · 6b31769c
```
Merge branch 'coco20201223-bug-zhw' of gitlab.freemud.com:order-group-application/order-group into qa
```
  张洪旺 committed Dec 24, 2020
  6b31769c Browse Files
- fix 首日积点Bug · 0ef61cbc
  张洪旺 committed Dec 24, 2020
  
  0ef61cbc Browse Files
- sunyu::update::update about productGroup add Mateial about price calculate · e91adf87
  yu.sun committed Dec 24, 2020
  
  e91adf87 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · e7cf567a
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/controller/OrderController.java
#	order-application-service/src/main/java/cn/freemud/service/Orderservice.java
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
```
  张洪旺 committed Dec 24, 2020
  e7cf567a Browse Files
- Merge branch 'coco20201223-bug-zhw' of… · 0c76b274
```
Merge branch 'coco20201223-bug-zhw' of gitlab.freemud.com:order-group-application/order-group into qa

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/controller/OrderController.java
#	order-application-service/src/main/java/cn/freemud/service/Orderservice.java
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
```
  张洪旺 committed Dec 24, 2020
  0c76b274 Browse Files
- fix 首日积点Bug · 0315337e
  张洪旺 committed Dec 24, 2020
  
  0315337e Browse Files
- Merge remote-tracking branch 'origin/feature/coco_three' into qa · 35eabe2e
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	order-application-service/pom.xml
```
  刘鹏飞 committed Dec 24, 2020
  35eabe2e Browse Files
- coco将配送费放到一个字段 · bfc75b6b
  刘鹏飞 committed Dec 24, 2020
  
  bfc75b6b Browse Files