Commits · 5fb851642825b8084736e55f89e9c112e48a9526 · order-group-application / order-group · GitLab

13 Oct, 2020 15 commits
- Merge branch '2020/09/24-运费券-huiyang' into qa · 5fb85164
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/ActivityCalculationDiscountResponseDto.java
#	shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/activity/ActivityDiscountsDto.java
```
  huiyang.chen committed Oct 13, 2020
  5fb85164 Browse Files
- Merge branch 'feature/20200915_麦咖啡p2v3活动入机增加TENDERID字段' into qa · e861f3e4
  徐康 committed Oct 13, 2020
  
  e861f3e4 Browse Files
- 修复批量查询优惠券入参问题 · 1cfaa051
  徐康 committed Oct 13, 2020
  
  1cfaa051 Browse Files
- fix 运费月卡入机 · 423c03eb
  huiyang.chen committed Oct 13, 2020
  
  423c03eb Browse Files
- 合并代码 · e27301bf
  ping.wu committed Oct 13, 2020
  
  e27301bf Browse Files
- 促销结果为空判断 · feaee55c
  ping.wu committed Oct 13, 2020
  
  feaee55c Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · cdf551d7
  xiaoer.li@freemud.com committed Oct 13, 2020
  
  cdf551d7 Browse Files
- fix · 5f4f05e7
  xiaoer.li@freemud.com committed Oct 13, 2020
  
  5f4f05e7 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · f87a2c08
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
```
  徐康 committed Oct 13, 2020
  f87a2c08 Browse Files
- Merge branch 'feature/20200915_麦咖啡p2v3活动入机增加TENDERID字段' into qa · 21df525a
  徐康 committed Oct 13, 2020
  
  21df525a Browse Files
- map去重 · 24806fc5
  徐康 committed Oct 13, 2020
  
  24806fc5 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · f9188365
  ping.wu committed Oct 13, 2020
  
  f9188365 Browse Files
- list->map去重 · ca9e4c00
  ping.wu committed Oct 13, 2020
  
  ca9e4c00 Browse Files
- Merge branch 'feature/20200915_麦咖啡p2v3活动入机增加TENDERID字段' into qa · 32f3050f
  徐康 committed Oct 13, 2020
  
  32f3050f Browse Files
- 运费券下单 · 9224d133
  徐康 committed Oct 13, 2020
  
  9224d133 Browse Files
12 Oct, 2020 25 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