Commits · 38d82048c53db12045d87515b0e3ca037d966b89 · order-group-application / order-group · GitLab

15 Jun, 2020 4 commits
- Merge remote-tracking branch 'remotes/origin/feature/1.9.26_积分抵扣规则，新增是否与促销和优惠券同享' into qa · 38d82048
  xiaoer.li@freemud.com committed Jun 15, 2020
  
  38d82048 Browse Files
- fix:scoreReduceState 默认值 · fcfaba6c
  xiaoer.li@freemud.com committed Jun 15, 2020
  
  fcfaba6c Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.26_积分抵扣规则，新增是否与促销和优惠券同享' into qa · 14d53c34
  xiaoer.li@freemud.com committed Jun 15, 2020
  
  14d53c34 Browse Files
- fix:换购积分抵扣规则，新增是否与促销和优惠券同享 · e8ade444
  xiaoer.li@freemud.com committed Jun 15, 2020
  
  e8ade444 Browse Files
12 Jun, 2020 17 commits
- Merge remote-tracking branch 'remotes/origin/feature/1.9.26_积分抵扣规则，新增是否与促销和优惠券同享' into qa · 03f68c2b
  xiaoer.li@freemud.com committed Jun 12, 2020
  
  03f68c2b Browse Files
- 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
- Merge remote-tracking branch 'remotes/origin/feature/1.9.26_加车库存校验' into qa · 3c228f3f
  xiaoer.li@freemud.com committed Jun 12, 2020
  
  3c228f3f Browse Files
- fix:库存校验 · bc48dd81
  xiaoer.li@freemud.com committed Jun 12, 2020
  
  bc48dd81 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.26_加购，更购，查购返回统计分类编号' into qa · b286228c
  xiaoer.li@freemud.com committed Jun 12, 2020
  
  b286228c Browse Files
- fix:加价购统计分类 · dc8aa47f
  xiaoer.li@freemud.com committed Jun 12, 2020
  
  dc8aa47f Browse Files
- Merge branch 'hotfix/1.9.27-蜜雪预支付取消订单校验修复-dingkai' into qa · 932e0f9b
  dingkai committed Jun 12, 2020
  
  932e0f9b Browse Files
- import · 9564fdea
  dingkai committed Jun 12, 2020
  
  9564fdea Browse Files
- 蜜雪预支付 · cd2b2bd9
  dingkai committed Jun 12, 2020
  
  cd2b2bd9 Browse Files
- Merge branch 'feature/1.9.27-支付宝推送信息补充-20200611-dingkai' into qa · f0ff5f20
  dingkai committed Jun 12, 2020
  
  f0ff5f20 Browse Files
- 支付宝上报 · dde51ba2
  dingkai committed Jun 12, 2020
  
  dde51ba2 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.26_加购，更购，查购返回统计分类编号' into qa · 34bac18c
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/BuySendPromotionService.java
```
  xiaoer.li@freemud.com committed Jun 12, 2020
  34bac18c Browse Files
- fix:买赠 · 0eb8839f
  xiaoer.li@freemud.com committed Jun 12, 2020
  
  0eb8839f Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.26_加车库存校验' into qa · 67d50301
  xiaoer.li@freemud.com committed Jun 12, 2020
  
  67d50301 Browse Files
- fix:校验库存 · 842f218c
  xiaoer.li@freemud.com committed Jun 12, 2020
  
  842f218c Browse Files
- 升级sdk · 1fa5428a
  xiaoer.li@freemud.com committed Jun 12, 2020
  
  1fa5428a Browse Files
11 Jun, 2020 13 commits
- Merge remote-tracking branch 'origin/qa' into qa · 52367321
  xiaoer.li@freemud.com committed Jun 11, 2020
  
  52367321 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.26_加购，更购，查购返回统计分类编号' into qa · 75d86d1e
  xiaoer.li@freemud.com committed Jun 11, 2020
  
  75d86d1e Browse Files
- fix:买赠商品统计分类 · 98463191
  xiaoer.li@freemud.com committed Jun 11, 2020
  
  98463191 Browse Files
- Merge branch 'feature/1.9.27-支付宝推送信息补充-20200611-dingkai' into qa · e7a48adf
  dingkai committed Jun 11, 2020
  
  e7a48adf Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.26_加车库存校验' into qa · a8f3b1b5
  xiaoer.li@freemud.com committed Jun 11, 2020
  
  a8f3b1b5 Browse Files
- 增加库存剩余件数提示 · 23a591f7
  xiaoer.li@freemud.com committed Jun 11, 2020
  
  23a591f7 Browse Files
- Merge branch 'feature/1.9.26-围餐促销2-20200610-dingkai' into qa · 1e5fc97a
  dingkai committed Jun 11, 2020
  
  1e5fc97a Browse Files
- 围餐获取会员信息 · f6885d12
  dingkai committed Jun 11, 2020
  
  f6885d12 Browse Files
- Merge branch 'feature/1.9.26-围餐促销2-20200610-dingkai' into qa · b6dccf69
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/order/QueryOrdersResponse.java
#	order-application-service/pom.xml
#	order-management/pom.xml
#	ordercenter-sdk/pom.xml
#	ordercenter-sdk/readme.md
#	ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/service/OrderSdkService.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartMealServiceImpl.java
```
  dingkai committed Jun 11, 2020
  b6dccf69 Browse Files
- 升级SDK · 77ff41de
  chongfu.liang committed Jun 11, 2020
  
  77ff41de Browse Files
- 微信上报加图片属性 · 9c4450f4
  dingkai committed Jun 11, 2020
  
  9c4450f4 Browse Files
- Merge branch 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa · 58d883ce
  xiaoer.li@freemud.com committed Jun 11, 2020
  
  58d883ce Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.26_加购，更购，查购返回统计分类编号' into qa · c3a3462d
  xiaoer.li@freemud.com committed Jun 11, 2020
  
  c3a3462d Browse Files
10 Jun, 2020 6 commits
- Merge remote-tracking branch 'origin/qa' into qa · 588f8c59
  chongfu.liang committed Jun 10, 2020
  
  588f8c59 Browse Files
- 升级SDK · 813456db
  chongfu.liang committed Jun 10, 2020
  
  813456db Browse Files
- 去掉sdk · e1b816e6
  xiaoer.li committed Jun 10, 2020
  
  e1b816e6 Browse Files
- 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