Commits · 9a7eabea49b7e8da964a896a949d91744b1b1c38 · order-group-application / order-group · GitLab

01 Mar, 2021 1 commit
- Add:增加商品渠道给促销 · 9a7eabea
  xiaoer.li committed Mar 01, 2021
  
  9a7eabea Browse Files
23 Feb, 2021 1 commit
- 满赠提示 · 1ee962b0
  xiaoer.li@freemud.com committed Feb 23, 2021
  
  1ee962b0 Browse Files
04 Feb, 2021 4 commits
- 商品券使用门槛校验 · 4e872244
  徐康 committed Feb 04, 2021
  
  4e872244 Browse Files
- 商品券使用门槛校验 · 5016c3be
  徐康 committed Feb 04, 2021
  
  5016c3be Browse Files
- Merge branch 'feature/20210203_P5V4购物车新增商品券门槛金额字段_yu.sun' · 149d3e70
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CouponDiscountCalculation.java
```
  yu.sun committed Feb 04, 2021
  149d3e70 Browse Files
- snyu::update::update shoppingcart sdk version · f70a6353
  yu.sun committed Feb 04, 2021
  
  f70a6353 Browse Files
03 Feb, 2021 8 commits
- Merge branch 'feature/20210201_P5V3新增商品券门槛需求_yu.sun' · bd78a2f7
  yu.sun committed Feb 03, 2021
  
  bd78a2f7 Browse Files
- Merge branch 'feature/20210122-购物车商品券核销时间判断' · 88b41181
  chongfu.liang committed Feb 03, 2021
  
  88b41181 Browse Files
- sunyu::update::remove redundance code · 3a53fd6e
  yu.sun committed Feb 03, 2021
  
  3a53fd6e Browse Files
- 换购券 · 747b457d
  chongfu.liang committed Feb 03, 2021
  
  747b457d Browse Files
- sunyu::update::update shopping-cart sdk version · 1b0c4d87
  yu.sun committed Feb 03, 2021
  
  1b0c4d87 Browse Files
- sunyu::update::remove redundance code · c84f6e5c
  yu.sun committed Feb 03, 2021
  
  c84f6e5c Browse Files
- sunyu::update::add new field about /** · f31137e2
  yu.sun committed Feb 03, 2021
  
  f31137e2 Browse Files
- sunyu::update::移除商品券门槛逻辑 · 67dbc193
  yu.sun committed Feb 03, 2021
  
  67dbc193 Browse Files
02 Feb, 2021 23 commits
- Merge branch 'feature/20210201_P5V3新增商品券门槛需求_yu.sun' · f4361b7b
  yu.sun committed Feb 02, 2021
  
  f4361b7b Browse Files
- sunyu::update::fix bug about NPE · fa1e1e92
  yu.sun committed Feb 02, 2021
  
  fa1e1e92 Browse Files
- Merge branch 'feature/20210122_xukang_麦咖啡p5v3' · 07f72cae
  徐康 committed Feb 02, 2021
  
  07f72cae Browse Files
- Merge branch 'master' of gitlab.freemud.com:order-group-application/order-group · f5ba0150
  yu.sun committed Feb 02, 2021
  
  f5ba0150 Browse Files
- Merge branch 'master' of gitlab.freemud.com:order-group-application/order-group · 53b007f4
  yu.sun committed Feb 02, 2021
  
  53b007f4 Browse Files
- 订阅消息添加 · a43db489
  zhiheng.zhang committed Feb 02, 2021
  
  a43db489 Browse Files
- Merge branch 'master' of gitlab.freemud.com:order-group-application/order-group · ecfffdf6
  yu.sun committed Feb 02, 2021
  
  ecfffdf6 Browse Files
- sunyu::update::resolve conflicts · 1222e923
  yu.sun committed Feb 02, 2021
  
  1222e923 Browse Files
- Merge remote-tracking branch 'origin/master' · 0a13adba
  xiaoer.li committed Feb 02, 2021
  
  0a13adba Browse Files
- fix:Test · 43d7cbe4
  xiaoer.li committed Feb 02, 2021
  
  43d7cbe4 Browse Files
- sunyu::update::resolve conflicts · d421fe45
  yu.sun committed Feb 02, 2021
  
  d421fe45 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/2.0.17-C端券过滤' · f0f3d18d
  xiaoer.li committed Feb 02, 2021
  
  f0f3d18d Browse Files
- sunyu::update::resolve conflicts · 600259c3
  yu.sun committed Feb 02, 2021
  
  600259c3 Browse Files
- Merge branch 'feature/20210201_P5V3新增商品券门槛需求_yu.sun' · 191551cc
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/CartGoods.java
```
  yu.sun committed Feb 02, 2021
  191551cc Browse Files
- Merge branch 'feature/20210111_P5V3_太阳蛋需求_yu.sun' · d148ea9f
```
# Conflicts:
#	assortment-shoppingcart-sdk/pom.xml
#	shopping-cart-application-service/pom.xml
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
#	shopping-cart-application-service/src/test/java/cn.freemud/service/CartTest.java
#	shopping-cart-application-service/src/test/java/cn.freemud/service/CouponTest.java
```
  yu.sun committed Feb 02, 2021
  d148ea9f Browse Files
- Merge branch 'feature/20210121异常单推送订阅消息--张志恒' · 1745bded
  zhiheng.zhang committed Feb 02, 2021
  
  1745bded Browse Files
- sunyu::update::resolve conflicts and update SDK version · e6f6845c
  yu.sun committed Feb 02, 2021
  
  e6f6845c Browse Files
- sunyu::update::add new field about sunnyCoupon · d9cccfbd
  yu.sun committed Feb 02, 2021
  
  d9cccfbd Browse Files
- sunyu::update::fix bug · 2d353782
  yu.sun committed Feb 02, 2021
  
  2d353782 Browse Files
- sunyu::update::fix bug about calculate · 7faae147
  yu.sun committed Feb 02, 2021
  
  7faae147 Browse Files
- sunyu::fixbug::修复移除不满足门槛商品券后，价格未更新的bug · 82e65da2
  yu.sun committed Feb 02, 2021
  
  82e65da2 Browse Files
- sunyu::update::remove conpon-product about is not match threshold · d4c883dc
  yu.sun committed Feb 02, 2021
  
  d4c883dc Browse Files
- sunyu::update::update function clear coupon info about coupon is invalid · 85452509
  yu.sun committed Feb 02, 2021
  
  85452509 Browse Files
01 Feb, 2021 3 commits
- sunyu::update::update function clear coupon info about coupon is invalid · 74cd5a81
  yu.sun committed Feb 01, 2021
  
  74cd5a81 Browse Files
- sunyu::update::update function clear coupon info about coupon is invalid · ebba687a
  yu.sun committed Feb 01, 2021
  
  ebba687a Browse Files
- sunyu::update::update function clear coupon info about coupon is invalid · f7a57b24
  yu.sun committed Feb 01, 2021
  
  f7a57b24 Browse Files