Commits · 93079f6d041375a03cad14bd2bbda2bf8bc776b5 · order-group-application / order-group · GitLab

22 Dec, 2020 19 commits
- sunyu::resolve conflicts::fix about merge branch conflicts · 93079f6d
  yu.sun committed Dec 22, 2020
  
  93079f6d Browse Files
- sunyu::fix bug::fix bug about combo-coupon product price calculate · 126d1910
  yu.sun committed Dec 22, 2020
  
  126d1910 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 75e24b5a
  xiaoer.li@freemud.com committed Dec 22, 2020
  
  75e24b5a Browse Files
- Merge branch 'feature/2.1.11-支付超时回调直接退款' into qa · e2e0eedc
  xiaoer.li@freemud.com committed Dec 22, 2020
  
  e2e0eedc Browse Files
- update：nopay · 3f530c22
  xiaoer.li@freemud.com committed Dec 22, 2020
  
  3f530c22 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 44e0a574
  徐康 committed Dec 22, 2020
  
  44e0a574 Browse Files
- Merge branch 'feature/20201209_xukang_麦咖啡p4v2' into qa · 687feba7
  徐康 committed Dec 22, 2020
  
  687feba7 Browse Files
- 收货地址校验 · 4687f2c3
  徐康 committed Dec 22, 2020
  
  4687f2c3 Browse Files
- Merge branch 'feature/2.1.11-支付超时回调直接退款' into qa · 9b5ce865
  xiaoer.li@freemud.com committed Dec 22, 2020
  
  9b5ce865 Browse Files
- fix:int->string · b7b52a71
  xiaoer.li@freemud.com committed Dec 22, 2020
  
  b7b52a71 Browse Files
- Merge branch 'feature/2.1.11-支付超时回调直接退款' into qa · a620e256
  xiaoer.li@freemud.com committed Dec 22, 2020
  
  a620e256 Browse Files
- fix · 66e7ca93
  xiaoer.li@freemud.com committed Dec 22, 2020
  
  66e7ca93 Browse Files
- Merge branch 'feature/2.1.11-支付超时回调直接退款' into qa · dcb6bde2
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderAdapterServiceImpl.java
```
  xiaoer.li@freemud.com committed Dec 22, 2020
  dcb6bde2 Browse Files
- 增加超时退款渠道 · 6b8728b9
  xiaoer.li@freemud.com committed Dec 22, 2020
  
  6b8728b9 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · c952e4f6
  zhiheng.zhang committed Dec 22, 2020
  
  c952e4f6 Browse Files
- Merge branch 'feature/20201203-抖音小程序渠道新增-张志恒' into qa · b609f078
  zhiheng.zhang committed Dec 22, 2020
  
  b609f078 Browse Files
- C端添加抖音小程序查询渠道 · dbeb3f31
  zhiheng.zhang committed Dec 22, 2020
  
  dbeb3f31 Browse Files
- Merge branch 'feature/20201217_四个非常搭套餐需求_yu.sun' into qa · 606bfb22
  yu.sun committed Dec 22, 2020
  
  606bfb22 Browse Files
- sunyu::fixbug::fix bug about material price NPE · 28acd1fa
  yu.sun committed Dec 22, 2020
  
  28acd1fa Browse Files
21 Dec, 2020 21 commits
- 升级sdk · ece0891a
  chongfu.liang committed Dec 21, 2020
  
  ece0891a Browse Files
- 升级sdk · 58bf4b50
  chongfu.liang committed Dec 21, 2020
  
  58bf4b50 Browse Files
- Merge remote-tracking branch 'origin/master' · 0cfe9825
  chongfu.liang committed Dec 21, 2020
  
  0cfe9825 Browse Files
- Merge remote-tracking branch 'origin/master' · 31ff001a
  zhiheng.zhang committed Dec 21, 2020
  
  31ff001a Browse Files
- Merge branch 'feature/2.0.6-农工商商品兑换券' · 0017ab6c
```
# Conflicts:
#	order-application-service/pom.xml
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
```
  chongfu.liang committed Dec 21, 2020
  0017ab6c Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · ea6d43cd
  zhiheng.zhang committed Dec 21, 2020
  
  ea6d43cd Browse Files
- 去除 qa拍查问题日志 · 8726da86
  zhiheng.zhang committed Dec 21, 2020
  
  8726da86 Browse Files
- Merge branch 'feature/20201203-抖音小程序渠道新增-张志恒' into qa · d74869af
  zhiheng.zhang committed Dec 21, 2020
  
  d74869af Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 82b85bdc
  xiaoer.li@freemud.com committed Dec 21, 2020
  
  82b85bdc Browse Files
- Merge branch 'feature/2.1.11-支付超时回调直接退款' into qa · be8da407
  xiaoer.li@freemud.com committed Dec 21, 2020
  
  be8da407 Browse Files
- 增加超时退款入口 · 3ceb92d4
  xiaoer.li@freemud.com committed Dec 21, 2020
  
  3ceb92d4 Browse Files
- 增加超时退款入口 · 0e0550bc
  xiaoer.li@freemud.com committed Dec 21, 2020
  
  0e0550bc Browse Files
- 去除 qa拍查问题日志 · eda31e90
  zhiheng.zhang committed Dec 21, 2020
  
  eda31e90 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 4349fe7e
  zhiheng.zhang committed Dec 21, 2020
  
  4349fe7e Browse Files
- qa拍查问题日志 · aef62aa8
  zhiheng.zhang committed Dec 21, 2020
  
  aef62aa8 Browse Files
- Merge branch 'feature/2.1.11-支付超时回调直接退款' into qa · 80fe4521
  xiaoer.li@freemud.com committed Dec 21, 2020
  
  80fe4521 Browse Files
- 增加超时退款入口 · 08b50c26
  xiaoer.li@freemud.com committed Dec 21, 2020
  
  08b50c26 Browse Files
- Merge branch 'feature/20201217_四个非常搭套餐需求_yu.sun' into qa · 7f1151f5
  yu.sun committed Dec 21, 2020
  
  7f1151f5 Browse Files
- sunyu::update::fix bug about cartGoods compare method · 9ef3647c
  yu.sun committed Dec 21, 2020
  
  9ef3647c Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 79b8e9d8
  xiaoer.li@freemud.com committed Dec 21, 2020
  
  79b8e9d8 Browse Files
- Merge branch 'feature/2.1.11-支付超时回调直接退款' into qa · d0c306f7
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/controller/OrderController.java
#	order-application-service/src/main/java/cn/freemud/service/Orderservice.java
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
```
  xiaoer.li@freemud.com committed Dec 21, 2020
  d0c306f7 Browse Files