Commits · 0ed058066c8587c55aa1fa6dedbd5a089170039b · order-group-application / order-group

12 Nov, 2020 3 commits

Merge branch 'feature/20201112_优惠为0的券也要核销_xukang' into qa · 0ed05806

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java
#	order-application-service/pom.xml
#	order-application-service/src/main/java/cn/freemud/service/mccafe/impl/CouponClientServiceImpl.java
#	ordercenter-sdk/pom.xml

committed Nov 12, 2020

0ed05806 Browse Files

0元优惠处理 · d61d9f5e
徐康 committed Nov 12, 2020

d61d9f5e Browse Files
下单err更新 · 5adc8e8e
刘鹏飞 committed Nov 12, 2020

5adc8e8e Browse Files

11 Nov, 2020 13 commits
- Merge branch 'feature/2.0.5【ID1018638】【C端服务端】活动库存接口调整对接-sdk版本打包' into 'master' · 5c63e07d
```
jar版本号修复

See merge request !10
```
  缪晖 committed Nov 11, 2020
  5c63e07d Browse Files
- jar版本号修复 · 23adfb6f
  缪晖 committed Nov 11, 2020
  
  23adfb6f Browse Files
- Merge branch 'feature/2.0.6-农工商商品兑换券' into qa · a617508b
```
# Conflicts:
#	order-application-service/pom.xml
```
  chongfu.liang committed Nov 11, 2020
  a617508b Browse Files
- 农工商 · b214030f
  chongfu.liang committed Nov 11, 2020
  
  b214030f Browse Files
- Merge branch 'feature/2.0.5【ID1018638】【C端服务端】活动库存接口调整对接-sdk版本打包' into 'master' · fdac3748
```
master分支sdk版本升级

See merge request !9
```
  缪晖 committed Nov 11, 2020
  fdac3748 Browse Files
- master分支sdk版本升级 · 2b4c4047
  缪晖 committed Nov 11, 2020
  
  2b4c4047 Browse Files
- Merge branch 'feature/2.0.5【ID1018638】【C端服务端】活动库存接口调整对接' into 'master' · 8a2c3f68
```
Feature/2.0.5【id1018638】【c端服务端】活动库存接口调整对接

See merge request !8
```
  缪晖 committed Nov 11, 2020
  8a2c3f68 Browse Files
- 预发布环境活动sdk版本升级至2.7.RELEASE · 3f38b0e7
  缪晖 committed Nov 11, 2020
  
  3f38b0e7 Browse Files
- redis · e8322e4e
  chongfu.liang committed Nov 11, 2020
  
  e8322e4e Browse Files
- 农工商 · 6f7c7022
  chongfu.liang committed Nov 11, 2020
  
  6f7c7022 Browse Files
- 农工商 · de8e5243
  chongfu.liang committed Nov 11, 2020
  
  de8e5243 Browse Files
- 农工商 · 4fa789d7
  chongfu.liang committed Nov 11, 2020
  
  4fa789d7 Browse Files
- Merge remote-tracking branch 'remotes/origin/20201026-queryRefundCount-刘鹏飞' into master · 7dd68d5b
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java
#	ordercenter-sdk/pom.xml
```
  刘鹏飞 committed Nov 11, 2020
  7dd68d5b Browse Files
10 Nov, 2020 18 commits
- 主动清除的逻辑先去掉，测试 · 7886003b
  刘鹏飞 committed Nov 10, 2020
  
  7886003b Browse Files
- 增加错误信息日志 · d2ff39e5
  刘鹏飞 committed Nov 10, 2020
  
  d2ff39e5 Browse Files
- 农工商 · 7b077a79
  chongfu.liang committed Nov 10, 2020
  
  7b077a79 Browse Files
- 农工商 · 841acddc
  chongfu.liang committed Nov 10, 2020
  
  841acddc Browse Files
- 农工商 · c4ddae73
  chongfu.liang committed Nov 10, 2020
  
  c4ddae73 Browse Files
- 升级assortment-ordercenter-sdk版本为2.1.3-SNAPSHOT · 2c58fee5
  刘鹏飞 committed Nov 10, 2020
  
  2c58fee5 Browse Files
- 农工商 · 694e3855
  chongfu.liang committed Nov 10, 2020
  
  694e3855 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 4cb7af02
  徐康 committed Nov 10, 2020
  
  4cb7af02 Browse Files
- Merge branch 'feature/20201013_麦咖啡p4v1问题修复_xukangg' into qa · f1185017
  徐康 committed Nov 10, 2020
  
  f1185017 Browse Files
- 外卖单入机失败不限制订单必须是下单状态 · 16df9408
  徐康 committed Nov 10, 2020
  
  16df9408 Browse Files
- key先注销 · f4179ac6
  刘鹏飞 committed Nov 10, 2020
  
  f4179ac6 Browse Files
- 农工商 · 4d8e5377
  chongfu.liang committed Nov 10, 2020
  
  4d8e5377 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/gatherSpot-刘鹏飞' into qa · d5143b5a
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	order-application-service/pom.xml
```
  刘鹏飞 committed Nov 10, 2020
  d5143b5a Browse Files
- 升级assortment-ordercenter-sdk版本号2.1.4-SNAPSHOT · 495c9428
  刘鹏飞 committed Nov 10, 2020
  
  495c9428 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/repeatCreateOrder-刘鹏飞' into qa · b5c349a4
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	order-application-service/pom.xml
```
  刘鹏飞 committed Nov 10, 2020
  b5c349a4 Browse Files
- 升级assortment-ordercenter-sdk版本号2.1.3-SNAPSHOT · de3d5cba
  刘鹏飞 committed Nov 10, 2020
  
  de3d5cba Browse Files
- 下单锁定的key设置默认时间 · d6f6a270
  刘鹏飞 committed Nov 10, 2020
  
  d6f6a270 Browse Files
- 创建订单添加redis锁，防止重复创建订单 · fdb9daa6
  刘鹏飞 committed Nov 10, 2020
  
  fdb9daa6 Browse Files
09 Nov, 2020 6 commits
- 记录骑手电话和姓名 · 59a95283
  徐康 committed Nov 10, 2020
  
  59a95283 Browse Files
- Merge branch 'feature/20201013_麦咖啡p4v1问题修复_xukangg' · 446bf581
  徐康 committed Nov 10, 2020
  
  446bf581 Browse Files
- Merge branch 'feature/20201013_麦咖啡p4v1问题修复_xukangg' into qa · bcefbe66
  徐康 committed Nov 10, 2020
  
  bcefbe66 Browse Files
- 失败保存为remark · eea14aa7
  徐康 committed Nov 10, 2020
  
  eea14aa7 Browse Files
- Merge branch 'feature/20201013_麦咖啡p4v1问题修复_xukangg' into qa · 75d652be
  徐康 committed Nov 09, 2020
  
  75d652be Browse Files
- sunyu::update::update assortment-shoppingcart-sdk · 70c9b307
  孙昱 committed Nov 09, 2020
  
  70c9b307 Browse Files