Commits · 0c76b274d1a44e70c990f0e83aaac011aeba537e · order-group-application / order-group

24 Dec, 2020 2 commits

Merge branch 'coco20201223-bug-zhw' of… · 0c76b274

Merge branch 'coco20201223-bug-zhw' of gitlab.freemud.com:order-group-application/order-group into qa

# 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

committed Dec 24, 2020

0c76b274 Browse Files

fix 首日积点Bug · 0315337e
张洪旺 committed Dec 24, 2020

0315337e Browse Files

23 Dec, 2020 19 commits
- combo券 · 6ce8131e
  徐康 committed Dec 23, 2020
  
  6ce8131e Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 894606b7
  刘鹏飞 committed Dec 23, 2020
  
  894606b7 Browse Files
- 加些日志 · 7f62d4df
  刘鹏飞 committed Dec 23, 2020
  
  7f62d4df Browse Files
- Merge remote-tracking branch 'origin/feature/coco_new-刘鹏飞' into qa · 3e977a00
  刘鹏飞 committed Dec 23, 2020
  
  3e977a00 Browse Files
- coco核销优惠券 · f3356356
  刘鹏飞 committed Dec 23, 2020
  
  f3356356 Browse Files
- Merge branch 'qa' of gitlab.freemud.com:order-group-application/order-group into qa · 7ddf0604
  yu.sun committed Dec 23, 2020
  
  7ddf0604 Browse Files
- Merge branch 'feature/20201222_combo券需求_yu.sun' into qa · b38a991f
  yu.sun committed Dec 23, 2020
  
  b38a991f Browse Files
- sunyu::update::update about combo coupon · 96007ec2
  yu.sun committed Dec 23, 2020
  
  96007ec2 Browse Files
- 加些日志 · be637eea
  刘鹏飞 committed Dec 23, 2020
  
  be637eea Browse Files
- Merge remote-tracking branch 'origin/feature/coco_new-刘鹏飞' into qa · ff3b4f1a
  刘鹏飞 committed Dec 23, 2020
  
  ff3b4f1a Browse Files
- coco核销优惠券，商品转换 · 1a0ec19a
  刘鹏飞 committed Dec 23, 2020
  
  1a0ec19a Browse Files
- Merge remote-tracking branch 'origin/feature/coco_new-刘鹏飞' into qa · 6c97383e
  刘鹏飞 committed Dec 23, 2020
  
  6c97383e Browse Files
- coco商品id判断 · bdcf21f2
  刘鹏飞 committed Dec 23, 2020
  
  bdcf21f2 Browse Files
- Merge remote-tracking branch 'origin/feature/coco_new-刘鹏飞' into qa · af4c04f4
  刘鹏飞 committed Dec 23, 2020
  
  af4c04f4 Browse Files
- coco商品id判断 · 71d5fa28
  刘鹏飞 committed Dec 23, 2020
  
  71d5fa28 Browse Files
- 加些日志 · e848ca31
  刘鹏飞 committed Dec 23, 2020
  
  e848ca31 Browse Files
- 加些日志 · ae9821f5
  刘鹏飞 committed Dec 23, 2020
  
  ae9821f5 Browse Files
- Merge remote-tracking branch 'origin/feature/coco_new-刘鹏飞' into qa · 5a268b50
  刘鹏飞 committed Dec 23, 2020
  
  5a268b50 Browse Files
- sunyu::resolve conflicts · 0dd57634
  yu.sun committed Dec 23, 2020
  
  0dd57634 Browse Files
22 Dec, 2020 19 commits
- Merge branch 'feature/20201222_combo券需求_yu.sun' into qa · 8df59dac
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CalculationServiceImpl.java
```
  yu.sun committed Dec 22, 2020
  8df59dac Browse Files
- sunyu::update::fix bug about combo coupon calculate · 87bf0231
  yu.sun committed Dec 22, 2020
  
  87bf0231 Browse Files
- coco定制核销优惠券 · 8e410187
  刘鹏飞 committed Dec 22, 2020
  
  8e410187 Browse Files
- Merge branch 'feature/20201209_xukang_麦咖啡p4v2' · d73fc4df
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
```
  徐康 committed Dec 22, 2020
  d73fc4df Browse Files
- 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 branch 'feature/20201214-买一增一赠品价格修改-lcf' · 5f380af8
  chongfu.liang committed Dec 22, 2020
  
  5f380af8 Browse Files
- 删除注释代码 · 886b1c8e
  xiaoer.li@freemud.com committed Dec 22, 2020
  
  886b1c8e Browse Files
- Merge branch 'feature/2.1.11-支付超时回调直接退款' · a2b92cdf
```
# 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 22, 2020
  a2b92cdf 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