Commits · 3749b0cfbb4a6911e17e17df37c894735ae7d0d5 · order-group-application / order-group · GitLab

16 Oct, 2020 1 commit
- 日志升级 · 3749b0cf
  chongfu.liang committed Oct 16, 2020
  
  3749b0cf Browse Files
15 Oct, 2020 5 commits
- Merge branch '2020/10/14-商品券-huiyang' into 2020/10/15-mccafeCoupon-huiyang · f4648599
  huiyang.chen committed Oct 15, 2020
  
  f4648599 Browse Files
- fixbug · b7f0be9c
  xiaoer.li@freemud.com committed Oct 15, 2020
  
  b7f0be9c Browse Files
- fix 多规格商品券 · 01e08146
  huiyang.chen committed Oct 15, 2020
  
  01e08146 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/2.0-换购券' · ac05693d
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/enums/GoodsTypeEnum.java
#	shopping-cart-application-service/src/main/java/cn/freemud/enums/ResponseResult.java
```
  xiaoer.li@freemud.com committed Oct 15, 2020
  ac05693d Browse Files
- fix · d786ff25
  xiaoer.li@freemud.com committed Oct 15, 2020
  
  d786ff25 Browse Files
14 Oct, 2020 5 commits
- fix 合并随单购 · df8a1489
  huiyang.chen committed Oct 14, 2020
  
  df8a1489 Browse Files
- fix · 8e238d13
  xiaoer.li@freemud.com committed Oct 14, 2020
  
  8e238d13 Browse Files
- fix · c26a84ec
  xiaoer.li@freemud.com committed Oct 14, 2020
  
  c26a84ec Browse Files
- fix · 00e99f2f
  xiaoer.li@freemud.com committed Oct 14, 2020
  
  00e99f2f Browse Files
- fix · 99a0e2ca
  xiaoer.li@freemud.com committed Oct 14, 2020
  
  99a0e2ca Browse Files
13 Oct, 2020 15 commits
- sdk版本升级 · 8a98edc7
  zhiheng.zhang committed Oct 14, 2020
  
  8a98edc7 Browse Files
- Merge remote-tracking branch 'origin/master' · d3d38ddb
  zhiheng.zhang committed Oct 14, 2020
  
  d3d38ddb Browse Files
- Merge branch 'feature/2020/09/07-1.9.38-优惠信息入库-张志恒' · 947e1e7f
  zhiheng.zhang committed Oct 14, 2020
  
  947e1e7f Browse Files
- Merge branches 'feature/20200915_购物车添加限制数量_wuping' and 'master' of… · 5a559d1c
```
Merge branches 'feature/20200915_购物车添加限制数量_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
```
  ping.wu committed Oct 14, 2020
  5a559d1c Browse Files
- 处理缓存为字符串无法转换问题 · 5ea43207
  ping.wu committed Oct 14, 2020
  
  5ea43207 Browse Files
- Merge branches 'feature/20200915_购物车添加限制数量_wuping' and 'master' of… · 6ade05dc
```
Merge branches 'feature/20200915_购物车添加限制数量_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
```
  ping.wu committed Oct 13, 2020
  6ade05dc Browse Files
- 去掉日志 · 7a465247
  ping.wu committed Oct 13, 2020
  
  7a465247 Browse Files
- Merge branches 'feature/20200915_购物车添加限制数量_wuping' and 'master' of… · b5d5e1ce
```
Merge branches 'feature/20200915_购物车添加限制数量_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
```
  ping.wu committed Oct 13, 2020
  b5d5e1ce Browse Files
- 增加日志 · 0751e0eb
  ping.wu committed Oct 13, 2020
  
  0751e0eb Browse Files
- 修改判断 · 438396ca
  ping.wu committed Oct 13, 2020
  
  438396ca Browse Files
- 增加限购数量日志 · 6e508e26
  ping.wu committed Oct 13, 2020
  
  6e508e26 Browse Files
- Merge branches 'feature/20200915_购物车添加限制数量_wuping' and 'master' of… · c3012672
```
Merge branches 'feature/20200915_购物车添加限制数量_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group

# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/enums/ResponseResult.java
```
  ping.wu committed Oct 13, 2020
  c3012672 Browse Files
- 数量更新为0修改 · be69ebac
  ping.wu committed Oct 13, 2020
  
  be69ebac Browse Files
- 促销结果为空判断 · feaee55c
  ping.wu committed Oct 13, 2020
  
  feaee55c Browse Files
- sunyu::hotfix::fix bug about checkShoppingCartSdk method · e28223c3
  yu.sun committed Oct 13, 2020
  
  e28223c3 Browse Files
12 Oct, 2020 11 commits
- 对接促销算价Alpha->换购商品重复添加 · 5c9a0c0b
  xiaoer.li@freemud.com committed Oct 12, 2020
  
  5c9a0c0b Browse Files
- 换购券提示-fix · 04a5df71
  xiaoer.li@freemud.com committed Oct 12, 2020
  
  04a5df71 Browse Files
- 换购券提示-fix · f3032761
  xiaoer.li@freemud.com committed Oct 12, 2020
  
  f3032761 Browse Files
- 换购券提示-fix · ebc33fb2
  xiaoer.li@freemud.com committed Oct 12, 2020
  
  ebc33fb2 Browse Files
- 换购券提示-fix · 6cdd9ee7
  xiaoer.li@freemud.com committed Oct 12, 2020
  
  6cdd9ee7 Browse Files
- 换购券提示-fix · 6252547c
  xiaoer.li@freemud.com committed Oct 12, 2020
  
  6252547c Browse Files
- 换购券提示-fix · a65daf0a
  xiaoer.li@freemud.com committed Oct 12, 2020
  
  a65daf0a Browse Files
- 换购券提示-fix · 706388ac
  xiaoer.li@freemud.com committed Oct 12, 2020
  
  706388ac Browse Files
- 商品信息fix · 811f1c61
  xiaoer.li@freemud.com committed Oct 12, 2020
  
  811f1c61 Browse Files
- 增加换购券不可用门店 · 3b02cbda
  xiaoer.li@freemud.com committed Oct 12, 2020
  
  3b02cbda Browse Files
- Merge remote-tracking branch 'origin/master' · b62de01f
  zhiheng.zhang committed Oct 12, 2020
  
  b62de01f Browse Files
10 Oct, 2020 3 commits
- 下单校验优惠券问题修复 · e3e51645
  徐康 committed Oct 10, 2020
  
  e3e51645 Browse Files
- Merge branch 'feature/2020/09/17-1.20-订单投传panChannelType-张志恒' · 92e199c7
  zhiheng.zhang committed Oct 10, 2020
  
  92e199c7 Browse Files
- Merge branch 'feature/2020/09/30-20-停车上订单未支付积分回退-张志恒' · e0f445f7
  zhiheng.zhang committed Oct 10, 2020
  
  e0f445f7 Browse Files