Commits · 895f3ca04dbcb89911d2ededc2a6b891fd53e18d · order-group-application / order-group · GitLab

24 Dec, 2020 8 commits
- Merge branch 'feature/20201217_四个非常搭套餐需求_yu.sun' into develop · 895f3ca0
  yu.sun committed Dec 24, 2020
  
  895f3ca0 Browse Files
- sunyu::update::update about productGroup add Mateial about price calculate · e91adf87
  yu.sun committed Dec 24, 2020
  
  e91adf87 Browse Files
- dev代码少了实现方法platformPaysuccess 从QA拿到代码复制过来 · beb17f3a
  hanghang.wang committed Dec 24, 2020
  
  beb17f3a Browse Files
- 解决冲突 · a970643e
  hanghang.wang committed Dec 24, 2020
  
  a970643e Browse Files
- Merge remote-tracking branch… · cb6d2ac8
```
Merge remote-tracking branch 'origin/feature/20201223_用户订单查询促销信息转为payGiftReps_wanghanghang' into develop

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/entities/vo/QueryOrderResponseVo.java
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
```
  hanghang.wang committed Dec 24, 2020
  cb6d2ac8 Browse Files
- 注释新增促销字段，改为对象传参 · 25955a38
  hanghang.wang committed Dec 24, 2020
  
  25955a38 Browse Files
- 促销返回参数对象 20201223 提出紧急需求变更 · 4304bff9
  hanghang.wang committed Dec 24, 2020
  
  4304bff9 Browse Files
- 20201223 1322行变更-》去掉set，直接以对象进行返参 · 4d33314d
  hanghang.wang committed Dec 24, 2020
  
  4d33314d Browse Files
23 Dec, 2020 18 commits
- 代码合并 · 355d992c
  zhiheng.zhang committed Dec 23, 2020
  
  355d992c Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · 8111fab5
  zhiheng.zhang committed Dec 23, 2020
  
  8111fab5 Browse Files
- 新增口碑渠道外卖单判断逻辑 · 4969363a
  缪晖 committed Dec 23, 2020
  
  4969363a Browse Files
- 代码合并 · cb192f81
  zhiheng.zhang committed Dec 23, 2020
  
  cb192f81 Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · 21372771
```
# Conflicts:
#	assortment-ordercenter-sdk/readme.md
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
```
  zhiheng.zhang committed Dec 23, 2020
  21372771 Browse Files
- 代码合并 · 59d2478d
  zhiheng.zhang committed Dec 23, 2020
  
  59d2478d Browse Files
- 代码合并 · db16f696
  zhiheng.zhang committed Dec 23, 2020
  
  db16f696 Browse Files
- Merge branch 'feature/20201223-订单详情查询接口增加配送类型字段-张志恒' into develop · 891436d5
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	order-application-service/pom.xml
#	order-application-service/src/main/java/cn/freemud/service/Orderservice.java
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderAdapterServiceImpl.java
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
#	ordercenter-sdk/pom.xml
#	ordercenter-sdk/readme.md
```
  zhiheng.zhang committed Dec 23, 2020
  891436d5 Browse Files
- 添加配送字段 · 7db28739
  zhiheng.zhang committed Dec 23, 2020
  
  7db28739 Browse Files
- 添加配送字段 · 6dcf133c
  zhiheng.zhang committed Dec 23, 2020
  
  6dcf133c Browse Files
- 20201222 新增配送类型 ->【ID1021986】【订单开放平台】订单详情查询接口增加配送类型字段 · a5284f23
  hanghang.wang committed Dec 23, 2020
  
  a5284f23 Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · a44ee5f2
  刘鹏飞 committed Dec 23, 2020
  
  a44ee5f2 Browse Files
- 版本号升级 · 98a59bea
  刘鹏飞 committed Dec 23, 2020
  
  98a59bea Browse Files
- Merge branch 'feature/20201217_四个非常搭套餐需求_yu.sun' into develop · 3c87539e
  yu.sun committed Dec 23, 2020
  
  3c87539e Browse Files
- sunyu::resolve conflicts · f8a4cd08
  yu.sun committed Dec 23, 2020
  
  f8a4cd08 Browse Files
- Merge remote-tracking branch 'origin/feature/coco_new-刘鹏飞' into develop · 3ca4d962
  刘鹏飞 committed Dec 23, 2020
  
  3ca4d962 Browse Files
- sunyu::resolve conflicts::fix about merge branch conflicts · 2f5633d7
  yu.sun committed Dec 23, 2020
  
  2f5633d7 Browse Files
- sunyu::resolve conflicts::fix about merge branch conflicts · aa11dc5f
  yu.sun committed Dec 23, 2020
  
  aa11dc5f Browse Files
22 Dec, 2020 14 commits
- Merge branch 'feature/2.0.12-富友线下对接开放平台-lcf' into develop · bb3b2efa
  chongfu.liang committed Dec 22, 2020
  
  bb3b2efa Browse Files
- coco定制核销优惠券 · 8e410187
  刘鹏飞 committed Dec 22, 2020
  
  8e410187 Browse Files
- sdk jar包升级 · 72d12698
  zhiheng.zhang committed Dec 22, 2020
  
  72d12698 Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · 908a1316
  zhiheng.zhang committed Dec 22, 2020
  
  908a1316 Browse Files
- sdk jar包升级 · 8e7787d2
  zhiheng.zhang committed Dec 22, 2020
  
  8e7787d2 Browse Files
- Merge branch 'feature/20201209_xukang_麦咖啡p4v2' into develop · a08694cc
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
```
  徐康 committed Dec 22, 2020
  a08694cc Browse Files
- Merge branch 'feature/20201209_xukang_麦咖啡p4v2' · d73fc4df
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
```
  徐康 committed Dec 22, 2020
  d73fc4df Browse Files
- fix · 7e6a3fe8
  张洪旺 committed Dec 22, 2020
  
  7e6a3fe8 Browse Files
- sunyu::update::productGroup material price calculate · 7aefb02a
  yu.sun committed Dec 22, 2020
  
  7aefb02a Browse Files
- 富友 · 4709b0bd
  chongfu.liang committed Dec 22, 2020
  
  4709b0bd Browse Files
- Merge branch 'feature/2.0.12-富友线下对接开放平台-lcf' into develop · 9b1328d2
  chongfu.liang committed Dec 22, 2020
  
  9b1328d2 Browse Files
- 返回校验 · 02f53f53
  chongfu.liang committed Dec 22, 2020
  
  02f53f53 Browse Files
- Merge branch 'feature/20201214-买一增一赠品价格修改-lcf' · 5f380af8
  chongfu.liang committed Dec 22, 2020
  
  5f380af8 Browse Files
- 删除注释代码 · 886b1c8e
  xiaoer.li@freemud.com committed Dec 22, 2020
  
  886b1c8e Browse Files