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

11 Aug, 2021 5 commits
- Merge branch 'feature/20210810_callbackUrgentPlan_lxx' into qa · d4d140e7
```
# Conflicts:
#	call-back-service/src/main/java/cn/freemud/service/impl/OrderCallBackServiceImpl.java
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
```
  李学兴 committed Aug 11, 2021
  d4d140e7 Browse Files
- opt@feature/20210810_callbackUrgentPlan_lxx:# 紧急方案打开直接调用callback 逻辑 · 5d0798c5
  李学兴 committed Aug 11, 2021
  
  5d0798c5 Browse Files
- opt@feature/20210810_callbackUrgentPlan_lxx:# 紧急方案打开直接调用callback 逻辑 · 0b80707f
  李学兴 committed Aug 11, 2021
  
  0b80707f Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/20210811-v2041-赠送商品状态判断' into qa · f3058dd2
  胡敬轩 committed Aug 11, 2021
  
  f3058dd2 Browse Files
- 查询活动时增加商品菜单渠道字段,用于促销判断赠送商品状态 · c2279b13
  胡敬轩 committed Aug 11, 2021
  
  c2279b13 Browse Files
10 Aug, 2021 14 commits
- Merge branch 'KA-2.0.41-爱马哥预订单开发-zxh' into qa · 10507429
  周晓航 committed Aug 10, 2021
  
  10507429 Browse Files
- C端调用订单列表 queryOrder 新增 bizType=7 · 518585f8
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Aug 10, 2021
  518585f8 Browse Files
- 修改feign调用失败日志切面反射报错问题 · 29070a7b
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Aug 10, 2021
  29070a7b Browse Files
- Merge branches 'feature/20210806_日志问题修复_wuping' and 'master' of… · a00a323a
```
Merge branches 'feature/20210806_日志问题修复_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
```
  ping.wu committed Aug 10, 2021
  a00a323a Browse Files
- 偶发现象，前端传一个skuid非spuid下多规格商品 · d0bcde3f
  ping.wu committed Aug 10, 2021
  
  d0bcde3f Browse Files
- Merge branches 'feature/20210806_日志问题修复_wuping' and 'qa' of… · 4d346291
```
Merge branches 'feature/20210806_日志问题修复_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
```
  ping.wu committed Aug 10, 2021
  4d346291 Browse Files
- 支付成功优化，去掉多余的查询订单详情接口 · a4cdaccd
  ping.wu committed Aug 10, 2021
  
  a4cdaccd Browse Files
- 解决打包聚合订单sdk无基础订单sdk问题 · 6d252664
  ping.wu committed Aug 10, 2021
  
  6d252664 Browse Files
- Merge branch 'feature/20210810-开放平台商品券支持sdk升级-liujiming' · e924891d
  刘继明 committed Aug 10, 2021
  
  e924891d Browse Files
- Merge branch 'feature/20210810-开放平台商品券支持sdk升级-liujiming' into qa · d975fba3
```
# Conflicts:
#	assortment-ordercenter-sdk/readme.md
```
  刘继明 committed Aug 10, 2021
  d975fba3 Browse Files
- sdk升级 · b4a8d3df
  刘继明 committed Aug 10, 2021
  
  b4a8d3df Browse Files
- Merge branch 'feature/xukang_20210809_购买月卡不使用多余优惠过滤' · c3baacc2
  徐康 committed Aug 10, 2021
  
  c3baacc2 Browse Files
- Merge branches 'feature/20210806_日志问题修复_wuping' and 'master' of… · aa66ffdb
```
Merge branches 'feature/20210806_日志问题修复_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
```
  ping.wu committed Aug 10, 2021
  aa66ffdb Browse Files
- 传结算页标示1并且购物车版本没有传固定值2的老版本才会查可用优惠券 · f2c1e547
  ping.wu committed Aug 10, 2021
  
  f2c1e547 Browse Files
09 Aug, 2021 21 commits
- Merge branch 'KA-B端excel下载内容优化-20210727-zxh' into qa · 9b40c1b7
  周晓航 committed Aug 09, 2021
  
  9b40c1b7 Browse Files
- 打日志 · b0918a67
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Aug 09, 2021
  b0918a67 Browse Files
- Merge branch 'qa' of gitlab.freemud.com:order-group-application/order-group into qa · 46232002
  周晓航 committed Aug 09, 2021
  
  46232002 Browse Files
- Merge branch 'KA-B端excel下载内容优化-20210727-zxh' into qa · f356404a
  周晓航 committed Aug 09, 2021
  
  f356404a Browse Files
- 打日志 · 67724050
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Aug 09, 2021
  67724050 Browse Files
- Merge branches 'feature/20210806_购物车限购数量redis_wuping' and 'master' of… · bbf533f7
```
Merge branches 'feature/20210806_购物车限购数量redis_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
```
  ping.wu committed Aug 09, 2021
  bbf533f7 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 3653449e
  ping.wu committed Aug 09, 2021
  
  3653449e Browse Files
- 打印日志 · 03b5fa28
  ping.wu committed Aug 09, 2021
  
  03b5fa28 Browse Files
- Merge branch 'qa' of gitlab.freemud.com:order-group-application/order-group into qa · 56d38c3b
  周晓航 committed Aug 09, 2021
  
  56d38c3b Browse Files
- Merge branch 'KA-B端excel下载内容优化-20210727-zxh' into qa · 9dd39743
  周晓航 committed Aug 09, 2021
  
  9dd39743 Browse Files
- 打日志 · 90cf81ce
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Aug 09, 2021
  90cf81ce Browse Files
- Merge branches 'feature/20210806_购物车限购数量redis_wuping' and 'qa' of… · 9598ac4f
```
Merge branches 'feature/20210806_购物车限购数量redis_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
```
  ping.wu committed Aug 09, 2021
  9598ac4f Browse Files
- key修改 · c5f258c6
  ping.wu committed Aug 09, 2021
  
  c5f258c6 Browse Files
- Merge branch 'KA-B端excel下载内容优化-20210727-zxh' into qa · 59a1c0ee
  周晓航 committed Aug 09, 2021
  
  59a1c0ee Browse Files
- 打日志 · 04574b54
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Aug 09, 2021
  04574b54 Browse Files
- Merge branches 'feature/20210806_日志问题修复_wuping' and 'master' of… · d6aca701
```
Merge branches 'feature/20210806_日志问题修复_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
```
  ping.wu committed Aug 09, 2021
  d6aca701 Browse Files
- 增加点餐页判断不查询可用优惠券 · 5152a7b4
  ping.wu committed Aug 09, 2021
  
  5152a7b4 Browse Files
- Merge branch 'KA-B端excel下载内容优化-20210727-zxh' into qa · 723a9004
  周晓航 committed Aug 09, 2021
  
  723a9004 Browse Files
- 打日志 · f006ecc1
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Aug 09, 2021
  f006ecc1 Browse Files
- Merge branch 'qa' of gitlab.freemud.com:order-group-application/order-group into qa · 1a4e62a3
  周晓航 committed Aug 09, 2021
  
  1a4e62a3 Browse Files
- Merge branch 'KA-B端excel下载内容优化-20210727-zxh' into qa · 35b59d67
  周晓航 committed Aug 09, 2021
  
  35b59d67 Browse Files