Commits · 68e2ee75e84bcc8129cdddc8e20de4b2fc4342b0 · order-group-application / order-group · GitLab

24 Sep, 2020 17 commits
- 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 20 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
- sqa测试查询两个月的数据，生产不做修改 · 92981df2
  zhiheng.zhang committed Sep 23, 2020
  
  92981df2 Browse Files
- 对接促销算价Alpha->fix · b67dfaa3
  xiaoer.li@freemud.com committed Sep 23, 2020
  
  b67dfaa3 Browse Files
- Merge branch 'bugfix/20200918_麦咖啡修复订单信息展示问题' into qa · ca3c599b
  徐康 committed Sep 23, 2020
  
  ca3c599b Browse Files
- 再来一单早餐啡常搭 · 425a1c64
  徐康 committed Sep 23, 2020
  
  425a1c64 Browse Files
- 对接促销算价Alpha->fix · 75819bfa
  xiaoer.li@freemud.com committed Sep 23, 2020
  
  75819bfa Browse Files
- Merge branch 'feature/2020/09/23-1.9.39.1-修订版-张志恒' into qa · 8f69ee3a
  zhiheng.zhang committed Sep 23, 2020
  
  8f69ee3a Browse Files
- 商家退款后取消发送mq消息，统一放在mq中执行 · 2e0033a3
  zhiheng.zhang committed Sep 23, 2020
  
  2e0033a3 Browse Files
- 对接促销算价Alpha · 4533e1fb
  xiaoer.li@freemud.com committed Sep 23, 2020
  
  4533e1fb Browse Files
- Merge branch 'feature-yu.sun-20200915-new' into qa · facaf067
  孙昱 committed Sep 23, 2020
  
  facaf067 Browse Files
- sunyu::fixbug::fix bug about check reason content for check shoppingcart info · f8d7ee9c
  孙昱 committed Sep 23, 2020
  
  f8d7ee9c Browse Files
22 Sep, 2020 3 commits
- Merge branch 'feature-yu.sun-20200915-new' into qa · 1ab0652c
  孙昱 committed Sep 23, 2020
  
  1ab0652c Browse Files
- sunyu::update::fix bug about check shoppingcart info · a17acd3d
  孙昱 committed Sep 23, 2020
  
  a17acd3d Browse Files
- Merge branch 'feature-yu.sun-20200915-new' into qa · ea918d86
  孙昱 committed Sep 22, 2020
  
  ea918d86 Browse Files