Commits · 630d6063c1e7c3bccd3f9c404cc25faffc1bc89c · order-group-application / order-group · GitLab

21 Dec, 2020 6 commits
- 删除日志 · 630d6063
  徐康 committed Dec 21, 2020
  
  630d6063 Browse Files
- Merge branch 'feature/20201209_xukang_麦咖啡p4v2' into qa · 2c2a84ba
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
```
  徐康 committed Dec 21, 2020
  2c2a84ba Browse Files
- 餐具商品bug修复 · bcdcc9bc
  徐康 committed Dec 21, 2020
  
  bcdcc9bc Browse Files
- Merge branch 'feature/20201209_xukang_麦咖啡p4v2' into qa · e1848982
```
# Conflicts:
#	shopping-cart-application-service/src/main/resources/application.properties
```
  徐康 committed Dec 21, 2020
  e1848982 Browse Files
- Merge remote-tracking branch 'origin/feature/20201209_xukang_麦咖啡p4v2' into… · a3bf7fec
```
Merge remote-tracking branch 'origin/feature/20201209_xukang_麦咖啡p4v2' into feature/20201209_xukang_麦咖啡p4v2
```
  徐康 committed Dec 21, 2020
  a3bf7fec Browse Files
- 餐具商品bug修复 · b5b7ff5e
  徐康 committed Dec 21, 2020
  
  b5b7ff5e Browse Files
18 Dec, 2020 19 commits
- Merge remote-tracking branch 'origin/qa' into qa · 3d72bbd8
  zhiheng.zhang committed Dec 18, 2020
  
  3d72bbd8 Browse Files
- Merge branch 'feature/20201211-猜你喜欢-张志恒' into qa · fc7b2033
  zhiheng.zhang committed Dec 18, 2020
  
  fc7b2033 Browse Files
- 猜你喜欢去除打印日志 · 8e8a59de
  zhiheng.zhang committed Dec 18, 2020
  
  8e8a59de Browse Files
- Merge branch 'feature/20201209_xukang_麦咖啡p4v2' into qa · 0d523ebc
  徐康 committed Dec 18, 2020
  
  0d523ebc Browse Files
- 餐具商品 · 00795633
  徐康 committed Dec 18, 2020
  
  00795633 Browse Files
- Merge branch 'feature/20201209_xukang_麦咖啡p4v2' into qa · ee395ab8
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
```
  徐康 committed Dec 18, 2020
  ee395ab8 Browse Files
- 餐具商品 · 4c96ccb3
  徐康 committed Dec 18, 2020
  
  4c96ccb3 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · fdd128ef
  zhiheng.zhang committed Dec 18, 2020
  
  fdd128ef Browse Files
- Merge branch 'feature/20201211-猜你喜欢-张志恒' into qa · cec0f80a
  zhiheng.zhang committed Dec 18, 2020
  
  cec0f80a Browse Files
- sdkjar包升级 · f6d9f61c
  zhiheng.zhang committed Dec 18, 2020
  
  f6d9f61c Browse Files
- Merge branch 'feature/20201217_四个非常搭套餐需求_yu.sun' into qa · a086efca
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/adapter/ShoppingCartConvertAdapter.java
```
  yu.sun committed Dec 18, 2020
  a086efca Browse Files
- sunyu::update::可选商品加料 · 59b98e22
  yu.sun committed Dec 18, 2020
  
  59b98e22 Browse Files
- fix · 76ea07c6
  xiaoer.li@freemud.com committed Dec 18, 2020
  
  76ea07c6 Browse Files
- Merge branch 'feature/appid-可用券列表' into qa · 6f6f5462
  xiaoer.li@freemud.com committed Dec 18, 2020
  
  6f6f5462 Browse Files
- Merge branch 'feature/2.1.11-支付超时回调直接退款' into qa · f30a0c66
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
```
  xiaoer.li@freemud.com committed Dec 18, 2020
  f30a0c66 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 503f2623
  zhiheng.zhang committed Dec 18, 2020
  
  503f2623 Browse Files
- Merge branch 'feature/20201203-抖音小程序渠道新增-张志恒' into qa · 831ab577
  zhiheng.zhang committed Dec 18, 2020
  
  831ab577 Browse Files
- 抖音支付更换返回值 · 54bbcd85
  zhiheng.zhang committed Dec 18, 2020
  
  54bbcd85 Browse Files
- modify:取消订单关闭预支付订单 · aec12131
  xiaoer.li@freemud.com committed Dec 18, 2020
  
  aec12131 Browse Files
17 Dec, 2020 10 commits
- fix:xxoo · b512ec99
  xiaoer.li@freemud.com committed Dec 17, 2020
  
  b512ec99 Browse Files
- Merge branch 'feature/2.1.11-支付超时回调直接退款' into qa · 56201c31
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderAdapterServiceImpl.java
```
  xiaoer.li@freemud.com committed Dec 17, 2020
  56201c31 Browse Files
- add:xxoo · b206e53f
  xiaoer.li@freemud.com committed Dec 17, 2020
  
  b206e53f Browse Files
- Merge branch 'feature/2.0.11-超时回调退款' into qa · 091e3005
  xiaoer.li@freemud.com committed Dec 17, 2020
  
  091e3005 Browse Files
- fix · ce3327b7
  xiaoer.li@freemud.com committed Dec 17, 2020
  
  ce3327b7 Browse Files
- Merge branch 'feature/2.0.11-超时回调退款' into qa · 5adb6119
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderAdapterServiceImpl.java
```
  xiaoer.li@freemud.com committed Dec 17, 2020
  5adb6119 Browse Files
- modify:test渠道 · 9ff05b5d
  xiaoer.li@freemud.com committed Dec 17, 2020
  
  9ff05b5d Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 4101d14a
  xiaoer.li@freemud.com committed Dec 17, 2020
  
  4101d14a Browse Files
- Merge branch 'feature/2.0.11-超时回调退款' into qa · 2b378b9a
  xiaoer.li@freemud.com committed Dec 17, 2020
  
  2b378b9a Browse Files
- modify:test渠道 · 55086622
  xiaoer.li@freemud.com committed Dec 17, 2020
  
  55086622 Browse Files
16 Dec, 2020 5 commits
- modify:可用券+appid · 172b0ba9
  xiaoer.li@freemud.com committed Dec 16, 2020
  
  172b0ba9 Browse Files
- 升级assortment-shoppingcart-sdk版本 · 7bbe6c54
  孙昱 committed Dec 16, 2020
  
  7bbe6c54 Browse Files
- sunyu::update::update shopping-cart-application-sdk version · 91f1c0a5
  孙昱 committed Dec 16, 2020
  
  91f1c0a5 Browse Files
- Merge branch 'feature/20201216_切换门店清除代金券缓存_yu.sun' into qa · e713eabb
```
# Conflicts:
#	shopping-cart-application-service/pom.xml
```
  孙昱 committed Dec 16, 2020
  e713eabb Browse Files
- sunyu::update::fix bug about money coupon at switchStore · c4cc09c3
  孙昱 committed Dec 16, 2020
  
  c4cc09c3 Browse Files