Commits · 10c7f9e78db665214c0a26bd837d6f2485e78bfa · order-group-application / order-group · GitLab

02 Aug, 2020 1 commit
- Merge branch 'bugfix/20200918_麦咖啡修复订单信息展示问题' into qa · 10c7f9e7
  徐康 committed Aug 02, 2020
  
  10c7f9e7 Browse Files
24 Sep, 2020 29 commits
- Merge branch 'qa' of gitlab.freemud.com:order-group-application/order-group into qa · 9deeeeb5
  孙昱 committed Sep 24, 2020
  
  9deeeeb5 Browse Files
- Merge branch 'feature-yu.sun-20200915-new' into qa · c485e042
  孙昱 committed Sep 24, 2020
  
  c485e042 Browse Files
- sunyu::update::fix bug about switch store · 28b29250
  孙昱 committed Sep 24, 2020
  
  28b29250 Browse Files
- Merge branch 'bugfix/20200918_麦咖啡修复订单信息展示问题' into qa · 35090c98
  徐康 committed Sep 24, 2020
  
  35090c98 Browse Files
- 套餐类型转换 · 3578d1b9
  徐康 committed Sep 24, 2020
  
  3578d1b9 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 22c3b0c5
  xiaoer.li@freemud.com committed Sep 24, 2020
  
  22c3b0c5 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/促销算价基于最新master的分支' into qa · 44771e92
  xiaoer.li@freemud.com committed Sep 24, 2020
  
  44771e92 Browse Files
- 对接促销算价Alpha->fix · 9e6012cd
  xiaoer.li@freemud.com committed Sep 24, 2020
  
  9e6012cd Browse Files
- Merge branch 'qa' of gitlab.freemud.com:order-group-application/order-group into qa · a006226a
  孙昱 committed Sep 24, 2020
  
  a006226a Browse Files
- Merge branch 'feature-yu.sun-20200915-new' into qa · 26e58eb6
  孙昱 committed Sep 24, 2020
  
  26e58eb6 Browse Files
- Merge branch 'feature-yu.sun-20200915-new' of… · 778efb70
```
Merge branch 'feature-yu.sun-20200915-new' of gitlab.freemud.com:order-group-application/order-group into feature-yu.sun-20200915-new
```
  孙昱 committed Sep 24, 2020
  778efb70 Browse Files
- sunyu::update::fix bug about switch api · 06496a8b
  孙昱 committed Sep 24, 2020
  
  06496a8b Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/促销算价基于最新master的分支' into qa · 68e2ee75
  xiaoer.li@freemud.com committed Sep 24, 2020
  
  68e2ee75 Browse Files
- 对接促销算价Alpha->fix · 84c439fc
  xiaoer.li@freemud.com committed Sep 24, 2020
  
  84c439fc Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/促销算价基于最新master的分支' into qa · d158e453
  xiaoer.li@freemud.com committed Sep 24, 2020
  
  d158e453 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · b944879e
  徐康 committed Sep 24, 2020
  
  b944879e Browse Files
- Merge branch 'feature-yu.sun-20200915-new' into qa · ba63ee26
  徐康 committed Sep 24, 2020
  
  ba63ee26 Browse Files
- 套餐价格不需要乘以商品数量 · e069217c
  徐康 committed Sep 24, 2020
  
  e069217c Browse Files
- 对接促销算价Alpha->fix · e5feb2e7
  xiaoer.li@freemud.com committed Sep 24, 2020
  
  e5feb2e7 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/促销算价基于最新master的分支' into qa · c1d334cc
  xiaoer.li@freemud.com committed Sep 24, 2020
  
  c1d334cc Browse Files
- 对接促销算价Alpha->fix · ff2bb994
  xiaoer.li@freemud.com committed Sep 24, 2020
  
  ff2bb994 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/促销算价基于最新master的分支' into qa · 24618885
  xiaoer.li@freemud.com committed Sep 24, 2020
  
  24618885 Browse Files
- 对接促销算价Alpha->fix · 8ac26bdc
  xiaoer.li@freemud.com committed Sep 24, 2020
  
  8ac26bdc Browse Files
- Merge branch 'feature-yu.sun-20200915-new' into qa · 6342e6c7
  孙昱 committed Sep 24, 2020
  
  6342e6c7 Browse Files
- sunyu::update::fix bug about packageAmount · 19f9c1ed
  孙昱 committed Sep 24, 2020
  
  19f9c1ed Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/促销算价基于最新master的分支' into qa · cbd9ba7c
  xiaoer.li@freemud.com committed Sep 24, 2020
  
  cbd9ba7c Browse Files
- 对接促销算价Alpha->fix · 7aa541ca
  xiaoer.li@freemud.com committed Sep 24, 2020
  
  7aa541ca Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/促销算价基于最新master的分支' into qa · c57a086d
  xiaoer.li@freemud.com committed Sep 24, 2020
  
  c57a086d Browse Files
- 对接促销算价Alpha->fix · 538ed89d
  xiaoer.li@freemud.com committed Sep 24, 2020
  
  538ed89d Browse Files
23 Sep, 2020 10 commits
- Merge branch 'qa' of gitlab.freemud.com:order-group-application/order-group into qa · 4b39ac86
  孙昱 committed Sep 23, 2020
  
  4b39ac86 Browse Files
- Merge branch 'feature-yu.sun-20200915-new' into qa · 71a6c605
  孙昱 committed Sep 23, 2020
  
  71a6c605 Browse Files
- sunyu::update::fix bug about copyOrder · 3d48ca3d
  孙昱 committed Sep 23, 2020
  
  3d48ca3d Browse Files
- 对接促销算价Alpha · d2eb3d1c
  xiaoer.li@freemud.com committed Sep 23, 2020
  
  d2eb3d1c Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/促销算价基于最新master的分支' into qa · fbc07d05
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartGoodsResponseVo.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
```
  xiaoer.li@freemud.com committed Sep 23, 2020
  fbc07d05 Browse Files
- Merge branch 'feature-yu.sun-20200915-new' into qa · a82c6632
  孙昱 committed Sep 23, 2020
  
  a82c6632 Browse Files
- sunyu::update::fix bug about calculationDiscount · 33b4d667
  孙昱 committed Sep 23, 2020
  
  33b4d667 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 67bac06f
  徐康 committed Sep 23, 2020
  
  67bac06f Browse Files
- Merge branch 'feature/20200915_麦咖啡p2v3活动入机增加TENDERID字段' into qa · 248fe83a
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/adapter/DeliveryAdapter.java
```
  徐康 committed Sep 23, 2020
  248fe83a Browse Files
- 修复子商品数量不正确 · 5272e0c5
  徐康 committed Sep 23, 2020
  
  5272e0c5 Browse Files