Commits · 497130edefc324e69cbd4b6cd0574ed90f073ee9 · order-group-application / order-group · GitLab

12 Oct, 2020 36 commits
- Merge remote-tracking branch 'remotes/origin/feature/2.0-换购券' into qa · 497130ed
  xiaoer.li@freemud.com committed Oct 12, 2020
  
  497130ed Browse Files
- 对接促销算价Alpha->换购商品重复添加 · 5c9a0c0b
  xiaoer.li@freemud.com committed Oct 12, 2020
  
  5c9a0c0b Browse Files
- sunyu::merge branch::merge branch about feature-getCartInfoByUser · 193f8162
  yu.sun committed Oct 12, 2020
  
  193f8162 Browse Files
- Merge branch 'qa' of gitlab.freemud.com:order-group-application/order-group into qa · dc5430d5
  yu.sun committed Oct 12, 2020
  
  dc5430d5 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/促销算价基于最新master的分支' into qa · e4271056
  xiaoer.li@freemud.com committed Oct 12, 2020
  
  e4271056 Browse Files
- 对接促销算价Alpha->fix 赠品 · 4f0e1830
  xiaoer.li@freemud.com committed Oct 12, 2020
  
  4f0e1830 Browse Files
- Merge branch 'feature/20200915_麦咖啡p2v3活动入机增加TENDERID字段' into qa · aae2905d
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartInfoRequestVo.java
```
  徐康 committed Oct 12, 2020
  aae2905d Browse Files
- Merge branch 'feature-yu.sun-getCartInfoByUser-20200925' into qa · 3d54df6e
  yu.sun committed Oct 12, 2020
  
  3d54df6e Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/2.0-换购券' into qa · b4728b96
  xiaoer.li@freemud.com committed Oct 12, 2020
  
  b4728b96 Browse Files
- 换购券提示-fix · 04a5df71
  xiaoer.li@freemud.com committed Oct 12, 2020
  
  04a5df71 Browse Files
- sunyu::update::update for getCartInfoByUser api about deliveryFeeCoupon · 07b2c1ab
  yu.sun committed Oct 12, 2020
  
  07b2c1ab Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/2.0-换购券' into qa · cf74870e
  xiaoer.li@freemud.com committed Oct 12, 2020
  
  cf74870e Browse Files
- 换购券提示-fix · f3032761
  xiaoer.li@freemud.com committed Oct 12, 2020
  
  f3032761 Browse Files
- 换购券提示-fix · ebc33fb2
  xiaoer.li@freemud.com committed Oct 12, 2020
  
  ebc33fb2 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 7526ae16
  xiaoer.li@freemud.com committed Oct 12, 2020
  
  7526ae16 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/2.0-换购券' into qa · a8473468
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/enums/ResponseResult.java
```
  xiaoer.li@freemud.com committed Oct 12, 2020
  a8473468 Browse Files
- 换购券提示-fix · 6cdd9ee7
  xiaoer.li@freemud.com committed Oct 12, 2020
  
  6cdd9ee7 Browse Files
- Merge branch '2020/09/24-运费券-huiyang' into qa · 76f6629b
  huiyang.chen committed Oct 12, 2020
  
  76f6629b Browse Files
- fix 运费 · 2ebe9614
  huiyang.chen committed Oct 12, 2020
  
  2ebe9614 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/促销算价基于最新master的分支' into qa · c2d74bdd
  xiaoer.li@freemud.com committed Oct 12, 2020
  
  c2d74bdd Browse Files
- 对接促销算价Alpha->fix 固定搭配组 · 816bc0b2
  xiaoer.li@freemud.com committed Oct 12, 2020
  
  816bc0b2 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/促销算价基于最新master的分支' into qa · 876b1c05
  xiaoer.li@freemud.com committed Oct 12, 2020
  
  876b1c05 Browse Files
- 对接促销算价Alpha->fix · def86a49
  xiaoer.li@freemud.com committed Oct 12, 2020
  
  def86a49 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/促销算价基于最新master的分支' into qa · f185e72e
  xiaoer.li@freemud.com committed Oct 12, 2020
  
  f185e72e Browse Files
- 对接促销算价Alpha->fix · 2a4e3d78
  xiaoer.li@freemud.com committed Oct 12, 2020
  
  2a4e3d78 Browse Files
- 换购券提示-fix · 6252547c
  xiaoer.li@freemud.com committed Oct 12, 2020
  
  6252547c Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/2.0-换购券' into qa · 832b2767
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/enums/ResponseResult.java
```
  xiaoer.li@freemud.com committed Oct 12, 2020
  832b2767 Browse Files
- 换购券提示-fix · a65daf0a
  xiaoer.li@freemud.com committed Oct 12, 2020
  
  a65daf0a Browse Files
- 换购券提示-fix · 706388ac
  xiaoer.li@freemud.com committed Oct 12, 2020
  
  706388ac Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/2.0-换购券' into qa · 0d5b4162
  xiaoer.li@freemud.com committed Oct 12, 2020
  
  0d5b4162 Browse Files
- 商品信息fix · 811f1c61
  xiaoer.li@freemud.com committed Oct 12, 2020
  
  811f1c61 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/2.0-换购券' into qa · 2b367c8c
  xiaoer.li@freemud.com committed Oct 12, 2020
  
  2b367c8c Browse Files
- 增加换购券不可用门店 · 3b02cbda
  xiaoer.li@freemud.com committed Oct 12, 2020
  
  3b02cbda Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/促销算价基于最新master的分支' into qa · db7a55c8
  xiaoer.li@freemud.com committed Oct 12, 2020
  
  db7a55c8 Browse Files
- Merge remote-tracking branch 'origin/feature/促销算价基于最新master的分支' into feature/促销算价基于最新master的分支 · ea373e16
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/promotion/GiftSharingService.java
```
  xiaoer.li@freemud.com committed Oct 12, 2020
  ea373e16 Browse Files
- 对接促销算价Alpha->fix 赠品 · e6ee16ca
  xiaoer.li@freemud.com committed Oct 12, 2020
  
  e6ee16ca Browse Files
11 Oct, 2020 3 commits
- 对接促销算价Alpha->fix 赠品 · 3d1a9dab
  xiaoer.li@freemud.com committed Oct 11, 2020
  
  3d1a9dab Browse Files
- 对接促销算价Alpha->fix · 69387df8
  xiaoer.li committed Oct 11, 2020
  
  69387df8 Browse Files
- 对接促销算价Alpha->fix · 247c5f0a
  xiaoer.li committed Oct 11, 2020
  
  247c5f0a Browse Files
10 Oct, 2020 1 commit
- 下单校验优惠券问题修复 · 6d5b7365
  徐康 committed Oct 10, 2020
  
  6d5b7365 Browse Files