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

03 Aug, 2021 2 commits
- 日志修改 · f2af037c
  ping.wu committed Aug 03, 2021
  
  f2af037c Browse Files
- 日志修改 · bef298c7
  ping.wu committed Aug 03, 2021
  
  bef298c7 Browse Files
02 Aug, 2021 3 commits
- 支付成功回掉多次触发锁问题状态码修改 · c45aeed3
  ping.wu committed Aug 02, 2021
  
  c45aeed3 Browse Files
- assortment-messagepush-sdk 同步升级 · 80f56208
  ping.wu committed Aug 02, 2021
  
  80f56208 Browse Files
- RedisTemplate 修改 · 2cc5a8e9
  ping.wu committed Aug 02, 2021
  
  2cc5a8e9 Browse Files
28 Jul, 2021 7 commits
- benefitBeanDtos.get(0)报错修改，判断benefitBeanDtos集合不为空 · 668a2af3
  ping.wu committed Jul 28, 2021
  
  668a2af3 Browse Files
- 日志打印优化 · bf8799ba
  zhiheng.zhang committed Jul 28, 2021
  
  bf8799ba Browse Files
- Merge branch 'feature/20210720-购物车日志修改-张志恒' · e00331d2
  zhiheng.zhang committed Jul 28, 2021
  
  e00331d2 Browse Files
- Merge branches 'feature/20210715_购物车可用优惠券改造_wuping' and 'master' of… · f3d38434
```
Merge branches 'feature/20210715_购物车可用优惠券改造_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
```
  ping.wu committed Jul 28, 2021
  f3d38434 Browse Files
- 蜜雪app未传使用优惠券集合 · 26f2418d
  ping.wu committed Jul 28, 2021
  
  26f2418d Browse Files
- Merge branch 'feature/20210727-商户余额不足调整日志邮件-wanghanghang' · f1844b82
  hanghang.wang committed Jul 28, 2021
  
  f1844b82 Browse Files
- 商户余额不足调整日志邮件 · 3006fbcc
  hanghang.wang committed Jul 28, 2021
  
  3006fbcc Browse Files
27 Jul, 2021 28 commits
- Merge branch 'KA-V39需求-支付有礼-新增字段' · 2332e1be
  周晓航 committed Jul 28, 2021
  
  2332e1be Browse Files
- sdk升级 · a51a7c8c
  ping.wu committed Jul 27, 2021
  
  a51a7c8c Browse Files
- Merge branches 'feature/20210727_扫桌码下单校验_wuping' and 'master' of… · 0583abf4
```
Merge branches 'feature/20210727_扫桌码下单校验_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
```
  ping.wu committed Jul 27, 2021
  0583abf4 Browse Files
- url名字错误修改 · 227b0ff0
  ping.wu committed Jul 27, 2021
  
  227b0ff0 Browse Files
- sdk升级 · 821d28e9
  ping.wu committed Jul 27, 2021
  
  821d28e9 Browse Files
- Merge branches 'feature/20210720-购物车日志修改-张志恒' and 'master' of… · a97f2a85
```
Merge branches 'feature/20210720-购物车日志修改-张志恒' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
```
  ping.wu committed Jul 27, 2021
  a97f2a85 Browse Files
- Merge branch 'feature/20210720-购物车日志修改-张志恒' · 5a26fa32
  李学兴 committed Jul 27, 2021
  
  5a26fa32 Browse Files
- 代码合并错误修改 · 52abdc05
  ping.wu committed Jul 27, 2021
  
  52abdc05 Browse Files
- Merge branch 'feature/20210727_扫桌码下单校验_wuping' of… · 80162e8a
```
Merge branch 'feature/20210727_扫桌码下单校验_wuping' of http://gitlab.freemud.com/order-group-application/order-group
```
  ping.wu committed Jul 27, 2021
  80162e8a Browse Files
- 扫桌码下单校验 · 30ea6d68
  ping.wu committed Jul 27, 2021
  
  30ea6d68 Browse Files
