Commits · 58e0c935bb7eb2a77aab8eb750e60920831d5862 · order-group-application / order-group

27 Aug, 2020 4 commits
- Merge remote-tracking branch 'origin/qa' into qa · 58e0c935
  徐康 committed Aug 27, 2020
  
  58e0c935 Browse Files
- Merge branch 'feature/20200727_麦咖啡p1v2支付券码路由' into qa · f2372993
  徐康 committed Aug 27, 2020
  
  f2372993 Browse Files
- 麦咖啡不需要移除卡包 · 3477b74b
  徐康 committed Aug 27, 2020
  
  3477b74b Browse Files
- Merge branch '20200827-1000' of gitlab.freemud.com:order-group-application/order-group into qa · b7ee7048
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/OrderApplication.java
```
  张洪旺 committed Aug 27, 2020
  b7ee7048 Browse Files
26 Aug, 2020 8 commits
- 微信支付宝支付 · d9b07e96
  张洪旺 committed Aug 26, 2020
  
  d9b07e96 Browse Files
- Merge branches 'feature/20200820_哗啦啦产品分类名称_wuping' and 'qa' of… · 5dcb27b8
```
Merge branches 'feature/20200820_哗啦啦产品分类名称_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
```
  ping.wu committed Aug 26, 2020
  5dcb27b8 Browse Files
- Merge branches 'feature/20200820_哗啦啦产品分类名称_wuping' and 'qa' of… · 1d68d692
```
Merge branches 'feature/20200820_哗啦啦产品分类名称_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
```
  ping.wu committed Aug 26, 2020
  1d68d692 Browse Files
- 错误修改 · 40227d53
  ping.wu committed Aug 26, 2020
  
  40227d53 Browse Files
- 三方产品编号名称修改 · ec457de6
  ping.wu committed Aug 26, 2020
  
  ec457de6 Browse Files
- 三方产品编号名称修改 · 432580c2
  ping.wu committed Aug 26, 2020
  
  432580c2 Browse Files
- Merge branch 'feature/20200727_麦咖啡p1v2支付券码路由' into qa · 6637ee20
  徐康 committed Aug 26, 2020
  
  6637ee20 Browse Files
- 批量移除卡包 · bdef753f
  徐康 committed Aug 26, 2020
  
  bdef753f Browse Files
25 Aug, 2020 11 commits

Merge branches 'feature/20200820_哗啦啦产品分类名称_wuping' and 'qa' of… · 504a3cb1

Merge branches 'feature/20200820_哗啦啦产品分类名称_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

# Conflicts:
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/CreateOrderProductRequest.java
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/OrderProductAddInfoDto.java
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

committed Aug 25, 2020

504a3cb1 Browse Files

fix:升级ordercenter-sdk版本 · 84c5c0af
vega committed Aug 25, 2020

84c5c0af Browse Files
Merge branch 'fix/1.9.37-支付补偿通知transId为空报错' into qa · d6f7021e
vega committed Aug 25, 2020

d6f7021e Browse Files

Merge branch 'master' into qa · e13f1abd

# 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/enums/ResponseResult.java
#	order-application-service/src/main/java/cn/freemud/service/impl/AppOrderServiceImpl.java
#	order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
#	ordercenter-sdk/pom.xml
#	ordercenter-sdk/readme.md
#	shopping-cart-application-service/pom.xml

committed Aug 25, 2020

e13f1abd Browse Files

Merge branch 'feature-2020/8/6-McCafe-会阳' into qa · b24abbb0
huiyang.chen committed Aug 25, 2020

b24abbb0 Browse Files
刷新接口返回交易号 · ca904c57
huiyang.chen committed Aug 25, 2020

ca904c57 Browse Files
fix:orderSdk:queryRelatedOrderByCode方法改为手动反序列化 · 332b37f1
vega committed Aug 25, 2020

332b37f1 Browse Files
Merge branch 'feature-2020/8/6-McCafe-会阳' into qa · fc09abd2
huiyang.chen committed Aug 25, 2020

fc09abd2 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 17 commits
- Merge branch 'feature-2020/8/6-McCafe-会阳' into qa · 67ae45f4
  huiyang.chen committed Aug 24, 2020
  
  67ae45f4 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 'feature/20200727_麦咖啡p1v2支付券码路由' into qa · f2847592
  徐康 committed Aug 24, 2020
  
  f2847592 Browse Files
- bugfix外卖单退款问题 · 8e557d44
  徐康 committed Aug 24, 2020
  
  8e557d44 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.32_商品加料' · 7028ad46
  xiaoer.li@freemud.com committed Aug 24, 2020
  
  7028ad46 Browse Files
- Merge branch 'feature-2020/8/6-McCafe-会阳' into qa · 295e5d71
  huiyang.chen committed Aug 24, 2020
  
  295e5d71 Browse Files
- 取餐码状态过滤 · 48db1c6b
  huiyang.chen committed Aug 24, 2020
  
  48db1c6b Browse Files
- 升级购物车sdk:1.1.5.RELEASE · a2e0b65c
  xiaoer.li@freemud.com committed Aug 24, 2020
  
  a2e0b65c Browse Files
- Merge branches 'feature/20200721_麦咖啡购物车_wuping' and 'qa' of… · 2dc7366e
```
Merge branches 'feature/20200721_麦咖啡购物车_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
```
  ping.wu committed Aug 24, 2020
  2dc7366e Browse Files
- 特价和超值加购活动键位编号赋值 · 857078fe
  ping.wu committed Aug 24, 2020
  
  857078fe Browse Files
- 升级购物车sdk:1.1.4.RELEASE · 4e194707
  xiaoer.li@freemud.com committed Aug 24, 2020
  
  4e194707 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.32_商品加料' · 3cc204c0
  xiaoer.li@freemud.com committed Aug 24, 2020
  
  3cc204c0 Browse Files
- ordercenterSdk升级:订单渠道类型映射做调整 · 53bf0fd5
  xiaoer.li@freemud.com committed Aug 24, 2020
  
  53bf0fd5 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.34-增加订单渠道口碑等' · 693b91bf
  xiaoer.li@freemud.com committed Aug 24, 2020
  
  693b91bf Browse Files
- Merge branch 'feature/1.9.35-支付超时时间设置-肖家炜' · 0f7b740d
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
```
  vega committed Aug 24, 2020
  0f7b740d Browse Files
- feat:支付超时时间设置:sdk改为release · ff5657b7
  vega committed Aug 24, 2020
  
  ff5657b7 Browse Files