Commits · 7aca2ae9edf2c5db27cef248d3acc7b0248419a9 · order-group-application / order-group · GitLab

15 Sep, 2020 22 commits
- Merge branch 'feature-yu.sun-20200915' into develop · 7aca2ae9
  yu.sun committed Sep 15, 2020
  
  7aca2ae9 Browse Files
- sunyu::update::update product-center-sdk version about check product api for shoppingcart · 5afad96b
  yu.sun committed Sep 15, 2020
  
  5afad96b Browse Files
- Merge branch 'feature-yu.sun-20200915' into develop · 49354806
  yu.sun committed Sep 15, 2020
  
  49354806 Browse Files
- sunyu::update::update product-center-sdk version about check product api for shoppingcart · f5c547ab
  yu.sun committed Sep 15, 2020
  
  f5c547ab Browse Files
- Merge branch 'feature-yu.sun-20200915' into develop · 4ccafe9a
  yu.sun committed Sep 15, 2020
  
  4ccafe9a Browse Files
- sunyu::update::update product-center-sdk version about check product api for shoppingcart · c8d88404
  yu.sun committed Sep 15, 2020
  
  c8d88404 Browse Files
- Merge branch 'feature-yu.sun-20200915' into develop · fad49e58
  yu.sun committed Sep 15, 2020
  
  fad49e58 Browse Files
- sunyu::update::update about shoppingCart · 2d7b6fe5
  yu.sun committed Sep 15, 2020
  
  2d7b6fe5 Browse Files
- 混合支付 · 33ed8827
  zhiheng.zhang committed Sep 15, 2020
  
  33ed8827 Browse Files
- Merge branch 'feature/2020/09/11-1.9.39-混合支付-张志恒' into develop · bfd80999
```
# Conflicts:
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
#	order-application-service/src/main/java/cn/freemud/entities/dto/order/CreatePrepayRequestDto.java
#	order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderVo.java
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
```
  zhiheng.zhang committed Sep 15, 2020
  bfd80999 Browse Files
- 添加商户号，灰度使用 · c86c7c67
  zhiheng.zhang committed Sep 15, 2020
  
  c86c7c67 Browse Files
- Merge branch '20200827-1000' of gitlab.freemud.com:order-group-application/order-group into develop · 392ac7e4
  张洪旺 committed Sep 15, 2020
  
  392ac7e4 Browse Files
- 订单完成接口使用新的订单状态 · 8a4fdf48
  张洪旺 committed Sep 15, 2020
  
  8a4fdf48 Browse Files
- Merge branch '20200827-1000' of gitlab.freemud.com:order-group-application/order-group into develop · 5b4354b4
  张洪旺 committed Sep 15, 2020
  
  5b4354b4 Browse Files
- 移除富有关键字 · 60c5c777
  张洪旺 committed Sep 15, 2020
  
  60c5c777 Browse Files
- Merge branch 'develop' of gitlab.freemud.com:order-group-application/order-group into develop · a10ea4d9
  张洪旺 committed Sep 15, 2020
  
  a10ea4d9 Browse Files
- Merge branch '20200827-1000' of gitlab.freemud.com:order-group-application/order-group into develop · 7343c407
  张洪旺 committed Sep 15, 2020
  
  7343c407 Browse Files
- 移除富有关键字 · 91f63fb0
  张洪旺 committed Sep 15, 2020
  
  91f63fb0 Browse Files
- Merge branch 'feature/20200914-1.9.39-支付渠道对接生态-肖家炜' into develop · 9c6e8643
  vega committed Sep 15, 2020
  
  9c6e8643 Browse Files
- feat:修改外卖sdk版本 · 5248fa07
  vega committed Sep 15, 2020
  
  5248fa07 Browse Files
- Merge branch '20200827-1000' of gitlab.freemud.com:order-group-application/order-group into develop · f3734a43
  张洪旺 committed Sep 15, 2020
  
  f3734a43 Browse Files
- 支持现金支付 · 99874130
  张洪旺 committed Sep 15, 2020
  
  99874130 Browse Files
14 Sep, 2020 6 commits
- Merge branch 'feature/1.9.36-新增银联礼品卡支付-肖家炜' into develop · ea3e2b84
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
#	order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderVo.java
```
  vega committed Sep 14, 2020
  ea3e2b84 Browse Files
- 解决之前的冲突 · ff7eaca3
  vega committed Sep 14, 2020
  
  ff7eaca3 Browse Files
- 银联礼品卡修改为电子风味卡 · 8eef2357
  vega committed Sep 14, 2020
  
  8eef2357 Browse Files
- Merge branch 'feature/20200914-1.9.39-支付渠道对接生态-肖家炜' into develop · e0d3d43a
  vega committed Sep 14, 2020
  
  e0d3d43a Browse Files
- 优化转换 · d44266e1
  vega committed Sep 14, 2020
  
  d44266e1 Browse Files
- 创建运单时传订单来源渠道 · 6973cb16
  vega committed Sep 14, 2020
  
  6973cb16 Browse Files
11 Sep, 2020 12 commits
- Merge branch 'develop' of gitlab.freemud.com:order-group-application/order-group into develop · f141d1b9
  孙昱 committed Sep 11, 2020
  
  f141d1b9 Browse Files
- Merge branch 'feature-yu.sun-20200911' into develop · 79866032
  孙昱 committed Sep 11, 2020
  
  79866032 Browse Files
- sunyu::update::update api about queryCartInfoByUser · 02c613b9
  孙昱 committed Sep 11, 2020
  
  02c613b9 Browse Files
- Merge branch '20200827-1000' of gitlab.freemud.com:order-group-application/order-group into develop · 8d7b4fc0
```
1
# Conflicts:
#	order-application-service/pom.xml
#	order-application-service/src/main/java/cn/freemud/enums/ResponseResult.java
#	ordercenter-sdk/pom.xml
#	ordercenter-sdk/readme.md

fix
```
  张洪旺 committed Sep 11, 2020
  8d7b4fc0 Browse Files
- Merge branch '20200827-1000' of gitlab.freemud.com:order-group-application/order-group into develop · 1dbdb924
```
# Conflicts:
#	order-application-service/pom.xml
#	order-application-service/src/main/java/cn/freemud/enums/ResponseResult.java
#	ordercenter-sdk/pom.xml
#	ordercenter-sdk/readme.md
```
  张洪旺 committed Sep 11, 2020
  1dbdb924 Browse Files
- sunyu::update::fix conflicts about pom · a7b9e3bc
  孙昱 committed Sep 11, 2020
  
  a7b9e3bc Browse Files
- sunyu::update::fix conflicts about pom · 19937706
  孙昱 committed Sep 11, 2020
  
  19937706 Browse Files
- sunyu::fix::fix conflicts about merge · 38672303
  孙昱 committed Sep 11, 2020
  
  38672303 Browse Files
- sunyu::fix::resolve conflicts about merge feature to develop · a15e6d79
  孙昱 committed Sep 11, 2020
  
  a15e6d79 Browse Files
- sunyu::new api::about getCartInfoByUser · e075d22e
  孙昱 committed Sep 11, 2020
  
  e075d22e Browse Files
- 修复代码异常 · 438653b0
  徐康 committed Sep 11, 2020
  
  438653b0 Browse Files
- Merge branch 'feature/20200727_麦咖啡p1v2支付券码路由' into develop · aa6beca2
```
# Conflicts:
#	order-application-service/pom.xml
```
  徐康 committed Sep 11, 2020
  aa6beca2 Browse Files