Commits · 1a3523ccbda4ee630e4c7f63d9c78c541ff568ca · order-group-application / order-group · GitLab

04 Mar, 2021 1 commit
- 关键字处理使用fastjson处理关键字 · 1a3523cc
  zhiheng.zhang committed Mar 04, 2021
  
  1a3523cc Browse Files
23 Feb, 2021 2 commits
- 购物车引入灰度jar · 7bacb893
  zhiheng.zhang committed Feb 23, 2021
  
  7bacb893 Browse Files
- 购物车引入灰度jar · 17d3e4fd
  zhiheng.zhang committed Feb 23, 2021
  
  17d3e4fd Browse Files
05 Feb, 2021 1 commit
- 升级后请求方式修改 · 28fbc8ae
  zhiheng.zhang committed Feb 05, 2021
  
  28fbc8ae Browse Files
04 Feb, 2021 2 commits
- 转交换器null 转换为 "" 去除 · 5c221290
  zhiheng.zhang committed Feb 04, 2021
  
  5c221290 Browse Files
- 去除空的构造函数注解 · f220c55f
  zhiheng.zhang committed Feb 04, 2021
  
  f220c55f Browse Files
03 Feb, 2021 2 commits
- @nonnull 注解修改为 @notnull · 7695db09
  zhiheng.zhang committed Feb 03, 2021
  
  7695db09 Browse Files
- spring cloud 版本升级 · a88f941d
  zhiheng.zhang committed Feb 03, 2021
  
  a88f941d 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 7 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
- sunyu::update::update function clear coupon info about coupon is invalid · eda22477
  yu.sun committed Feb 01, 2021
  
  eda22477 Browse Files
- Merge remote-tracking branch 'origin/feature/evaluationFilter-刘鹏飞' · a560ee84
  刘鹏飞 committed Feb 01, 2021
  
  a560ee84 Browse Files
- assortment-orderdistributor-sdk升级依赖3.5.7.RELEASE · b84cc2d8
  刘鹏飞 committed Feb 01, 2021
  
  b84cc2d8 Browse Files
- sunyu::update::update function clear coupon info about coupon is invalid · 187f9d93
  yu.sun committed Feb 01, 2021
  
  187f9d93 Browse Files
29 Jan, 2021 2 commits
- 异常添加异常信息描述 · 47926c20
  zhiheng.zhang committed Jan 29, 2021
  
  47926c20 Browse Files
- 异常添加异常信息描述 · 9c86d1df
  zhiheng.zhang committed Jan 29, 2021
  
  9c86d1df Browse Files