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

08 Mar, 2021 4 commits
- Merge branch 'feature/20210224-订单添加备注信息-张志恒' · e4141454
  zhiheng.zhang committed Mar 08, 2021
  
  e4141454 Browse Files
- Merge remote-tracking branch 'origin/master' · fe9c74d2
  zhiheng.zhang committed Mar 08, 2021
  
  fe9c74d2 Browse Files
- Merge branch 'feature/20210224-自主积分添加订单统计-张志恒' · 0159eabb
  zhiheng.zhang committed Mar 08, 2021
  
  0159eabb Browse Files
- 取餐页面判断门店返回不为空 · a206df90
  zhiheng.zhang committed Mar 08, 2021
  
  a206df90 Browse Files
06 Mar, 2021 2 commits
- sunyu::update::!Objects.equals(cartGoods.getSkuId(),cartGoods.getSpuId()) · 950ed570
  孙昱 committed Mar 06, 2021
  
  950ed570 Browse Files
- sunyu::update · 4e91346d
  孙昱 committed Mar 06, 2021
  
  4e91346d Browse Files
04 Mar, 2021 5 commits
- sunyu::update::evm套餐价格计算bug修复 · 24e361a3
  孙昱 committed Mar 05, 2021
  
  24e361a3 Browse Files
- 加点日志 · c7be7241
  刘鹏飞 committed Mar 04, 2021
  
  c7be7241 Browse Files
- Merge branch 'feature/20210301_月享卡有效性校验_yu.sun' · e982f002
  孙昱 committed Mar 04, 2021
  
  e982f002 Browse Files
- 加点日志 · 2a1aba20
  刘鹏飞 committed Mar 04, 2021
  
  2a1aba20 Browse Files
- sunyu::update::update about monthCard validate · 649f9f51
  孙昱 committed Mar 04, 2021
  
  649f9f51 Browse Files
03 Mar, 2021 4 commits
- 升级assortment-shoppingcart-sdk依赖为1.2.4.RELEASE · 2a86cb79
  刘鹏飞 committed Mar 03, 2021
  
  2a86cb79 Browse Files
- 升级assortment-shoppingcart-sdk为1.2.4.RELEASE · 784cc314
  刘鹏飞 committed Mar 03, 2021
  
  784cc314 Browse Files
- Merge remote-tracking branch 'origin/feature/materia-刘鹏飞' · e1d46985
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/enums/ResponseResult.java
```
  刘鹏飞 committed Mar 03, 2021
  e1d46985 Browse Files
- Merge branch 'feature/20210303_hotfix_yu.sun' · cf7cbe57
  孙昱 committed Mar 03, 2021
  
  cf7cbe57 Browse Files
02 Mar, 2021 11 commits
- sunyu::update::补充新拉分支遗漏的代码 · 96cd6fab
  孙昱 committed Mar 03, 2021
  
  96cd6fab Browse Files
- Merge branch 'feature/20210303_hotfix_yu.sun' · 6fd02e85
  孙昱 committed Mar 03, 2021
  
  6fd02e85 Browse Files
- sunyu::update::fix bug about not present value · 9249300f
  孙昱 committed Mar 03, 2021
  
  9249300f Browse Files
- Merge branch 'feature/20210303_hotfix_yu.sun' · be5152bd
  孙昱 committed Mar 03, 2021
  
  be5152bd Browse Files
- sunyu::update::hot fix about not present value · c91a5235
  孙昱 committed Mar 03, 2021
  
  c91a5235 Browse Files
- 升级sdk · 601110ae
  徐康 committed Mar 02, 2021
  
  601110ae Browse Files
- Merge branch 'feature/20210128_xukang_麦咖啡p5v5' · 397d9326
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/delivery/ThirdDeliveryServiceImpl.java
```
  徐康 committed Mar 02, 2021
  397d9326 Browse Files
- Merge branch 'feature/20210127_xukang_麦咖啡p5v4' · 5afbf75b
  徐康 committed Mar 02, 2021
  
  5afbf75b Browse Files
- 发订阅消息 · ec55ef0a
  徐康 committed Mar 02, 2021
  
  ec55ef0a Browse Files
- 发订阅消息 · 47ec4770
  徐康 committed Mar 02, 2021
  
  47ec4770 Browse Files
- 发订阅消息 · 166e1efc
  徐康 committed Mar 02, 2021
  
  166e1efc Browse Files
01 Mar, 2021 9 commits
- 发订阅消息 · 71c7fd53
  徐康 committed Mar 01, 2021
  
  71c7fd53 Browse Files
- 订单价格 · e68dd553
  徐康 committed Mar 01, 2021
  
  e68dd553 Browse Files
- 餐道合商品 · f87042e4
  徐康 committed Mar 01, 2021
  
  f87042e4 Browse Files
- sunyu::update::fix bug about NPE · ea25f8a9
  孙昱 committed Mar 01, 2021
  
  ea25f8a9 Browse Files
- 入参增加ordercode · aa091a95
  徐康 committed Mar 01, 2021
  
  aa091a95 Browse Files
- 限时特价修复错误的价格 · 4e680a7a
  刘鹏飞 committed Mar 01, 2021
  
  4e680a7a Browse Files
- 发更新取餐码提前 · 4a9f7357
  徐康 committed Mar 01, 2021
  
  4a9f7357 Browse Files
- sunyu::update::seedCouponGoodsInfo validate · 218d7b80
  孙昱 committed Mar 01, 2021
  
  218d7b80 Browse Files
- 合并商品 · 3dcabfaa
  徐康 committed Mar 01, 2021
  
  3dcabfaa Browse Files
26 Feb, 2021 5 commits
- sunyu::update::非空判断 · df1f42b6
  孙昱 committed Feb 27, 2021
  
  df1f42b6 Browse Files
- 老版促销优惠券可用不可用列表 · bbb85bb8
  刘鹏飞 committed Feb 26, 2021
  
  bbb85bb8 Browse Files
- sunyu::update::促销算价接口订单级别优惠返回cartGoodsUid透传给订单 · c7d59fa7
  孙昱 committed Feb 26, 2021
  
  c7d59fa7 Browse Files
- 订阅消息 · ce72b0f8
  徐康 committed Feb 26, 2021
  
  ce72b0f8 Browse Files
- 修改问题 · 24468b70
  徐康 committed Feb 26, 2021
  
  24468b70 Browse Files