Commits · c20c0894b03419b8fb82b87db1189a8a2fba89b0 · order-group-application / order-group

28 Sep, 2021 2 commits

Merge branch 'feature/20210917_抖音买券_wp' into qa · c20c0894

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/MCCafeOrderServiceImpl.java
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

committed Sep 28, 2021

c20c0894 Browse Files

添加枚举 · e915cb5c
查志伟 committed Sep 28, 2021

e915cb5c Browse Files

27 Sep, 2021 13 commits
- Merge remote-tracking branch 'remotes/origin/feature/20210915_订单发票_chenbin' into qa · 354d68bb
  陈斌 committed Sep 27, 2021
  
  354d68bb Browse Files
- update · 4dfed7be
  陈斌 committed Sep 27, 2021
  
  4dfed7be Browse Files
- 抖音卖券，支付成功回调支持 · 310d461d
  查志伟 committed Sep 27, 2021
  
  310d461d Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/20210915_订单发票_chenbin' into qa · 2356be2f
  陈斌 committed Sep 27, 2021
  
  2356be2f Browse Files
- update · dc7e2a76
  陈斌 committed Sep 27, 2021
  
  dc7e2a76 Browse Files
- Merge branch 'KA-支持门店手动创建运单，通知骑手到店取餐20210915-zxh' into qa · d79fd6c0
  王世昌 committed Sep 27, 2021
  
  d79fd6c0 Browse Files
- 取消配送 · a4ad05ad
  王世昌 committed Sep 27, 2021
  
  a4ad05ad Browse Files
- Merge branch 'KA-支持门店手动创建运单，通知骑手到店取餐20210915-zxh' into qa · afcac870
```
# Conflicts:
#	order-management/src/main/java/cn/freemud/management/service/impl/SaasOrderMangerServiceImpl.java
```
  王世昌 committed Sep 27, 2021
  afcac870 Browse Files
- 取消配送 · 0f8a47a2
  王世昌 committed Sep 27, 2021
  
  0f8a47a2 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/20210915_订单发票_chenbin' into qa · e839049b
  陈斌 committed Sep 27, 2021
  
  e839049b Browse Files
- 解决代码合并冲突 · 727121e8
  陈斌 committed Sep 27, 2021
  
  727121e8 Browse Files
- Merge branch 'KA-支持门店手动创建运单，通知骑手到店取餐20210915-zxh' into qa · 199eb011
  周晓航 committed Sep 27, 2021
  
  199eb011 Browse Files
- 增加调用失败错误的提示 · 8eec1ee9
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Sep 27, 2021
  8eec1ee9 Browse Files
26 Sep, 2021 12 commits
- Merge branches 'ka-查询野翠山订单列表是否可开发票-2021-09-15-蒋小洋' and 'qa' of… · bbb7a3e7
```
Merge branches 'ka-查询野翠山订单列表是否可开发票-2021-09-15-蒋小洋' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
```
  蒋小洋 committed Sep 26, 2021
  bbb7a3e7 Browse Files
- 发票查询2个月的数据 · 64639ffd
  蒋小洋 committed Sep 26, 2021
  
  64639ffd Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 9f6f612f
  蒋小洋 committed Sep 26, 2021
  
  9f6f612f Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/20210915_订单发票_chenbin' into qa · 88fa827e
  陈斌 committed Sep 26, 2021
  
  88fa827e Browse Files
- Merge branches 'ka-查询野翠山订单列表是否可开发票-2021-09-15-蒋小洋' and 'qa' of… · a1acceeb
```
Merge branches 'ka-查询野翠山订单列表是否可开发票-2021-09-15-蒋小洋' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
```
  蒋小洋 committed Sep 26, 2021
  a1acceeb Browse Files
- 修改BUG · 948758bd
  蒋小洋 committed Sep 26, 2021
  
  948758bd Browse Files
- 校验订单 · 5eef2c3d
  陈斌 committed Sep 26, 2021
  
  5eef2c3d Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/20210915_订单发票_chenbin' into qa · f713d489
  陈斌 committed Sep 26, 2021
  
  f713d489 Browse Files
- update2 · 9e91a17e
  陈斌 committed Sep 26, 2021
  
  9e91a17e Browse Files
- 新增基于门店配置的dispatchType参数, 用于基础服务使用 · 2c820bea
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Sep 26, 2021
  2c820bea Browse Files
- Merge branch 'KA-支持门店手动创建运单，通知骑手到店取餐20210915-zxh' into qa · 02f8e7e0
```
# Conflicts:
#	order-management/src/main/java/cn/freemud/management/service/impl/SaasOrderMangerServiceImpl.java
```
  周晓航 committed Sep 26, 2021
  02f8e7e0 Browse Files
- 新增基于门店配置的dispatchType参数, 用于基础服务使用 · e2dd0160
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Sep 26, 2021
  e2dd0160 Browse Files
24 Sep, 2021 13 commits
- Merge branch 'KA-支持门店手动创建运单，通知骑手到店取餐20210915-zxh' into qa · ea4c880e
  周晓航 committed Sep 24, 2021
  
  ea4c880e Browse Files
- 校验 NPE问题 · 0e86d4d2
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Sep 24, 2021
  0e86d4d2 Browse Files
- Merge branch 'KA-支持门店手动创建运单，通知骑手到店取餐20210915-zxh' into qa · 85a30451
  周晓航 committed Sep 24, 2021
  
  85a30451 Browse Files
- 删除无效校验 · 4f994237
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Sep 24, 2021
  4f994237 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/20210915_订单发票_chenbin' into qa · 45ad8404
  陈斌 committed Sep 24, 2021
  
  45ad8404 Browse Files
- update · 32b181a8
  陈斌 committed Sep 24, 2021
  
  32b181a8 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/20210915_订单发票_chenbin' into qa · ff8adc4e
  陈斌 committed Sep 24, 2021
  
  ff8adc4e Browse Files
- update · 02b40a6a
  陈斌 committed Sep 24, 2021
  
  02b40a6a Browse Files
- Merge branch 'ka-查询野翠山订单列表是否可开发票-2021-09-15-蒋小洋' into qa · 90fa35ab
  周晓航 committed Sep 24, 2021
  
  90fa35ab Browse Files
- 新增字段 marketingType 查询基础服务 · dc0b38ba
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Sep 24, 2021
  dc0b38ba Browse Files
- Merge branch 'ka-查询野翠山订单列表是否可开发票-2021-09-15-蒋小洋' into qa · 631c1837
  周晓航 committed Sep 24, 2021
  
  631c1837 Browse Files
- 处理拼团订单支付成功会回调多次导致拼团订单退款的问题 · cf75e13d
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Sep 24, 2021
  cf75e13d Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/20210915_订单发票_chenbin' into qa · dc2e4072
  陈斌 committed Sep 24, 2021
  
  dc2e4072 Browse Files