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

28 Aug, 2020 2 commits
- 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 12 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
- fix:反序列化问题 · 37cac631
  vega committed Aug 27, 2020
  
  37cac631 Browse Files
- Merge branch 'fix/1.9.37-支付补偿通知transId为空报错' into develop · cfcc968f
  vega committed Aug 27, 2020
  
  cfcc968f Browse Files
- fix:sdk:反序列失败问题解决 · a8261b11
  vega committed Aug 27, 2020
  
  a8261b11 Browse Files
- Merge branch 'feature/20200727_麦咖啡p1v2支付券码路由' into develop · b044aff4
  徐康 committed Aug 27, 2020
  
  b044aff4 Browse Files
- 使用购物车的customerCode和productCode · 6ec33db6
  徐康 committed Aug 27, 2020
  
  6ec33db6 Browse Files
- 删除测试 · 79bef764
  徐康 committed Aug 27, 2020
  
  79bef764 Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · efd075cf
  徐康 committed Aug 27, 2020
  
  efd075cf Browse Files
- Merge branch 'feature/20200727_麦咖啡p1v2支付券码路由' into develop · aa5709e6
  徐康 committed Aug 27, 2020
  
  aa5709e6 Browse Files
- 麦咖啡不需要移除卡包 · 3477b74b
  徐康 committed Aug 27, 2020
  
  3477b74b Browse Files
26 Aug, 2020 10 commits
- Merge branches 'develop' and 'feature/20200820_哗啦啦产品分类名称_wuping' of… · 03038fe2
```
Merge branches 'develop' and 'feature/20200820_哗啦啦产品分类名称_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop

# Conflicts:
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
```
  ping.wu committed Aug 26, 2020
  03038fe2 Browse Files
- 错误修改 · 40227d53
  ping.wu committed Aug 26, 2020
  
  40227d53 Browse Files
- 错误修改 · 30fdb097
  ping.wu committed Aug 26, 2020
  
  30fdb097 Browse Files
- 错误修改 · 06ad5440
  ping.wu committed Aug 26, 2020
  
  06ad5440 Browse Files
- Merge branches 'develop' and 'feature/20200820_哗啦啦产品分类名称_wuping' of… · da820744
```
Merge branches 'develop' and 'feature/20200820_哗啦啦产品分类名称_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
```
  ping.wu committed Aug 26, 2020
  da820744 Browse Files
- 联调，暂时不退钱 · f9311a88
  徐康 committed Aug 26, 2020
  
  f9311a88 Browse Files
- 三方产品编号名称修改 · ec457de6
  ping.wu committed Aug 26, 2020
  
  ec457de6 Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · fa31ab87
  徐康 committed Aug 26, 2020
  
  fa31ab87 Browse Files
- Merge branch 'feature/20200727_麦咖啡p1v2支付券码路由' into develop · b4641bc1
  徐康 committed Aug 26, 2020
  
  b4641bc1 Browse Files
- 批量移除卡包 · bdef753f
  徐康 committed Aug 26, 2020
  
  bdef753f Browse Files
25 Aug, 2020 11 commits
- Merge branch 'feature-2020/8/6-McCafe-会阳' into develop · 89add2f7
  huiyang.chen committed Aug 25, 2020
  
  89add2f7 Browse Files
- 刷新接口返回交易号 · ca904c57
  huiyang.chen committed Aug 25, 2020
  
  ca904c57 Browse Files
- Merge branches 'develop' and 'feature/20200721_麦咖啡购物车_wuping' of… · 50020790
```
Merge branches 'develop' and 'feature/20200721_麦咖啡购物车_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop
```
  ping.wu committed Aug 25, 2020
  50020790 Browse Files
- 商品券调整 · b670c7f8
  ping.wu committed Aug 25, 2020
  
  b670c7f8 Browse Files
- 商品券调整 · 5ec3cea7
  ping.wu committed Aug 25, 2020
  
  5ec3cea7 Browse Files
- Merge branch 'fix/1.9.37-支付补偿通知transId为空报错' into develop · d2556051
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	assortment-shoppingcart-sdk/pom.xml
#	assortment-shoppingcart-sdk/readme.md
#	order-application-service/pom.xml
#	order-application-service/src/main/java/cn/freemud/service/impl/AppOrderServiceImpl.java
#	ordercenter-sdk/pom.xml
#	ordercenter-sdk/readme.md
#	shopping-cart-application-service/pom.xml
```
  vega committed Aug 25, 2020
  d2556051 Browse Files
- fix:orderSdk:queryRelatedOrderByCode方法改为手动反序列化 · 332b37f1
  vega committed Aug 25, 2020
  
  332b37f1 Browse Files
- Merge branch 'feature-2020/8/6-McCafe-会阳' into develop · 62a70f8a
  huiyang.chen committed Aug 25, 2020
  
  62a70f8a Browse Files
- 订单详情描述修改 · e1e4af04
  huiyang.chen committed Aug 25, 2020
  
  e1e4af04 Browse Files
- fix:orderSdk:queryRelatedOrderByCode方法改为手动反序列号 · 0e26f79a
  vega committed Aug 25, 2020
  
  0e26f79a Browse Files
- Merge branch 'feature/1.9.35-支付超时时间设置-肖家炜' · cdab2f73
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
```
  vega committed Aug 25, 2020
  cdab2f73 Browse Files
24 Aug, 2020 5 commits
- Merge branch 'feature-2020/8/6-McCafe-会阳' into develop · 3105e527
  huiyang.chen committed Aug 24, 2020
  
  3105e527 Browse Files
- 取餐码过滤 · 3d4aad61
  huiyang.chen committed Aug 24, 2020
  
  3d4aad61 Browse Files
- Merge branch 'feature/2020/08/013-1.9.35-停车场查询优化-张志恒' · 07effd90
  zhiheng.zhang committed Aug 24, 2020
  
  07effd90 Browse Files
- Merge branch 'develop' of… · 5aef4d8d
```
Merge branch 'develop' of http://gitlab.freemud.com/order-group-application/order-group into develop
```
  徐康 committed Aug 24, 2020
  5aef4d8d Browse Files
- Merge branch 'feature/20200727_麦咖啡p1v2支付券码路由' into develop · 4e4637fb
  徐康 committed Aug 24, 2020
  
  4e4637fb Browse Files