Commits · a95ccbf51c5d33bb60540147ed694cda8e11638b · order-group-application / order-group · GitLab

22 Jul, 2020 8 commits
- Merge remote-tracking branch 'remotes/origin/feature/1.9.30_买一赠一&第X件Y折' into develop · a95ccbf5
  xiaoer.li@freemud.com committed Jul 22, 2020
  
  a95ccbf5 Browse Files
- 促销查询增加cartUid · eb541a94
  xiaoer.li@freemud.com committed Jul 22, 2020
  
  eb541a94 Browse Files
- 升级sdk版本 · 00f6d101
  xiaoer.li@freemud.com committed Jul 22, 2020
  
  00f6d101 Browse Files
- Merge branch 'feature-2020/6/29-1.9.29-围餐-会阳' into develop · d5d9e180
  huiyang.chen committed Jul 22, 2020
  
  d5d9e180 Browse Files
- 商品价格均摊问题 · d11d8de7
  huiyang.chen committed Jul 22, 2020
  
  d11d8de7 Browse Files
- 商品价格均摊问题 · 84ba9f33
  huiyang.chen committed Jul 22, 2020
  
  84ba9f33 Browse Files
- Merge branch 'feature-2020/6/29-1.9.29-围餐-会阳' into develop · 906b1381
  huiyang.chen committed Jul 22, 2020
  
  906b1381 Browse Files
- 储值卡和返回积分抵扣金额 · 81ff357a
  huiyang.chen committed Jul 22, 2020
  
  81ff357a Browse Files
21 Jul, 2020 9 commits
- 升级ordercenter-sdk 2.0.5-SNAPSHOT · 83d32187
  huiyang.chen committed Jul 21, 2020
  
  83d32187 Browse Files
- Merge branch 'feature-2020/6/29-1.9.29-围餐-会阳' into develop · 81be9423
  huiyang.chen committed Jul 21, 2020
  
  81be9423 Browse Files
- 套餐商品均摊bug · 36a0e81f
  huiyang.chen committed Jul 21, 2020
  
  36a0e81f Browse Files
- 去掉赠品max判断 · 75c1ee68
  xiaoer.li@freemud.com committed Jul 21, 2020
  
  75c1ee68 Browse Files
- Merge branch 'feature-2020/6/29-1.9.29-围餐-会阳' into develop · dc8de35a
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	order-application-service/pom.xml
```
  huiyang.chen committed Jul 21, 2020
  dc8de35a Browse Files
- 套餐商品均摊 · a66e2a54
  huiyang.chen committed Jul 21, 2020
  
  a66e2a54 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.30_买一赠一&第X件Y折' into develop · feba0574
  xiaoer.li@freemud.com committed Jul 21, 2020
  
  feba0574 Browse Files
- fixbug 买一赠一判断 · a9aee4e6
  xiaoer.li@freemud.com committed Jul 21, 2020
  
  a9aee4e6 Browse Files
- 赠送最大 · 5cd4c340
  xiaoer.li@freemud.com committed Jul 21, 2020
  
  5cd4c340 Browse Files
20 Jul, 2020 16 commits
- 升级ordercenter-sdk · 0d5ec395
  huiyang.chen committed Jul 20, 2020
  
  0d5ec395 Browse Files
- Merge branch 'feature-2020/6/29-1.9.29-围餐-会阳' into develop · 0e219a00
  huiyang.chen committed Jul 20, 2020
  
  0e219a00 Browse Files
- 使用积分后用户支付金额 · e4d67034
  huiyang.chen committed Jul 20, 2020
  
  e4d67034 Browse Files
- Merge branches 'develop' and 'feature/20200720_预约单取餐时间字段格式兼容_wuping' of… · cb88c29d
```
Merge branches 'develop' and 'feature/20200720_预约单取餐时间字段格式兼容_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop

