Commits · d421fe451caaa90d66d4f56833f5992dd45e1a00 · order-group-application / order-group · GitLab

02 Feb, 2021 11 commits
- sunyu::update::resolve conflicts · d421fe45
  yu.sun committed Feb 02, 2021
  
  d421fe45 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
- 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
28 Jan, 2021 22 commits
- Merge branch 'feature/20210125-益禾堂添加排队号-张志恒' · 8dd3328a
  zhiheng.zhang committed Jan 28, 2021
  
  8dd3328a Browse Files
- 去除日志打印 · 736c9287
  zhiheng.zhang committed Jan 28, 2021
  
  736c9287 Browse Files
- 添加打印日志 · d20d6798
  zhiheng.zhang committed Jan 28, 2021
  
  d20d6798 Browse Files
- Merge branch 'feature/20210125-益禾堂添加排队号-张志恒' · 9f0915b2
  zhiheng.zhang committed Jan 28, 2021
  
  9f0915b2 Browse Files
- 添加门店开关是否展示进度条字段 · 295125fc
  zhiheng.zhang committed Jan 28, 2021
  
  295125fc Browse Files
- Merge remote-tracking branch 'origin/master' · 00686b74
  zhiheng.zhang committed Jan 28, 2021
  
  00686b74 Browse Files
- 添加门店开关是否展示进度条jar包版本升级 · f702d316
  zhiheng.zhang committed Jan 28, 2021
  
  f702d316 Browse Files
- Merge branch 'feature/20200108_xukang_麦咖啡p5v2' · 92f86e05
  徐康 committed Jan 28, 2021
  
  92f86e05 Browse Files
- 添加门店开关是否展示进度条 · e5e252f1
  zhiheng.zhang committed Jan 28, 2021
  
  e5e252f1 Browse Files
- Merge remote-tracking branch 'origin/master' · 131f94c3
  zhiheng.zhang committed Jan 28, 2021
  
  131f94c3 Browse Files
- Merge branch 'feature/20210125-益禾堂添加排队号-张志恒' · e8a1d982
  zhiheng.zhang committed Jan 28, 2021
  
  e8a1d982 Browse Files
- 添加门店开关是否展示进度条 · 5f6141bb
  zhiheng.zhang committed Jan 28, 2021
  
  5f6141bb Browse Files
- Merge branch 'feature/20210128_combo券优惠价为0键位错误bugfix_yu.sun' · 6e2cd30a
  yu.sun committed Jan 28, 2021
  
  6e2cd30a Browse Files
- 注册中心注释修改 · 17119d26
  zhiheng.zhang committed Jan 28, 2021
  
  17119d26 Browse Files
- 注册中心注释修改 · 68a7a690
  zhiheng.zhang committed Jan 28, 2021
  
  68a7a690 Browse Files
- 麦咖啡配送回调 · e497ac9f
  徐康 committed Jan 28, 2021
  
  e497ac9f Browse Files
- 益禾堂添加排队号版本升级 · 5522c0b5
  zhiheng.zhang committed Jan 28, 2021
  
  5522c0b5 Browse Files
- 益禾堂添加排队号版本升级 · 46d751ba
  zhiheng.zhang committed Jan 28, 2021
  
  46d751ba Browse Files
- Merge branch 'feature/20210125-益禾堂添加排队号-张志恒' · 0576d258
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
#	ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/service/OrderSdkService.java
```
  zhiheng.zhang committed Jan 28, 2021
  0576d258 Browse Files
- 有售后单子不展示进度条 · 253b3441
  zhiheng.zhang committed Jan 28, 2021
  
  253b3441 Browse Files
- 套餐原价计算修改 · e0cf1b31
  徐康 committed Jan 28, 2021
  
  e0cf1b31 Browse Files
- 有售后单子不展示进度条 · c62eab02
  zhiheng.zhang committed Jan 28, 2021
  
  c62eab02 Browse Files