Commits · 5006ebb64cc30e044ff372f0d05ecaa195c17aa9 · order-group-application / order-group · GitLab

23 Nov, 2020 7 commits
- sunyu::update::update about combox-product price calculate · 5006ebb6
  yu.sun committed Nov 23, 2020
  
  5006ebb6 Browse Files
- sunyu::update::update about combox-product price calculate · 86995ec0
  yu.sun committed Nov 23, 2020
  
  86995ec0 Browse Files
- Merge branch 'feature/20201013_麦咖啡p4v1问题修复_xukangg' into qa · 47b0d975
  徐康 committed Nov 23, 2020
  
  47b0d975 Browse Files
- Merge branch 'bugfix/20201118_xukang_下单加锁防止重复下单' into qa · accb70b8
  徐康 committed Nov 23, 2020
  
  accb70b8 Browse Files
- 恢复代码 · 71994236
  徐康 committed Nov 23, 2020
  
  71994236 Browse Files
- 商品券重复加车校验和恢复代码 · b465bb38
  徐康 committed Nov 23, 2020
  
  b465bb38 Browse Files
- 商品券重复加车校验和恢复代码 · ae2ca9e3
  徐康 committed Nov 23, 2020
  
  ae2ca9e3 Browse Files
20 Nov, 2020 6 commits
- oms退款金额修改日志打印修改 · 1a6c99ec
  zhiheng.zhang committed Nov 20, 2020
  
  1a6c99ec Browse Files
- oms退款金额修改日志打印修改 · 02915e32
  zhiheng.zhang committed Nov 20, 2020
  
  02915e32 Browse Files
- oms退款金额修改日志打印修改 · caad6bbc
  zhiheng.zhang committed Nov 20, 2020
  
  caad6bbc Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · ec95bbac
  zhiheng.zhang committed Nov 20, 2020
  
  ec95bbac Browse Files
- Merge branch 'feature/20201110_混合支付退款_张志恒' into qa · 9b0fa2dd
  zhiheng.zhang committed Nov 20, 2020
  
  9b0fa2dd Browse Files
- oms退款金额修改 · fc91c25d
  zhiheng.zhang committed Nov 20, 2020
  
  fc91c25d Browse Files
19 Nov, 2020 27 commits
- 功能代码恢复 · 371ab1a9
  徐康 committed Nov 19, 2020
  
  371ab1a9 Browse Files
- 功能代码恢复 · 4bb3e6f6
  徐康 committed Nov 19, 2020
  
  4bb3e6f6 Browse Files
- sdk版本回复 · 3f766143
  徐康 committed Nov 19, 2020
  
  3f766143 Browse Files
- 功能暂时不上线 · 34a15520
  徐康 committed Nov 19, 2020
  
  34a15520 Browse Files
- Merge branch 'feature/2020-1104-混合支付' into qa · d13330cc
  xiaoer.li@freemud.com committed Nov 19, 2020
  
  d13330cc Browse Files
- fix · d0dd8761
  xiaoer.li@freemud.com committed Nov 19, 2020
  
  d0dd8761 Browse Files
- Merge branch 'feature/2020-1104-混合支付' into qa · 5f062749
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
```
  xiaoer.li@freemud.com committed Nov 19, 2020
  5f062749 Browse Files
- fix:c端支付方式 · c2dfcedb
  xiaoer.li@freemud.com committed Nov 19, 2020
  
  c2dfcedb Browse Files
- Merge branch 'feature/2020-1104-混合支付' into qa · 97b4981c
  xiaoer.li@freemud.com committed Nov 19, 2020
  
  97b4981c Browse Files
- fix · 0979065b
  xiaoer.li@freemud.com committed Nov 19, 2020
  
  0979065b Browse Files
- Merge branch 'feature/2020-1104-混合支付' into qa · 00d3e9a8
  xiaoer.li@freemud.com committed Nov 19, 2020
  
  00d3e9a8 Browse Files
- fix · 13dfbfad
  xiaoer.li@freemud.com committed Nov 19, 2020
  
  13dfbfad Browse Files
- Merge branch 'feature/2020-1104-混合支付' into qa · e5f7212d
  xiaoer.li@freemud.com committed Nov 19, 2020
  
  e5f7212d Browse Files
- fix:入库支付方式 · 89626509
  xiaoer.li@freemud.com committed Nov 19, 2020
  
  89626509 Browse Files
- Merge branch 'feature/2020-1104-混合支付' into qa · 545cf1e0
  xiaoer.li@freemud.com committed Nov 19, 2020
  
  545cf1e0 Browse Files
- fix · f6a803eb
  xiaoer.li@freemud.com committed Nov 19, 2020
  
  f6a803eb Browse Files
- 升级sdk · 7ac946bc
  xiaoer.li@freemud.com committed Nov 19, 2020
  
  7ac946bc Browse Files
- fix · 96108b25
  xiaoer.li@freemud.com committed Nov 19, 2020
  
  96108b25 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 9bd7614e
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
```
  zhiheng.zhang committed Nov 19, 2020
  9bd7614e Browse Files
- Merge branch 'feature/2020-1104-混合支付' into qa · f1ffae0e
  zhiheng.zhang committed Nov 19, 2020
  
  f1ffae0e Browse Files
- jar包版本升级 · ee36f40f
  zhiheng.zhang committed Nov 19, 2020
  
  ee36f40f Browse Files
- 重新调整购物车svc卡计算逻辑 · df2dcc00
  xiaoer.li@freemud.com committed Nov 19, 2020
  
  df2dcc00 Browse Files
- Merge branch 'feature/2020-1104-混合支付' into qa · 058bcf16
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
```
  zhiheng.zhang committed Nov 19, 2020
  058bcf16 Browse Files
- Merge branch 'feature/20201112_套餐价格计算_yu.sun' into qa · 48ab8bae
  孙昱 committed Nov 19, 2020
  
  48ab8bae Browse Files
- sunyu::update:ïï::撤销套餐价格计算逻辑 · 1262e2ed
  孙昱 committed Nov 19, 2020
  
  1262e2ed Browse Files
- 提示信息 · 74381499
  xiaoer.li@freemud.com committed Nov 19, 2020
  
  74381499 Browse Files
- assortment-ordercenter-sdk升级为2.2.3-SNAPSHOT · 12de679e
  刘鹏飞 committed Nov 19, 2020
  
  12de679e Browse Files