- Merge branches 'feature/20210717_买虚拟商品特价_wuping' and 'master' of… · 4242bf2b
```
Merge branches 'feature/20210717_买虚拟商品特价_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/thirdparty/PromotionDiscountClient.java
```
  ping.wu committed Jul 27, 2021
  4242bf2b Browse Files
- Merge remote-tracking branch 'origin/feature/20210720-购物车日志修改-张志恒' into… · 33f6a8d1
```
Merge remote-tracking branch 'origin/feature/20210720-购物车日志修改-张志恒' into feature/20210720-购物车日志修改-张志恒
```
  ping.wu committed Jul 27, 2021
  33f6a8d1 Browse Files
- Feign打印日志修改，assortment-messagepush-sdk升级 · 742311c3
  ping.wu committed Jul 27, 2021
  
  742311c3 Browse Files
- Merge remote-tracking branch 'origin/feature/20210720-购物车日志修改-张志恒' into… · 8293810b
```
Merge remote-tracking branch 'origin/feature/20210720-购物车日志修改-张志恒' into feature/20210720-购物车日志修改-张志恒
```
  李学兴 committed Jul 27, 2021
  8293810b Browse Files
- opt@feature/20210720-购物车日志修改-张志恒:# printRequestLog = false · 4cbc913f
  李学兴 committed Jul 27, 2021
  
  4cbc913f Browse Files
- Merge branch 'feature/20210720-购物车日志修改-张志恒' · f451c2fa
  周晓航 committed Jul 27, 2021
  
  f451c2fa Browse Files
- Merge branch 'feature/20210720-富有对接折扣券新增折扣参数-wsc' · a6f4cf9b
  王世昌 committed Jul 27, 2021
  
  a6f4cf9b Browse Files
- 富有对接放在4.0迭代上 · 75edf1b3
  王世昌 committed Jul 27, 2021
  
  75edf1b3 Browse Files
- 添加logMessage · 757b8ecc
  zhiheng.zhang committed Jul 27, 2021
  
  757b8ecc Browse Files
- Merge branch 'feature/20210720-购物车日志修改-张志恒' · ebc380a7
  zhiheng.zhang committed Jul 27, 2021
  
  ebc380a7 Browse Files
- Merge remote-tracking branch 'origin/feature/20210720-购物车日志修改-张志恒' into… · ad43f2f4
```
Merge remote-tracking branch 'origin/feature/20210720-购物车日志修改-张志恒' into feature/20210720-购物车日志修改-张志恒

# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/aop/WebAspect.java
```
  zhiheng.zhang committed Jul 27, 2021
  ad43f2f4 Browse Files
- 添加logMessage · 4f61327c
  zhiheng.zhang committed Jul 27, 2021
  
  4f61327c Browse Files
- Merge branch 'feature/20210720-购物车日志修改-张志恒' · 393ecd68
  周晓航 committed Jul 27, 2021
  
  393ecd68 Browse Files
- 日志模式修改 · 547f53f3
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Jul 27, 2021
  547f53f3 Browse Files
- Merge remote-tracking branch 'origin/feature/20210720-购物车日志修改-张志恒' into… · b5298156
```
Merge remote-tracking branch 'origin/feature/20210720-购物车日志修改-张志恒' into feature/20210720-购物车日志修改-张志恒
```
  李学兴 committed Jul 27, 2021
  b5298156 Browse Files
- opt@feature/20210720-购物车日志修改-张志恒:# logMessage 更改为method名称 · 80a5fd7e
  李学兴 committed Jul 27, 2021
  
  80a5fd7e Browse Files
- opt@master:# 解决编译失败问题 · f7f19990
  李学兴 committed Jul 27, 2021
  
  f7f19990 Browse Files
- Merge branch 'feature/20210720-购物车日志修改-张志恒' · 7dea1d6e
  李学兴 committed Jul 27, 2021
  
  7dea1d6e Browse Files