Commits · f87042e43d8531b52d6a5624947ee5af7b9f2600 · order-group-application / order-group

01 Mar, 2021 2 commits
- 餐道合商品 · f87042e4
  徐康 committed Mar 01, 2021
  
  f87042e4 Browse Files
- 合并商品 · 3dcabfaa
  徐康 committed Mar 01, 2021
  
  3dcabfaa Browse Files
26 Feb, 2021 4 commits
- 修改问题 · 24468b70
  徐康 committed Feb 26, 2021
  
  24468b70 Browse Files
- Merge remote-tracking branch 'origin/feature/20210127_xukang_麦咖啡p5v4' into… · f418b95f
```
Merge remote-tracking branch 'origin/feature/20210127_xukang_麦咖啡p5v4' into feature/20210127_xukang_麦咖啡p5v4

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/MCCafeOrderServiceImpl.java
```
  徐康 committed Feb 26, 2021
  f418b95f Browse Files
- 修改问题 · 9e1dd327
  徐康 committed Feb 26, 2021
  
  9e1dd327 Browse Files
- 修复问题 · eb632fbc
  徐康 committed Feb 26, 2021
  
  eb632fbc Browse Files
25 Feb, 2021 4 commits
- 修复问题 · b013c46b
  徐康 committed Feb 25, 2021
  
  b013c46b Browse Files
- 购物车拆行 · 321c859c
  徐康 committed Feb 25, 2021
  
  321c859c Browse Files
- 修复问题 · c9abd336
  徐康 committed Feb 25, 2021
  
  c9abd336 Browse Files
- 修复问题 · b1718f0d
  徐康 committed Feb 25, 2021
  
  b1718f0d Browse Files
24 Feb, 2021 3 commits
- 购物车问题修改 · bb0db8df
  徐康 committed Feb 24, 2021
  
  bb0db8df Browse Files
- 修复问题 · 3c369517
  徐康 committed Feb 24, 2021
  
  3c369517 Browse Files
- 修复问题 · 8116120e
  徐康 committed Feb 24, 2021
  
  8116120e Browse Files
22 Feb, 2021 1 commit
- 修改支付skuid · c51cbe48
  徐康 committed Feb 22, 2021
  
  c51cbe48 Browse Files
18 Feb, 2021 1 commit
- 开发票 · b672ae5d
  徐康 committed Feb 18, 2021
  
  b672ae5d Browse Files
26 Jan, 2021 5 commits
- 升级sdk · d44a1ba8
  徐康 committed Jan 26, 2021
  
  d44a1ba8 Browse Files
- 升级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 5 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