Commits · 398aae8d0cf9eeba7e6675b43bf03a1e8e9dec2a · order-group-application / order-group · GitLab

26 Jan, 2021 4 commits
- 升级sdk · 398aae8d
  徐康 committed Jan 26, 2021
  
  398aae8d Browse Files
- Merge branch 'feature/20200108_xukang_麦咖啡p5v2' · eef77e2a
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/CreateOrderProductRequest.java
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/OrderProductAddInfoDto.java
#	order-application-service/pom.xml
```
  徐康 committed Jan 26, 2021
  eef77e2a Browse Files
- assortment-ordercenter-sdk升级版本到2.1.25-RELEASE · 93b3ff76
  刘鹏飞 committed Jan 26, 2021
  
  93b3ff76 Browse Files
- Merge remote-tracking branch 'origin/feature/getAndJoin-刘鹏飞' · 54d93d92
  刘鹏飞 committed Jan 26, 2021
  
  54d93d92 Browse Files
25 Jan, 2021 3 commits
- 退款校验发的券是否被使用过 · f8ac643b
  徐康 committed Jan 25, 2021
  
  f8ac643b Browse Files
- 修复问题 · 93f04adb
  徐康 committed Jan 25, 2021
  
  93f04adb Browse Files
- 删除发券日志 · f9a2082b
  徐康 committed Jan 25, 2021
  
  f9a2082b Browse Files
22 Jan, 2021 4 commits
- 优惠券使用校验 · d7c4b7dc
  徐康 committed Jan 22, 2021
  
  d7c4b7dc Browse Files
- 修复问题 · 2ad3fc97
  徐康 committed Jan 22, 2021
  
  2ad3fc97 Browse Files
- 升级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 8 commits
- 放开集点代码 · 4285331a
  hanghang.wang committed Jan 20, 2021
  
  4285331a Browse Files
- 更新优惠问题 · 0cd94794
  徐康 committed Jan 20, 2021
  
  0cd94794 Browse Files
- 修复更新优惠问题 · def49998
  徐康 committed Jan 20, 2021
  
  def49998 Browse Files
- 修复代码问题 · f68b6578
  徐康 committed Jan 20, 2021
  
  f68b6578 Browse Files
- 修复问题 · f201589a
  徐康 committed Jan 20, 2021
  
  f201589a Browse Files
- 修改问题 · e65f5c93
  徐康 committed Jan 20, 2021
  
  e65f5c93 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 13 commits
- Merge remote-tracking branch 'origin/feature/20200108_xukang_麦咖啡p5v2' into… · 75b15827
```
Merge remote-tracking branch 'origin/feature/20200108_xukang_麦咖啡p5v2' into feature/20200108_xukang_麦咖啡p5v2
```
  徐康 committed Jan 19, 2021
  75b15827 Browse Files
- 种子券号免校验 · 755d48bc
  徐康 committed Jan 19, 2021
  
  755d48bc Browse Files
- 修改问题 · ac8cd7ae
  徐康 committed Jan 19, 2021
  
  ac8cd7ae Browse Files
- 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
- 验证发的券的有效性 · b90beb08
  徐康 committed Jan 19, 2021
  
  b90beb08 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