Commits · 7c32f89e57e6155351ea4e0c9036a8d2199529fe · order-group-application / order-group · GitLab

16 Jun, 2020 14 commits
- Merge branch 'feature/1.9.26-爱马哥兼容2' into develop · 7c32f89e
  chongfu.liang committed Jun 16, 2020
  
  7c32f89e Browse Files
- Merge branch 'feature/1.9.27-小助手更改调用逻辑' into develop · b25682a6
  chongfu.liang committed Jun 16, 2020
  
  b25682a6 Browse Files
- 修改日志问题 · 550e6457
  chongfu.liang committed Jun 16, 2020
  
  550e6457 Browse Files
- 小助手添加营业额查询 · 1e904679
  chongfu.liang committed Jun 16, 2020
  
  1e904679 Browse Files
- 小助手添加营业额查询 · 22f13079
  chongfu.liang committed Jun 16, 2020
  
  22f13079 Browse Files
- Merge branch 'feature/1.9.27-小助手更改调用逻辑' into develop · 8ddc1a88
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	assortment-shoppingcart-sdk/pom.xml
#	assortment-shoppingcart-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
```
  chongfu.liang committed Jun 16, 2020
  8ddc1a88 Browse Files
- 小助手添加营业额查询 · ccffbc7f
  chongfu.liang committed Jun 16, 2020
  
  ccffbc7f Browse Files
- 新增小助手营业额查询 · f8c4f701
  chongfu.liang committed Jun 16, 2020
  
  f8c4f701 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 10 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
- fix:scoreReduceState 默认值 · fcfaba6c
  xiaoer.li@freemud.com committed Jun 15, 2020
  
  fcfaba6c Browse Files
- fix:换购积分抵扣规则，新增是否与促销和优惠券同享 · e8ade444
  xiaoer.li@freemud.com committed Jun 15, 2020
  
  e8ade444 Browse Files
12 Jun, 2020 16 commits
- Merge remote-tracking branch 'origin/feature/1.9.26_积分抵扣规则，新增是否与促销和优惠券同享' into… · f66f76dd
```
Merge remote-tracking branch 'origin/feature/1.9.26_积分抵扣规则，新增是否与促销和优惠券同享' into feature/1.9.26_积分抵扣规则，新增是否与促销和优惠券同享
```
  xiaoer.li@freemud.com committed Jun 12, 2020
  f66f76dd Browse Files
- fix:积分抵扣规则，新增是否与促销和优惠券同享 · 889677e1
  xiaoer.li@freemud.com committed Jun 12, 2020
  
  889677e1 Browse Files
- fix:库存校验 · bc48dd81
  xiaoer.li@freemud.com committed Jun 12, 2020
  
  bc48dd81 Browse Files
- Merge branch 'develop' of… · 45a73669
```
Merge branch 'develop' of http://gitlab.freemud.com/order-group-application/order-group into develop
```
  xiaoer.li@freemud.com committed Jun 12, 2020
  45a73669 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.26_加车库存校验' into develop · d64c13ec
  xiaoer.li@freemud.com committed Jun 12, 2020
  
  d64c13ec Browse Files
- fix:加价购统计分类 · dc8aa47f
  xiaoer.li@freemud.com committed Jun 12, 2020
  
  dc8aa47f Browse Files
- Merge branch 'hotfix/1.9.27-蜜雪预支付取消订单校验修复-dingkai' into develop · 00d7efb3
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/AppOrderServiceImpl.java
```
  dingkai committed Jun 12, 2020
  00d7efb3 Browse Files
- import · 9564fdea
  dingkai committed Jun 12, 2020
  
  9564fdea Browse Files
- Merge branch 'hotfix/1.9.27-蜜雪预支付取消订单校验修复-dingkai' into develop · c0f0c601
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/AppOrderServiceImpl.java
```
  dingkai committed Jun 12, 2020
  c0f0c601 Browse Files
- 蜜雪预支付 · cd2b2bd9
  dingkai committed Jun 12, 2020
  
  cd2b2bd9 Browse Files
- 兼容爱马哥 · 520a2884
  chongfu.liang committed Jun 12, 2020
  
  520a2884 Browse Files
- jar升级 · 2905d406
  dingkai committed Jun 12, 2020
  
  2905d406 Browse Files
- Merge branch 'feature/1.9.27-支付宝推送信息补充-20200611-dingkai' into develop · 4e76b2a7
  dingkai committed Jun 12, 2020
  
  4e76b2a7 Browse Files
- 支付宝上报 · dde51ba2
  dingkai committed Jun 12, 2020
  
  dde51ba2 Browse Files
- fix:买赠 · 0eb8839f
  xiaoer.li@freemud.com committed Jun 12, 2020
  
  0eb8839f Browse Files
- jar升级 · 5d4faddd
  dingkai committed Jun 12, 2020
  
  5d4faddd Browse Files