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

01 Sep, 2020 4 commits
- Merge branch 'feature/20200727_麦咖啡p1v2支付券码路由' into develop · aae8b43b
  徐康 committed Sep 01, 2020
  
  aae8b43b Browse Files
- 麦咖啡除了创建订单接口接口都不校验unionId · 34717f08
  徐康 committed Sep 01, 2020
  
  34717f08 Browse Files
- Merge branch 'feature/20200727_麦咖啡p1v2支付券码路由' into develop · 0a73f28d
  徐康 committed Sep 01, 2020
  
  0a73f28d Browse Files
- unionId校验 · e9f1877a
  徐康 committed Sep 01, 2020
  
  e9f1877a Browse Files
31 Aug, 2020 10 commits
- Merge remote-tracking branch 'origin/develop' into develop · 86fca62a
  徐康 committed Aug 31, 2020
  
  86fca62a Browse Files
- Merge branch 'feature/20200727_麦咖啡p1v2支付券码路由' into develop · 7feac6fe
  徐康 committed Aug 31, 2020
  
  7feac6fe Browse Files
- 申请取消配送单 · b3a84802
  徐康 committed Aug 31, 2020
  
  b3a84802 Browse Files
- Merge branches 'develop' and 'feature/20200721_麦咖啡购物车_wuping' of… · 452ab11a
```
Merge branches 'develop' and 'feature/20200721_麦咖啡购物车_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop
```
  ping.wu committed Aug 31, 2020
  452ab11a Browse Files
- 商品券行商品不可增加数量 · ab3bce4b
  ping.wu committed Aug 31, 2020
  
  ab3bce4b Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · 991ff3a5
  徐康 committed Aug 31, 2020
  
  991ff3a5 Browse Files
- Merge branch 'feature-2020/8/6-McCafe-会阳' into develop · c2972a70
  徐康 committed Aug 31, 2020
  
  c2972a70 Browse Files
- 配送回调 · 47c7ca1d
  徐康 committed Aug 31, 2020
  
  47c7ca1d Browse Files
- Merge branches 'develop' and 'feature/20200721_麦咖啡购物车_wuping' of… · 404cee67
```
Merge branches 'develop' and 'feature/20200721_麦咖啡购物车_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop
```
  ping.wu committed Aug 31, 2020
  404cee67 Browse Files
- 会员不返回券开始结束时间取券码新加的返回时间 · cc085a29
  ping.wu committed Aug 31, 2020
  
  cc085a29 Browse Files
30 Aug, 2020 2 commits
- Merge branches 'develop' and 'feature/20200721_麦咖啡购物车_wuping' of… · 6a912b04
```
Merge branches 'develop' and 'feature/20200721_麦咖啡购物车_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop
```
  ping.wu committed Aug 30, 2020
  6a912b04 Browse Files
- 会员不返回券开始结束时间报错修改 · e0f6c9c4
  ping.wu committed Aug 30, 2020
  
  e0f6c9c4 Browse Files
28 Aug, 2020 21 commits
- Merge remote-tracking branch 'origin/develop' into develop · 7d593dce
  徐康 committed Aug 28, 2020
  
  7d593dce Browse Files
- Merge branch 'feature-2020/8/6-McCafe-会阳' into develop · b034a6bb
  徐康 committed Aug 28, 2020
  
  b034a6bb Browse Files
- 配送回调简单处理几种状态 · 8a666ce3
  徐康 committed Aug 28, 2020
  
  8a666ce3 Browse Files
- Merge branches 'develop' and 'feature/20200721_麦咖啡购物车_wuping' of… · 620273bd
```
Merge branches 'develop' and 'feature/20200721_麦咖啡购物车_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop
```
  ping.wu committed Aug 28, 2020
  620273bd Browse Files
- 超值加购活动键位编号 · 6a25171e
  ping.wu committed Aug 28, 2020
  
  6a25171e Browse Files
- Merge branch 'feature/1.9.36-新增银联礼品卡支付-肖家炜' into develop · 89c79879
```
# Conflicts:
#	order-application-service/pom.xml
#	order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderVo.java
```
  vega committed Aug 28, 2020
  89c79879 Browse Files
- feat:createOrder:清理idea自动生成的配置文件 · db9df7a5
  vega committed Aug 28, 2020
  
  db9df7a5 Browse Files
- feat:createOrder:新增礼品卡支付方式,再次升级支付sdk · b94ad4e4
  vega committed Aug 28, 2020
  
  b94ad4e4 Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · 691f1df3
  徐康 committed Aug 28, 2020
  
  691f1df3 Browse Files
- Merge branch 'feature/20200727_麦咖啡p1v2支付券码路由' into develop · f4a0de5f
  徐康 committed Aug 28, 2020
  
  f4a0de5f Browse Files
- settlement类型转换 · 765d5a35
  徐康 committed Aug 28, 2020
  
  765d5a35 Browse Files
- Merge branches 'develop' and 'feature/20200721_麦咖啡购物车_wuping' of… · ecc451e1
```
Merge branches 'develop' and 'feature/20200721_麦咖啡购物车_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop
```
  ping.wu committed Aug 28, 2020
  ecc451e1 Browse Files
- 优惠计算修改 · fcb4b766
  ping.wu committed Aug 28, 2020
  
  fcb4b766 Browse Files
- feat:createOrder:新增礼品卡支付方式,升级支付sdk · 5940599d
  vega committed Aug 28, 2020
  
  5940599d Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · d3791d11
  徐康 committed Aug 28, 2020
  
  d3791d11 Browse Files
- Merge branch 'feature/20200727_麦咖啡p1v2支付券码路由' into develop · 28615c84
  徐康 committed Aug 28, 2020
  
  28615c84 Browse Files
- 麦当劳的extraId对应我们的shopId · fb81c7fb
  徐康 committed Aug 28, 2020
  
  fb81c7fb Browse Files
- Merge branch 'feature/1.9.37-核销券码逻辑修改' into develop · 3b6ca1ff
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderAdapterServiceImpl.java
```
  vega committed Aug 28, 2020
  3b6ca1ff Browse Files
- 修改字段名,暂存 · a7f94da3
  vega committed Aug 28, 2020
  
  a7f94da3 Browse Files
- Merge branches 'develop' and 'feature/20200721_麦咖啡购物车_wuping' of… · f11d1ae4
```
Merge branches 'develop' and 'feature/20200721_麦咖啡购物车_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop
```
  ping.wu committed Aug 28, 2020
  f11d1ae4 Browse Files
- 商品行限时特价优惠数量返回 · 4091f137
  ping.wu committed Aug 28, 2020
  
  4091f137 Browse Files
27 Aug, 2020 3 commits
- Merge branches 'develop' and 'feature/20200721_麦咖啡购物车_wuping' of… · d7023ef6
```
Merge branches 'develop' and 'feature/20200721_麦咖啡购物车_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop
```
  ping.wu committed Aug 27, 2020
  d7023ef6 Browse Files
- 麦咖啡购物车可用券 · ffb66ec0
  ping.wu committed Aug 27, 2020
  
  ffb66ec0 Browse Files
- Merge branch 'fix/1.9.37-支付补偿通知transId为空报错' into develop · e3f40114
  vega committed Aug 27, 2020
  
  e3f40114 Browse Files