Commits · decfbba08b90fd8200608a532d8b79bcc76baa5d · order-group-application / order-group · GitLab

29 Dec, 2020 10 commits
- Merge remote-tracking branch 'origin/qa' into qa · decfbba0
  刘鹏飞 committed Dec 29, 2020
  
  decfbba0 Browse Files
- Merge remote-tracking branch 'origin/feature/coco_three' into qa · 897e16cf
  刘鹏飞 committed Dec 29, 2020
  
  897e16cf Browse Files
- coco订单详情的商品总价需要包含赠品的价格 · ecef885e
  刘鹏飞 committed Dec 29, 2020
  
  ecef885e Browse Files
- testfix · b6bac484
  chongfu.liang committed Dec 29, 2020
  
  b6bac484 Browse Files
- testfix · 32940e41
  chongfu.liang committed Dec 29, 2020
  
  32940e41 Browse Files
- Merge branch 'feature/20201229-并发fix-lcf' into qa · b7a6ea0f
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	ordercenter-sdk/pom.xml
#	ordercenter-sdk/readme.md
```
  chongfu.liang committed Dec 29, 2020
  b7a6ea0f Browse Files
- 修改hash模一样时的并发问题 · 316d0986
  chongfu.liang committed Dec 29, 2020
  
  316d0986 Browse Files
- update:延长交易号失效时间 · f52bbeeb
  xiaoer.li@freemud.com committed Dec 29, 2020
  
  f52bbeeb Browse Files
- Merge branch 'feature/appid-可用券列表' · c8fa7450
  xiaoer.li@freemud.com committed Dec 29, 2020
  
  c8fa7450 Browse Files
- Merge branch 'coco20201223-bug-zhw' of gitlab.freemud.com:order-group-application/order-group · e3c38703
  张洪旺 committed Dec 29, 2020
  
  e3c38703 Browse Files
28 Dec, 2020 16 commits
- Merge remote-tracking branch 'origin/feature/coco_three' into qa · dae22a2a
  刘鹏飞 committed Dec 28, 2020
  
  dae22a2a Browse Files
- coco订单详情的商品总价需要包含赠品的价格 · f57ae071
  刘鹏飞 committed Dec 28, 2020
  
  f57ae071 Browse Files
- coco订单详情商品总价 · ece7959f
  刘鹏飞 committed Dec 28, 2020
  
  ece7959f Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · af5e3919
  刘鹏飞 committed Dec 28, 2020
  
  af5e3919 Browse Files
- coco订单详情商品总价 · 9769b3a8
  刘鹏飞 committed Dec 28, 2020
  
  9769b3a8 Browse Files
- 订单基础&聚合sdk release版本号更新 · 1d9d6913
  缪晖 committed Dec 28, 2020
  
  1d9d6913 Browse Files
- Merge branch 'feature/20201221_开个店平台查询拼单订单_miaohui' into 'master' · 08ac0713
```
ordercenter-sdk添加markeringType字段

See merge request !101
```
  缪晖 committed Dec 28, 2020
  08ac0713 Browse Files
- Merge branch 'feature/20201221_开个店平台查询拼单订单_miaohui' into 'qa' · 08470854
```
ordercenter-sdk添加markeringType字段

See merge request !99
```
  缪晖 committed Dec 28, 2020
  08470854 Browse Files
- Merge remote-tracking branch 'origin/feature/coco_three' into qa · 9794319e
  刘鹏飞 committed Dec 28, 2020
  
  9794319e Browse Files
- coco订单详情的商品总价需要包含赠品的价格 · e9195f64
  刘鹏飞 committed Dec 28, 2020
  
  e9195f64 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 49376e11
  zhiheng.zhang committed Dec 28, 2020
  
  49376e11 Browse Files
- jar 包更新 · dccc2aae
  zhiheng.zhang committed Dec 28, 2020
  
  dccc2aae Browse Files
- Merge branch 'feature/20201223_posConfirmTakeKoubeiwaimai_miaohui' into qa · c90beba2
```
# Conflicts:
#	order-management/src/main/java/cn/freemud/management/enums/OrderSource.java
#	order-management/src/main/java/cn/freemud/management/service/adapter/OrderBeanFactory.java
```
  缪晖 committed Dec 28, 2020
  c90beba2 Browse Files
- pos接单新增口碑外卖渠道订单处理 · c4b4173d
  缪晖 committed Dec 28, 2020
  
  c4b4173d 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