Commits · 6e2a5d1eb034808715c64f3e26656a5923cfa680 · order-group-application / order-group · GitLab

22 Jun, 2020 10 commits
- Merge branch 'feature/1.9.27-小助手更改调用逻辑' · 6e2a5d1e
  chongfu.liang committed Jun 22, 2020
  
  6e2a5d1e Browse Files
- Merge branches 'feature/20200611_未在营业时间预约单_wuping' and 'master' of… · 5cd7a24a
```
Merge branches 'feature/20200611_未在营业时间预约单_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
#	order-application-service/src/main/java/cn/freemud/enums/ResponseResult.java
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
```
  ping.wu committed Jun 22, 2020
  5cd7a24a Browse Files
- Merge remote-tracking branch 'origin/master' · 8d7c99f8
  xiaoer.li@freemud.com committed Jun 22, 2020
  
  8d7c99f8 Browse Files
- Merge remote-tracking branch 'remotes/origin/bugfix_套餐折扣' · 72d2c3cf
  xiaoer.li@freemud.com committed Jun 22, 2020
  
  72d2c3cf Browse Files
- Merge remote-tracking branch 'remotes/origin/fix_集点不参与积分同享' · e6e35ef3
  xiaoer.li@freemud.com committed Jun 22, 2020
  
  e6e35ef3 Browse Files
- 获取预支付更改弹窗title · 9dfb2fed
  shuhu.hou@freemud.cn committed Jun 22, 2020
  
  9dfb2fed Browse Files
- del:test · fdc5ab57
  xiaoer.li@freemud.com committed Jun 22, 2020
  
  fdc5ab57 Browse Files
- fix:兼容 skuId 不传转null 导致运行时校验出现NullPointerException · e8a6ca9f
  xiaoer.li@freemud.com committed Jun 22, 2020
  
  e8a6ca9f 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 1 commit
- 门店sdk升级,区间营业预约问题修改 · b338ec89
  ping.wu committed Jun 19, 2020
  
  b338ec89 Browse Files
18 Jun, 2020 2 commits
- fix:库存校验空指针 · d273b978
  xiaoer.li@freemud.com committed Jun 18, 2020
  
  d273b978 Browse Files
- fix:库存校验空指针 · 1bb6c28d
  xiaoer.li@freemud.com committed Jun 18, 2020
  
  1bb6c28d Browse Files
17 Jun, 2020 5 commits
- fix · 4134840d
  xiaoer.li@freemud.com committed Jun 17, 2020
  
  4134840d 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
- fix:优惠同享去掉集点&库存判断异常 · 411d23af
  xiaoer.li@freemud.com committed Jun 17, 2020
  
  411d23af Browse Files
- 门店sdk升级 · 07fd1604
  ping.wu committed Jun 17, 2020
  
  07fd1604 Browse Files
16 Jun, 2020 14 commits
- 隔日预约时间校验 · e6315f9c
  ping.wu committed Jun 16, 2020
  
  e6315f9c Browse Files
- 小助手营业额查询修改返回码 · 47b8b361
  chongfu.liang committed Jun 16, 2020
  
  47b8b361 Browse Files
- 小助手营业额查询 · 6ce4058b
  chongfu.liang committed Jun 16, 2020
  
  6ce4058b Browse Files
- 修改日志问题 · 550e6457
  chongfu.liang committed Jun 16, 2020
  
  550e6457 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
- Merge remote-tracking branch 'remotes/origin/feature/1.9.26_积分抵扣规则，新增是否与促销和优惠券同享' · deb4133a
  xiaoer.li@freemud.com committed Jun 16, 2020
  
  deb4133a Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.26_加购，更购，查购返回统计分类编号' · 1abd1213
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/BuySendPromotionService.java
```
  xiaoer.li@freemud.com committed Jun 16, 2020
  1abd1213 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.26_加车库存校验' · d53ae681
  xiaoer.li@freemud.com committed Jun 16, 2020
  
  d53ae681 Browse Files
15 Jun, 2020 8 commits
- 升级SDK · cd15f5a5
  chongfu.liang committed Jun 15, 2020
  
  cd15f5a5 Browse Files
- SDK回滚 · 38760278
  chongfu.liang committed Jun 15, 2020
  
  38760278 Browse Files
- Merge branch 'feature/1.9.26-订单和购物车的所有直接查数据库的地方添加缓存' · cd582e46
```
# Conflicts:
#	order-application-service/pom.xml
```
  chongfu.liang committed Jun 15, 2020
  cd582e46 Browse Files
- Merge branches 'feature/20200604_统计分类编号维护_wuping' and 'master' of… · 7e251253
```
Merge branches 'feature/20200604_统计分类编号维护_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group

# Conflicts:
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/OrderProductAddInfoDto.java
```
  ping.wu committed Jun 15, 2020
  7e251253 Browse Files
- 预约单任务删除合并 · e49f3f6c
  ping.wu committed Jun 15, 2020
  
  e49f3f6c Browse Files
- Merge branches 'feature/20200604_预约单任务删除_wuping' and 'master' of… · f15afb48
```
Merge branches 'feature/20200604_预约单任务删除_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group

# 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
```
  ping.wu committed Jun 15, 2020
  f15afb48 Browse Files
- fix:优惠金额 · 5f610259
  xiaoer.li@freemud.com committed Jun 15, 2020
  
  5f610259 Browse Files
- fix:换购 · 8d53ffc2
  xiaoer.li@freemud.com committed Jun 15, 2020
  
  8d53ffc2 Browse Files