Commits · 9f64ad4810627dd4548e69b725591f2941bcd6f4 · order-group-application / order-group · GitLab

24 Jun, 2020 1 commit
- Merge remote-tracking branch 'remotes/origin/feature/1.9.28_单接受scene保存' into qa · 9f64ad48
  xiaoer.li@freemud.com committed Jun 24, 2020
  
  9f64ad48 Browse Files
22 Jun, 2020 7 commits
- Merge remote-tracking branch 'remotes/origin/bugfix_套餐折扣' into qa · 5b7c272d
  xiaoer.li@freemud.com committed Jun 22, 2020
  
  5b7c272d Browse Files
- del:test · fdc5ab57
  xiaoer.li@freemud.com committed Jun 22, 2020
  
  fdc5ab57 Browse Files
- 下单接口支持小程序打开场景值上报 · 9b2e111b
  xiaoer.li@freemud.com committed Jun 22, 2020
  
  9b2e111b Browse Files
- fix:兼容 skuId 不传转null 导致运行时校验出现NullPointerException · e8a6ca9f
  xiaoer.li@freemud.com committed Jun 22, 2020
  
  e8a6ca9f Browse Files
- Merge branches 'feature/20200611_未在营业时间预约单_wuping' and 'qa' of… · 9e5a8fbf
```
Merge branches 'feature/20200611_未在营业时间预约单_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
```
  ping.wu committed Jun 22, 2020
  9e5a8fbf Browse Files
- after时间相等问题比较修改 · 3f3973a0
  ping.wu committed Jun 22, 2020
  
  3f3973a0 Browse Files
- fix:增加折扣判断 · 419472d4
  xiaoer.li@freemud.com committed Jun 22, 2020
  
  419472d4 Browse Files
19 Jun, 2020 3 commits
- Merge branches 'feature/20200611_未在营业时间预约单_wuping' and 'qa' of… · 6e32dbc4
```
Merge branches 'feature/20200611_未在营业时间预约单_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
```
  ping.wu committed Jun 19, 2020
  6e32dbc4 Browse Files
- 门店sdk升级,区间营业预约问题修改 · b338ec89
  ping.wu committed Jun 19, 2020
  
  b338ec89 Browse Files
- 下单接口支持小程序打开场景值上报 · a029b3e3
  xiaoer.li@freemud.com committed Jun 19, 2020
  
  a029b3e3 Browse Files
18 Jun, 2020 4 commits
- Merge remote-tracking branch 'remotes/origin/fixbug_库存校验空指针' into qa · 87ed9022
  xiaoer.li@freemud.com committed Jun 18, 2020
  
  87ed9022 Browse Files
- fix:库存校验空指针 · d273b978
  xiaoer.li@freemud.com committed Jun 18, 2020
  
  d273b978 Browse Files
- Merge remote-tracking branch 'remotes/origin/fixbug_库存校验空指针' into qa · 28634bc4
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
```
  xiaoer.li@freemud.com committed Jun 18, 2020
  28634bc4 Browse Files
- fix:库存校验空指针 · 1bb6c28d
  xiaoer.li@freemud.com committed Jun 18, 2020
  
  1bb6c28d Browse Files
17 Jun, 2020 11 commits
- Merge remote-tracking branch 'remotes/origin/fix_集点不参与积分同享' into qa · b71cbbaf
  xiaoer.li@freemud.com committed Jun 17, 2020
  
  b71cbbaf Browse Files
- fix · 4134840d
  xiaoer.li@freemud.com committed Jun 17, 2020
  
  4134840d Browse Files
- Merge remote-tracking branch 'remotes/origin/fix_集点不参与积分同享' into qa · 78d734a2
  xiaoer.li@freemud.com committed Jun 17, 2020
  
  78d734a2 Browse Files
- 非换购过滤掉集点 · be20d9db
  xiaoer.li@freemud.com committed Jun 17, 2020
  
  be20d9db Browse Files
- fix:空指针 · ddeabfe8
  xiaoer.li@freemud.com committed Jun 17, 2020
  
  ddeabfe8 Browse Files
- sdk升级 · 73fab196
  xiaoer.li@freemud.com committed Jun 17, 2020
  
  73fab196 Browse Files
- Merge remote-tracking branch 'remotes/origin/fix_集点不参与积分同享' into qa · b146a541
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	order-application-service/pom.xml
#	ordercenter-sdk/pom.xml
#	ordercenter-sdk/readme.md
```
  xiaoer.li@freemud.com committed Jun 17, 2020
  b146a541 Browse Files