# Conflicts:
#	order-application-service/pom.xml
#	ordercenter-sdk/readme.md
#	ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/constant/InterfaceAddressConstant.java
#	ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderExtInfoDto.java
```
  ping.wu committed Jul 20, 2020
  cb88c29d Browse Files
- 兼容门店隔日预约单格式修改，HH:mm变yyyy-MM-dd HH:mm，前端未升级，未按要求传 · be1ebe24
  ping.wu committed Jul 20, 2020
  
  be1ebe24 Browse Files
- 兼容门店隔日预约单格式修改，HH:mm变yyyy-MM-dd HH:mm，前端未升级，未按要求传 · 9fbde580
  ping.wu committed Jul 20, 2020
  
  9fbde580 Browse Files
- Merge remote-tracking branch 'remotes/origin/20200715_清除购物车_张志恒' into develop · 7735343b
  zhiheng.zhang committed Jul 20, 2020
  
  7735343b Browse Files
- 返回信息修改 · f0ec6573
  zhiheng.zhang committed Jul 20, 2020
  
  f0ec6573 Browse Files
- 更新门店sdk · 1114f056
  xiaoer.li@freemud.com committed Jul 20, 2020
  
  1114f056 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.30_门店起送规则' · cdd655b4
  xiaoer.li@freemud.com committed Jul 20, 2020
  
  cdd655b4 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.30_门店起送规则' into develop · ec989a00
  xiaoer.li@freemud.com committed Jul 20, 2020
  
  ec989a00 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.30_买一赠一&第X件Y折' into develop · 6e6bb6af
  xiaoer.li@freemud.com committed Jul 20, 2020
  
  6e6bb6af Browse Files
- Merge branch 'feature-2020/6/29-1.9.29-围餐-会阳' into develop · 90f9b2db
  huiyang.chen committed Jul 20, 2020
  
  90f9b2db Browse Files
- 使用积分后用户支付金额 · bb3313c9
  huiyang.chen committed Jul 20, 2020
  
  bb3313c9 Browse Files
- 支持多x件y折活动 · c3e1658a
  xiaoer.li@freemud.com committed Jul 20, 2020
  
  c3e1658a Browse Files
- 支持多买一赠一活动 · 46800938
  xiaoer.li@freemud.com committed Jul 20, 2020
  
  46800938 Browse Files
17 Jul, 2020 7 commits
- 支持多买一赠一活动 · f65e9ebb
  xiaoer.li@freemud.com committed Jul 17, 2020
  
  f65e9ebb Browse Files
- Merge branches 'feature/20200619_停车场订单sdk_wuping' and 'master' of… · e76791a7
```
Merge branches 'feature/20200619_停车场订单sdk_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group

# Conflicts:
#	ordercenter-sdk/pom.xml
#	ordercenter-sdk/readme.md
#	ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/constant/InterfaceAddressConstant.java
#	ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderExtInfoDto.java
```
  ping.wu committed Jul 17, 2020
  e76791a7 Browse Files
- 支持多买一赠一活动 · 595f532c
  xiaoer.li@freemud.com committed Jul 17, 2020
  
  595f532c Browse Files
- Merge remote-tracking branch 'remotes/origin/20200715_清除购物车_张志恒' into develop · 00ca24f2
  zhiheng.zhang committed Jul 17, 2020
  
  00ca24f2 Browse Files
- Merge branch 'develop' of… · 4d13bcc4
```
Merge branch 'develop' of http://gitlab.freemud.com/order-group-application/order-group into develop
```
  zhiheng.zhang committed Jul 17, 2020
  4d13bcc4 Browse Files
- 去除继承baseRequest · 12e40197
  zhiheng.zhang committed Jul 17, 2020
  
  12e40197 Browse Files
- Merge branch 'feature-2020/6/29-1.9.29-围餐-会阳' into develop · b0c4d308
  huiyang.chen committed Jul 17, 2020
  
  b0c4d308 Browse Files