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

31 Dec, 2020 5 commits
- 添加是否是门店级别 · a24ac6c5
  zhiheng.zhang committed Dec 31, 2020
  
  a24ac6c5 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · a2f31a02
  zhiheng.zhang committed Dec 31, 2020
  
  a2f31a02 Browse Files
- 添加是否是你们店级别 · 360197b8
  zhiheng.zhang committed Dec 31, 2020
  
  360197b8 Browse Files
- Merge branch 'feature/20201211-集点改造活动三期-张志恒' into qa · 0e032d85
  zhiheng.zhang committed Dec 31, 2020
  
  0e032d85 Browse Files
- 添加是否是你们店级别 · e123a0bf
  zhiheng.zhang committed Dec 31, 2020
  
  e123a0bf Browse Files
30 Dec, 2020 5 commits
- 拼单付款成功更新拼单购物车状态与清除普通购物车逻辑分离 · 998b2f92
  缪晖 committed Dec 30, 2020
  
  998b2f92 Browse Files
- Merge branch 'feature/2.0.12-富友线下对接开放平台-lcf' into qa · 061d8414
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
```
  chongfu.liang committed Dec 30, 2020
  061d8414 Browse Files
- 添加空判断 · 0e82acd5
  chongfu.liang committed Dec 30, 2020
  
  0e82acd5 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 6ba4da3c
  xiaoer.li@freemud.com committed Dec 30, 2020
  
  6ba4da3c Browse Files
- Merge remote-tracking branch 'origin/feature/2.1.13-新品限购' into qa · 2b13053f
  xiaoer.li@freemud.com committed Dec 30, 2020
  
  2b13053f Browse Files
29 Dec, 2020 24 commits
- Merge branch 'qa' of gitlab.freemud.com:order-group-application/order-group into qa · 660700a6
  yu.sun committed Dec 29, 2020
  
  660700a6 Browse Files
- sunyu::update::resolve conflicts · 06014ea7
  yu.sun committed Dec 29, 2020
  
  06014ea7 Browse Files
- fix · cf17d171
  chongfu.liang committed Dec 29, 2020
  
  cf17d171 Browse Files
- Merge branch 'feature/2.0.12-富友线下对接开放平台-lcf' into qa · 4254d42b
```
# 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
```
  chongfu.liang committed Dec 29, 2020
  4254d42b Browse Files
- 添加优惠价格 · d0b308fc
  chongfu.liang committed Dec 29, 2020
  
  d0b308fc Browse Files
- Merge branch 'feature/20201222_combo券需求_yu.sun' into qa · b28e538d
  yu.sun committed Dec 29, 2020
  
  b28e538d Browse Files
- Merge branch 'feature/20201228_可用券信息查询NPE修复_yu.sun' into qa · 62fa3477
  yu.sun committed Dec 29, 2020
  
  62fa3477 Browse Files
- Merge branch 'revert-4709b0bd' into 'feature/2.0.12-富友线下对接开放平台-lcf' · 35810d72
```
Revert "富友"

See merge request !102
```
  梁崇福 committed Dec 29, 2020
  35810d72 Browse Files
- Revert "富友" · c39d8256
```
This reverts commit 4709b0bd
```
  梁崇福 committed Dec 29, 2020
  c39d8256 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · f34baf40
  zhiheng.zhang committed Dec 29, 2020
  
  f34baf40 Browse Files
- Merge branch 'feature/20201203-抖音小程序渠道新增-张志恒' into qa · c06b6c14
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
```
  zhiheng.zhang committed Dec 29, 2020
  c06b6c14 Browse Files
- 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
- 卖券订单添加支付渠道 · b20da039
  zhiheng.zhang committed Dec 29, 2020
  
  b20da039 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
- 卖券订单添加支付渠道 · b5bb3ae0
  zhiheng.zhang committed Dec 29, 2020
  
  b5bb3ae0 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
- 判断更新 · 99cceb48
  zhiheng.zhang committed Dec 29, 2020
  
  99cceb48 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 6 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