Commits · bc1b0e7b50ec2351af496dc0acd77173e46a77cd · jenkins / order-group

25 Dec, 2019 2 commits
- Merge branch 'feature_20191218_1.9.8_huc' into develop · bc1b0e7b
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	ordercenter-sdk/pom.xml
```
  胡超 committed Dec 25, 2019
  bc1b0e7b Browse Files
- 1.9.8订单日结 · 2dbe50bf
  胡超 committed Dec 25, 2019
  
  2dbe50bf Browse Files
24 Dec, 2019 10 commits
- Merge branch 'feature/v1.9.9_农工商订单结算&撤销' into develop · b2341bab
  shuhu.hou@freemud.cn committed Dec 24, 2019
  
  b2341bab Browse Files
- 修改枚举类OrderClientType · 1c0cefe0
  shuhu.hou@freemud.cn committed Dec 24, 2019
  
  1c0cefe0 Browse Files
- Merge branch 'feature/v1.9.9_农工商订单结算&撤销' into develop · 834f0b88
  shuhu.hou@freemud.cn committed Dec 24, 2019
  
  834f0b88 Browse Files
- 修改枚举类OrderClientType · 05df0579
  shuhu.hou@freemud.cn committed Dec 24, 2019
  
  05df0579 Browse Files
- Merge branch 'feature/v1.9.9_农工商订单结算&撤销' into develop · f1c54ee1
  shuhu.hou@freemud.cn committed Dec 24, 2019
  
  f1c54ee1 Browse Files
- 修改枚举类OrderSourceType · b6899d0e
  shuhu.hou@freemud.cn committed Dec 24, 2019
  
  b6899d0e Browse Files
- Delete assortment-shoppingcart-sdk.iml · d92af899
  姜海波 committed Dec 24, 2019
  
  d92af899 Browse Files
- 创建订单接口新增thirdCategoryId字段 · 8b51e81a
  shuhu.hou@freemud.cn committed Dec 24, 2019
  
  8b51e81a Browse Files
- Merge branch 'feature/v1.9.9_农工商订单结算&撤销' into develop · d1b7716a
  shuhu.hou@freemud.cn committed Dec 24, 2019
  
  d1b7716a Browse Files
- 创建订单接口新增thirdCategoryId字段 · df2cd63b
  shuhu.hou@freemud.cn committed Dec 24, 2019
  
  df2cd63b Browse Files
23 Dec, 2019 8 commits
- Merge branch 'feature/1.9.8-围餐-20191216-dingkai' into develop · 4a36c0b6
  dingkai committed Dec 23, 2019
  
  4a36c0b6 Browse Files
- 围餐预订单取消 · 206c90de
  dingkai committed Dec 23, 2019
  
  206c90de Browse Files
- Merge branch 'feature/1.9.9-围餐-20191218-dingkai' into develop · b3dd5974
  dingkai committed Dec 23, 2019
  
  b3dd5974 Browse Files
- 订单支付回调返回状态兼容100 · a5b0fb6f
  dingkai committed Dec 23, 2019
  
  a5b0fb6f Browse Files
- Merge branch 'feature/v1.9.9_农工商订单结算&撤销' into develop · b837305f
```
# Conflicts:
#	ordercenter-sdk/pom.xml
#	ordercenter-sdk/readme.md
```
  shuhu.hou@freemud.cn committed Dec 23, 2019
  b837305f Browse Files
- 创建订单接口新增thirdCategoryId字段 · cc3d0502
  shuhu.hou@freemud.cn committed Dec 23, 2019
  
  cc3d0502 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.9-支付有礼增加sku-海波' into develop · d76b860c
  haibo.jiang committed Dec 23, 2019
  
  d76b860c Browse Files
- 支付有礼活动增加skuid · 384a9fc8
  haibo.jiang committed Dec 23, 2019
  
  384a9fc8 Browse Files
20 Dec, 2019 3 commits
- 桂源铺 - 金额问题 · 1c7d05c3
  张明警 committed Dec 20, 2019
  
  1c7d05c3 Browse Files
- Merge remote-tracking branch 'origin/master' · 01e01e0a
  张明警 committed Dec 20, 2019
  
  01e01e0a Browse Files
- 桂源铺 - 金额问题 · 9b72b44a
  张明警 committed Dec 20, 2019
  
  9b72b44a Browse Files
19 Dec, 2019 14 commits
- Merge branch 'feature/20191119_套餐特价' into develop · 879a2adc
  shuhu.hou@freemud.cn committed Dec 19, 2019
  
  879a2adc Browse Files
- Merge branch 'feature/20191119_套餐特价' · 95a5989c
  shuhu.hou@freemud.cn committed Dec 19, 2019
  
  95a5989c Browse Files
- 库存fixbug · c9c6fa7f
  shuhu.hou@freemud.cn committed Dec 19, 2019
  
  c9c6fa7f Browse Files
- Merge branch 'feature/20191119_套餐特价' · ae40a430
  shuhu.hou@freemud.cn committed Dec 19, 2019
  
  ae40a430 Browse Files
- 获取可用优惠券，总金额错误fixbug · b922552e
  shuhu.hou@freemud.cn committed Dec 19, 2019
  
  b922552e Browse Files
- Merge branch 'feature/20191119_套餐特价' · d95fdfe1
  shuhu.hou@freemud.cn committed Dec 19, 2019
  
  d95fdfe1 Browse Files
- Merge branch 'feature/20191119_套餐特价' into develop · 88694e16
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/SetMealServiceImpl.java
```
  shuhu.hou@freemud.cn committed Dec 19, 2019
  88694e16 Browse Files
- 修复套餐特价满减除不尽时，金额误差bug · 36dc5151
  shuhu.hou@freemud.cn committed Dec 19, 2019
  
  36dc5151 Browse Files
- 桂源铺推送哗啦啦添加日志 · 75ec00c5
  张明警 committed Dec 19, 2019
  
  75ec00c5 Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · 7f3f127d
  shuhu.hou@freemud.cn committed Dec 19, 2019
  
  7f3f127d Browse Files
- Merge branch 'hotfix/201191218_限时特价提示语修复' into develop · f0893150
```
# Conflicts:
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
```
  shuhu.hou@freemud.cn committed Dec 19, 2019
  f0893150 Browse Files
- assortment-ordercenter-sdk升级 · b796e102
  dingkai committed Dec 19, 2019
  
  b796e102 Browse Files
- Merge branches 'feature/20191127_预订单_wuping' and 'master' of… · f9723232
```
Merge branches 'feature/20191127_预订单_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
```
  ping.wu committed Dec 19, 2019
  f9723232 Browse Files
- Merge branch 'feature/1.9.9-围餐-20191218-dingkai' into develop · 0e55fd91
  dingkai committed Dec 19, 2019
  
  0e55fd91 Browse Files
18 Dec, 2019 3 commits

Merge branches 'develop' and 'feature/20191127_预订单_wuping' of… · b2ce2190

Merge branches 'develop' and 'feature/20191127_预订单_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop

committed Dec 18, 2019

b2ce2190 Browse Files

会员卡订单保存预约任务 · a4cc0e0c
ping.wu committed Dec 18, 2019

a4cc0e0c Browse Files

Merge branches 'develop' and 'feature/20191216_记录订单操作人_wuping' of… · 9ee24eec

Merge branches 'develop' and 'feature/20191216_记录订单操作人_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

committed Dec 18, 2019

9ee24eec Browse Files