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

12 Aug, 2021 11 commits
- 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
- opt@feature/20210810_callbackUrgentPlan_lxx:# 紧急方案增加日志打印 · b4d26d86
  李学兴 committed Aug 12, 2021
  
  b4d26d86 Browse Files
- Merge branch 'feature/20210810_callbackUrgentPlan_lxx' · 47201cbd
  李学兴 committed Aug 12, 2021
  
  47201cbd Browse Files
- opt@feature/20210810_callbackUrgentPlan_lxx:# 紧急方案增加日志打印 · a26afbde
  李学兴 committed Aug 12, 2021
  
  a26afbde Browse Files
- 退款配置的redis缓存结构改造 · 4cf11ffb
  查志伟 committed Aug 12, 2021
  
  4cf11ffb Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/20210811-v2041-赠送商品状态判断' · a5040e40
  胡敬轩 committed Aug 12, 2021
  
  a5040e40 Browse Files
11 Aug, 2021 5 commits
- 前端计算小计拿商品现价累计减couponDiscount，商品券换购券现价已排除 · efe67275
  ping.wu committed Aug 11, 2021
  
  efe67275 Browse Files
- opt@feature/20210810_callbackUrgentPlan_lxx:# FeignClient url默认值 · 6f7024a7
  李学兴 committed Aug 11, 2021
  
  6f7024a7 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
- 查询活动时增加商品菜单渠道字段,用于促销判断赠送商品状态 · c2279b13
  胡敬轩 committed Aug 11, 2021
  
  c2279b13 Browse Files
10 Aug, 2021 10 commits
- 修改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
- 支付成功优化，去掉多余的查询订单详情接口 · 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
- 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 13 commits
- 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
- key修改 · c5f258c6
  ping.wu committed Aug 09, 2021
  
  c5f258c6 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
- 限购数量为0判断修改 · 4e754656
  ping.wu committed Aug 09, 2021
  
  4e754656 Browse Files
- 问题修复 · b12ee30e
  徐康 committed Aug 09, 2021
  
  b12ee30e Browse Files
- 问题修复 · e6152da4
  徐康 committed Aug 09, 2021
  
  e6152da4 Browse Files
- 问题修复 · 0b8a62f6
  徐康 committed Aug 09, 2021
  
  0b8a62f6 Browse Files
- 购物车限购数量调整 · b94fa912
  ping.wu committed Aug 09, 2021
  
  b94fa912 Browse Files
- Merge branches 'feature/20210806_日志问题修复_wuping' and 'master' of… · 95fd2791
```
Merge branches 'feature/20210806_日志问题修复_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group

# Conflicts:
#	pom.xml
```
  ping.wu committed Aug 09, 2021
  95fd2791 Browse Files
- 业务异常打印日志报错升级2.0.0-SNAPSHOT · c4b6e8ea
  ping.wu committed Aug 09, 2021
  
  c4b6e8ea Browse Files
- Merge branches 'feature/20210806_日志问题修复_wuping' and 'master' of… · 2aac01a4
```
Merge branches 'feature/20210806_日志问题修复_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
```
  ping.wu committed Aug 09, 2021
  2aac01a4 Browse Files
- detailType.getProductId() 空报错修改 · ce3a1c49
  ping.wu committed Aug 09, 2021
  
  ce3a1c49 Browse Files
08 Aug, 2021 1 commit
- 业务异常打印日志报错升级sdk · e447e184
  ping.wu committed Aug 08, 2021
  
  e447e184 Browse Files