Commits · 7c3fbd88ea05f6ea594a4f497675e5f4bd44e307 · order-group-application / order-group

10 Jun, 2020 5 commits
- productcenter-sdk · 7c3fbd88
  xiaoer.li committed Jun 10, 2020
  
  7c3fbd88 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.26_加车库存校验' into qa · f7f4509e
```
# 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
```
  xiaoer.li committed Jun 10, 2020
  f7f4509e Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.26_积分抵扣规则，新增是否与促销和优惠券同享' into qa · 67851ba0
  xiaoer.li committed Jun 10, 2020
  
  67851ba0 Browse Files
- productcenter-sdk · 63ae505a
  xiaoer.li committed Jun 10, 2020
  
  63ae505a Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.26_加购，更购，查购返回统计分类编号' into qa · cc095a0f
  xiaoer.li committed Jun 10, 2020
  
  cc095a0f Browse Files
09 Jun, 2020 8 commits

fix:空指针 · 753f1607
xiaoer.li committed Jun 09, 2020

753f1607 Browse Files
升级SDK · 4e447346
chongfu.liang committed Jun 09, 2020

4e447346 Browse Files
Merge branch 'feature/1.9.26-订单和购物车的所有直接查数据库的地方添加缓存' into qa · 915ccffc
```
# Conflicts:
#	order-application-service/pom.xml
```
chongfu.liang committed Jun 09, 2020
915ccffc Browse Files
订单&购物车数据库查询添加缓存 · bba72a4b
chongfu.liang committed Jun 09, 2020

bba72a4b Browse Files

Merge branches 'feature/20200604_预约单任务删除_wuping' and 'qa' of… · a4c8e4ad

Merge branches 'feature/20200604_预约单任务删除_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	order-application-service/pom.xml
#	order-management/pom.xml
#	ordercenter-sdk/readme.md

committed Jun 09, 2020

a4c8e4ad Browse Files

Merge branch 'feature/1.9.22-围餐促销-20200509-dingkai' into qa · b290994d

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	order-application-service/pom.xml
#	order-application-service/src/main/java/cn/freemud/service/impl/EncircleOrderServiceImpl.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartMealServiceImpl.java

committed Jun 09, 2020

b290994d Browse Files

add:通spu+sku识别商品数量 · c209442f
xiaoer.li@freemud.com committed Jun 09, 2020

c209442f Browse Files

Merge branches 'feature/20200604_统计分类编号维护_wuping' and 'qa' of… · 05c3d154

Merge branches 'feature/20200604_统计分类编号维护_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

# Conflicts:
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/OrderProductAddInfoDto.java

committed Jun 09, 2020

05c3d154 Browse Files

08 Jun, 2020 27 commits
- 券码接口修改channel_code · b7a7c50f
  chongfu.liang committed Jun 08, 2020
  
  b7a7c50f Browse Files
- Merge branch 'feature/20200513_1.9.25_订单对接券码字段修改' · 1bea042e
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
```
  chongfu.liang committed Jun 08, 2020
  1bea042e Browse Files
- 升级SDK · cdb539d5
  chongfu.liang committed Jun 08, 2020
  
  cdb539d5 Browse Files
- 升级SDK · fe80f2b6
  chongfu.liang committed Jun 08, 2020
  
  fe80f2b6 Browse Files
- Merge branch 'feature/1.9.25-查询非码微店订单，下载' · 78430ca8
  chongfu.liang committed Jun 08, 2020
  
  78430ca8 Browse Files
- Merge branch 'feature/20200528_1.9.25_查询非码微店订单，下载' · 4b6c76d6
  chongfu.liang committed Jun 08, 2020
  
  4b6c76d6 Browse Files
- 升级SDK · 169789cd
  chongfu.liang committed Jun 08, 2020
  
  169789cd Browse Files
- Merge remote-tracking branch 'origin/feature/20200528_1.9.25_集点参数为0不要调会员接口' · 3e62bf75
  chongfu.liang committed Jun 08, 2020
  
  3e62bf75 Browse Files
- 升级SDK · 9b2e0411
  xiaoer.li@freemud.com committed Jun 08, 2020
  
  9b2e0411 Browse Files
- Merge remote-tracking branches 'remotes/origin/feature/1.9.25_满减提示语' and… · f290c357
```
Merge remote-tracking branches 'remotes/origin/feature/1.9.25_满减提示语' and 'remotes/origin/feature/1.9.25_购物车支持限时折扣类型'
```
  xiaoer.li@freemud.com committed Jun 08, 2020
  f290c357 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/19.24_买一赠一活动优化' · 906ead41
  xiaoer.li@freemud.com committed Jun 08, 2020
  
  906ead41 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.25__门店超出配送范围问题' · 2422ebb8
  xiaoer.li@freemud.com committed Jun 08, 2020
  
  2422ebb8 Browse Files
- 支付升级SDK · 63b0acc4
  梁崇福 committed Jun 08, 2020
  
  63b0acc4 Browse Files
- fix:增加显示不可点状态 · 6008f9d6
  xiaoer.li@freemud.com committed Jun 08, 2020
  
  6008f9d6 Browse Files
- fix:积分抵扣规则，新增是否与促销和优惠券同享 · c5f148e6
  xiaoer.li@freemud.com committed Jun 08, 2020
  
  c5f148e6 Browse Files
- Merge branch 'feature/1.9.25-mall-订单查询配送状态-20200525-dingkai' · 2640b56c
  dingkai committed Jun 08, 2020
  
  2640b56c Browse Files
- fix:积分抵扣规则，新增是否与促销和优惠券同享 · 3b445ecb
  xiaoer.li@freemud.com committed Jun 08, 2020
  
  3b445ecb Browse Files
- Merge branch 'feature/1.9.25-oms修改订单状态' into qa · 4a36369d
  chongfu.liang committed Jun 08, 2020
  
  4a36369d Browse Files
- 消息中心通知状态问题修复 · 479f0f69
  chongfu.liang committed Jun 08, 2020
  
  479f0f69 Browse Files
- 升级SDK · bc12bce9
  chongfu.liang committed Jun 08, 2020
  
  bc12bce9 Browse Files
- Merge branch 'feature/20200513_1.9.25_订单对接券码字段修改' into qa · 91a09389
  chongfu.liang committed Jun 08, 2020
  
  91a09389 Browse Files
- 升级SDK · 12acba05
  chongfu.liang committed Jun 08, 2020
  
  12acba05 Browse Files
- Merge branch 'feature/20200513_1.9.25_订单对接券码字段修改' into qa · e6e52424
  chongfu.liang committed Jun 08, 2020
  
  e6e52424 Browse Files
- fix · 7eb6d2c3
  chongfu.liang committed Jun 08, 2020
  
  7eb6d2c3 Browse Files
- SDK 修改 · d104bef9
  梁崇福 committed Jun 08, 2020
  
  d104bef9 Browse Files
- Merge branch 'feature/20200513_1.9.25_订单对接券码字段修改' into qa · c7c28fb7
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
```
  chongfu.liang committed Jun 08, 2020
  c7c28fb7 Browse Files
- 券码添加code字段 · 029298c4
  chongfu.liang committed Jun 08, 2020
  
  029298c4 Browse Files