Commits · 5b045e7b001a463a30e4980d9ff5dbba8ca8ad3c · order-group-application / order-group · GitLab

26 Jan, 2021 1 commit
- 益禾堂添加排队号 · 5b045e7b
  zhiheng.zhang committed Jan 26, 2021
  
  5b045e7b Browse Files
22 Jan, 2021 2 commits
- 升级sdk · 67749415
  徐康 committed Jan 22, 2021
  
  67749415 Browse Files
- 去掉默认值 · dab0d8e5
  徐康 committed Jan 22, 2021
  
  dab0d8e5 Browse Files
21 Jan, 2021 8 commits
- 升级sdk · 78c4d808
  徐康 committed Jan 21, 2021
  
  78c4d808 Browse Files
- 修改线上问题 · 816c9692
  徐康 committed Jan 21, 2021
  
  816c9692 Browse Files
- Merge branch 'hotfix/20201230_collage_order_paySuccessCallback_fix_miaohui' into 'master' · cb4d0895
```
拼单付款成功更新拼单购物车状态与清除普通购物车逻辑分离

See merge request !109
```
  缪晖 committed Jan 21, 2021
  cb4d0895 Browse Files
- Merge branches 'feature/20210115_围餐渠道修改_wuping' and 'master' of… · 84638e77
```
Merge branches 'feature/20210115_围餐渠道修改_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
```
  ping.wu committed Jan 21, 2021
  84638e77 Browse Files
- 取消订单原因字段长度过长，售后单表售后原因字段限制50 · fa5d6bae
  ping.wu committed Jan 21, 2021
  
  fa5d6bae Browse Files
- Merge remote-tracking branch 'origin/feature/refundFlag-刘鹏飞' · 87c36117
  刘鹏飞 committed Jan 21, 2021
  
  87c36117 Browse Files
- 申请退款文案修改 · 44a6ace0
  刘鹏飞 committed Jan 21, 2021
  
  44a6ace0 Browse Files
- Merge remote-tracking branch 'origin/feature/queryQueueIndexRemove-刘鹏飞' · 72f36d57
  刘鹏飞 committed Jan 21, 2021
  
  72f36d57 Browse Files
20 Jan, 2021 3 commits
- 放开集点代码 · 4285331a
  hanghang.wang committed Jan 20, 2021
  
  4285331a Browse Files
- 取餐排队人数查询代码去除 · 15893d17
  刘鹏飞 committed Jan 20, 2021
  
  15893d17 Browse Files
- Merge branches 'feature/20210115_围餐渠道修改_wuping' and 'master' of… · 086f14a3
```
Merge branches 'feature/20210115_围餐渠道修改_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
```
  ping.wu committed Jan 20, 2021
  086f14a3 Browse Files
19 Jan, 2021 11 commits
- Merge branch 'feature/20210107_蜜雪新增APP购买虚拟商品（券）业务_wanghanghang' · 67c6b360
  hanghang.wang committed Jan 19, 2021
  
  67c6b360 Browse Files
- APP卖券还是平台，依旧保留传入bizTyp = 6 · e236485c
  hanghang.wang committed Jan 19, 2021
  
  e236485c Browse Files
- Merge branch 'feature/20210107_蜜雪新增APP购买虚拟商品（券）业务_wanghanghang' · 0fa94370
  hanghang.wang committed Jan 19, 2021
  
  0fa94370 Browse Files
- APP卖券还是平台，依旧保留传入bizTyp = 6 · e8e58497
  hanghang.wang committed Jan 19, 2021
  
  e8e58497 Browse Files
- 【优化】【小程序】顾客申请退款提交时，判断当前的订单状态，是否允许申请退款 · dd537662
  刘鹏飞 committed Jan 19, 2021
  
  dd537662 Browse Files
- 修改ordercenter-sdk版本 · ffcbe657
  hanghang.wang committed Jan 19, 2021
  
  ffcbe657 Browse Files
- 修改ordercenter-sdk版本 · 92b38cb9
  hanghang.wang committed Jan 19, 2021
  
  92b38cb9 Browse Files
- 蜜雪新增extinfo打包SDK · 44dfb33b
  hanghang.wang committed Jan 19, 2021
  
  44dfb33b Browse Files
- Merge branch 'feature/20210107_蜜雪新增APP购买虚拟商品（券）业务_wanghanghang' · 55de9f2c
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	order-application-service/pom.xml
```
  hanghang.wang committed Jan 19, 2021
  55de9f2c Browse Files
- 升级sdk · b919f9bf
  xiaoer.li@freemud.com committed Jan 19, 2021
  
  b919f9bf Browse Files
- Merge remote-tracking branch 'origin/feature/2.1.15-三方编码' · 3eca0fa1
  xiaoer.li@freemud.com committed Jan 19, 2021
  
  3eca0fa1 Browse Files
18 Jan, 2021 3 commits
- Merge remote-tracking branch 'origin/feature/3month-刘鹏飞' · 85c91ee7
  刘鹏飞 committed Jan 18, 2021
  
  85c91ee7 Browse Files
- es查询新老兼容 · f563596e
  刘鹏飞 committed Jan 18, 2021
  
  f563596e Browse Files
- es查询新老兼容 · 9ea45182
  刘鹏飞 committed Jan 18, 2021
  
  9ea45182 Browse Files
15 Jan, 2021 4 commits
- 订单列表查询es · 54411bf8
  刘鹏飞 committed Jan 15, 2021
  
  54411bf8 Browse Files
- 蜜雪新增extinfo · 2b453f1d
  hanghang.wang committed Jan 15, 2021
  
  2b453f1d Browse Files
- 支付成功围餐渠道判断修改 · 50ba287c
  ping.wu committed Jan 15, 2021
  
  50ba287c Browse Files
- 蜜雪业务新增extinfo · 80135e3c
  hanghang.wang committed Jan 15, 2021
  
  80135e3c Browse Files
14 Jan, 2021 5 commits
- fixbug NullPoint · 1efaf2d4
  xiaoer.li committed Jan 15, 2021
  
  1efaf2d4 Browse Files
- fixbug NullPoint · a781f6d2
  xiaoer.li committed Jan 15, 2021
  
  a781f6d2 Browse Files
- sdk更新 · c86ae4a2
  徐康 committed Jan 14, 2021
  
  c86ae4a2 Browse Files
- Merge branch 'feature/20201229_xukang_麦咖啡p5v1' · 0789c9d4
```
# Conflicts:
#	order-application-service/pom.xml
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
#	order-application-service/src/test/java/cn/freemud/service/impl/MallOrderServiceImplTest.java
```
  徐康 committed Jan 14, 2021
  0789c9d4 Browse Files
- 订单、订单详情查询使用es · 8158e367
  刘鹏飞 committed Jan 14, 2021
  
  8158e367 Browse Files
13 Jan, 2021 1 commit
- 删除costdetail生成的商品 · 0483bbd7
  徐康 committed Jan 13, 2021
  
  0483bbd7 Browse Files
12 Jan, 2021 2 commits
- Merge branch 'feature/20201223_posConfirmTakeKoubeiwaimai_miaohui' · 05c82cf9
```
# Conflicts:
#	order-management/src/main/java/cn/freemud/management/enums/OrderSource.java
#	order-management/src/main/java/cn/freemud/management/service/adapter/OrderBeanFactory.java
```
  缪晖 committed Jan 12, 2021
  05c82cf9 Browse Files
- 修复问题 · b11c426b
  徐康 committed Jan 12, 2021
  
  b11c426b Browse Files