Commits · 6dda807349791afaacd35d8719d43253f4c871d0 · order-group-application / order-group

20 Aug, 2021 1 commit

Merge branch 'KA-2.0.41-爱马哥预订单开发-zxh' into master-amg-pre · 6dda8073

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	order-application-service/pom.xml
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
#	order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java
#	ordercenter-sdk/pom.xml
#	pom.xml
#	shopping-cart-application-service/pom.xml
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java

committed Aug 20, 2021

6dda8073 Browse Files

19 Aug, 2021 2 commits
- 预约单按照正常订单的消息推送流程走 · 4e9e2986
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Aug 19, 2021
  4e9e2986 Browse Files
- 预约单按照正常订单的消息推送流程走 · 9daae3d2
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Aug 19, 2021
  9daae3d2 Browse Files
18 Aug, 2021 4 commits
- 修改提示语 · 39a53687
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Aug 18, 2021
  39a53687 Browse Files
- 修改提示语 · a10aad26
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Aug 18, 2021
  a10aad26 Browse Files
- Merge branch 'KA-2.0.41-爱马哥预订单开发-zxh' of… · aadff706
```
Merge branch 'KA-2.0.41-爱马哥预订单开发-zxh' of gitlab.freemud.com:order-group-application/order-group into KA-2.0.41-爱马哥预订单开发-zxh
```
  周晓航 committed Aug 18, 2021
  aadff706 Browse Files
- 预定单, 门店营业结束之后下单不传递takeMealTime 导致校验失败 · 39bc5e15
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Aug 18, 2021
  39bc5e15 Browse Files
17 Aug, 2021 8 commits
- 爱马哥预定单biztype=7 · 74d48c3c
  胡敬轩 committed Aug 17, 2021
  
  74d48c3c Browse Files
- 预定单 C端小程序 queryOrders 列表是否要展示申请退款按钮开发 · 004e9e4a
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Aug 17, 2021
  004e9e4a Browse Files
- 删除无效日志 · e9a52436
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Aug 17, 2021
  e9a52436 Browse Files
- 重新开启门店营业时间校验规则 · 8973cc00
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Aug 17, 2021
  8973cc00 Browse Files
- 重新开启门店营业时间校验规则 · 9a591ece
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Aug 17, 2021
  9a591ece Browse Files
- 拦截数字转化异常 · d6a31c19
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Aug 17, 2021
  d6a31c19 Browse Files
- 拦截数字转化异常 · a1a111fd
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Aug 17, 2021
  a1a111fd Browse Files
- 拦截数字转化异常 · 4288f721
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Aug 17, 2021
  4288f721 Browse Files
16 Aug, 2021 8 commits
- 修改代码走向无其他逻辑 · e5bbbb47
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Aug 16, 2021
  e5bbbb47 Browse Files
- 打印日志 · 7cb16f7f
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Aug 16, 2021
  7cb16f7f Browse Files
- 打印日志 · 2fa4e99c
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Aug 16, 2021
  2fa4e99c Browse Files
- 打印日志 · fa9605ac
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Aug 16, 2021
  fa9605ac Browse Files
- 修改获取门店校验对象的vo · 5ee7da9e
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Aug 16, 2021
  5ee7da9e Browse Files
- 修改获取门店校验对象的vo · 241bf605
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Aug 16, 2021
  241bf605 Browse Files
- 新增日志查看问题 · 00ce04a8
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Aug 16, 2021
  00ce04a8 Browse Files
- 查询es 增兴bizType = 7 的预定单查询 · 0a809bd3
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Aug 16, 2021
  0a809bd3 Browse Files
13 Aug, 2021 3 commits
- bug修复 · 9f061e40
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Aug 13, 2021
  9f061e40 Browse Files
- 预定单不获取门店预计送达时间 · d77decc7
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Aug 13, 2021
  d77decc7 Browse Files
- 预定单不校验下面的预约单 · a8462d08
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Aug 13, 2021
  a8462d08 Browse Files
12 Aug, 2021 14 commits
- Merge branch 'feature/20210810_callbackUrgentPlan_lxx' · 505c396e
  李学兴 committed Aug 13, 2021
  
  505c396e Browse Files
- opt@feature/20210810_callbackUrgentPlan_lxx:# 紧急开关放到finally代码块 · 8f4d03cd
  李学兴 committed Aug 13, 2021
  
  8f4d03cd Browse Files
- Merge branch 'feature/fix-NPE-bowen' · 4b94f4c7
  胡博文 committed Aug 13, 2021
  
  4b94f4c7 Browse Files
- fix · 57601fd3
  胡博文 committed Aug 13, 2021
  
  57601fd3 Browse Files
- Merge branch 'feature/fix-NPE-bowen' · 6be20939
  胡博文 committed Aug 12, 2021
  
  6be20939 Browse Files
- 解决回调空指针问题 · 8828f640
  胡博文 committed Aug 12, 2021
  
  8828f640 Browse Files
- Merge branch 'feature/20210810_callbackUrgentPlan_lxx' · f2f7d4a8
  李学兴 committed Aug 12, 2021
  
  f2f7d4a8 Browse Files
- opt@feature/20210810_callbackUrgentPlan_lxx:# <version>2.0.3-snapshot</version> · b34822ee
  李学兴 committed Aug 12, 2021
  
  b34822ee Browse Files
- Merge branch '20210811-生态配置redis结构改造-zhiwei.zha' · f5fdd70e
  查志伟 committed Aug 12, 2021
  
  f5fdd70e Browse Files
- 修复允许退款时间的问题 · e9f765cc
  查志伟 committed Aug 12, 2021
  
  e9f765cc Browse Files
- 修复允许退款时间的问题 · 36c33d14
  查志伟 committed Aug 12, 2021
  
  36c33d14 Browse Files
- 修复key和hkey在sdk中写反的问题 · a2f6ce43
  查志伟 committed Aug 12, 2021
  
  a2f6ce43 Browse Files
- Merge branch 'KA-支付有礼新增积分提示-20210728-IDID1033907-zxh' · dacd03b5
  周晓航 committed Aug 12, 2021
  
  dacd03b5 Browse Files
- Merge branch 'feature/20210810_callbackUrgentPlan_lxx' · c7e58b31
  李学兴 committed Aug 12, 2021
  
  c7e58b31 Browse Files