- fix:优惠同享去掉集点&库存判断异常 · 411d23af
  xiaoer.li@freemud.com committed Jun 17, 2020
  
  411d23af Browse Files
- 门店sdk升级 · 07fd1604
  ping.wu committed Jun 17, 2020
  
  07fd1604 Browse Files
- Merge branches 'feature/20200611_未在营业时间预约单_wuping' and 'qa' of… · 94bcfca1
```
Merge branches 'feature/20200611_未在营业时间预约单_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
#	order-application-service/src/main/java/cn/freemud/enums/ResponseResult.java
```
  ping.wu committed Jun 17, 2020
  94bcfca1 Browse Files
- 升级SDK · 6f11a182
  chongfu.liang committed Jun 17, 2020
  
  6f11a182 Browse Files
16 Jun, 2020 14 commits
- 隔日预约时间校验 · e6315f9c
  ping.wu committed Jun 16, 2020
  
  e6315f9c Browse Files
- Merge branch 'feature/1.9.27-小助手更改调用逻辑' into qa · fe15820d
  chongfu.liang committed Jun 16, 2020
  
  fe15820d Browse Files
- 小助手营业额查询修改返回码 · 47b8b361
  chongfu.liang committed Jun 16, 2020
  
  47b8b361 Browse Files
- 小助手营业额查询 · 6ce4058b
  chongfu.liang committed Jun 16, 2020
  
  6ce4058b Browse Files
- Merge branch 'feature/1.9.26-爱马哥兼容2' into qa · 3eeb73d9
  chongfu.liang committed Jun 16, 2020
  
  3eeb73d9 Browse Files
- 修改日志问题 · 550e6457
  chongfu.liang committed Jun 16, 2020
  
  550e6457 Browse Files
- Merge remote-tracking branch 'remotes/origin/bugfix_套餐折扣' into qa · 4a17e639
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	order-application-service/pom.xml
#	order-management/pom.xml
#	ordercenter-sdk/pom.xml
#	ordercenter-sdk/readme.md
#	shopping-cart-application-service/pom.xml
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/BuySendPromotionService.java
```
  xiaoer.li@freemud.com committed Jun 16, 2020
  4a17e639 Browse Files
- fix:套餐折扣 · c22a5d64
  xiaoer.li@freemud.com committed Jun 16, 2020
  
  c22a5d64 Browse Files
- 版本升级 · cf1d3da2
  dingkai committed Jun 16, 2020
  
  cf1d3da2 Browse Files
- 新增小助手营业额查询 · f8c4f701
  chongfu.liang committed Jun 16, 2020
  
  f8c4f701 Browse Files
- Merge branch 'feature/1.9.26-围餐促销2-20200610-dingkai' · f53a1b5c
  dingkai committed Jun 16, 2020
  
  f53a1b5c Browse Files
- Merge branch 'hotfix/1.9.27-蜜雪预支付取消订单校验修复-dingkai' · e77fb2a9
  dingkai committed Jun 16, 2020
  
  e77fb2a9 Browse Files
- 升级 assortment-shoppingcart-sdk · 022c819c
  xiaoer.li@freemud.com committed Jun 16, 2020
  
  022c819c Browse Files
- 升级assortment-shoppingcart-sdk 1.1.3.RELESE · cc011fa3
  xiaoer.li@freemud.com committed Jun 16, 2020
  
  cc011fa3 Browse Files