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

11 Nov, 2020 5 commits
- Merge branch 'feature/2.0.5【ID1018638】【C端服务端】活动库存接口调整对接-sdk版本打包' into 'master' · fdac3748
```
master分支sdk版本升级

See merge request !9
```
  缪晖 committed Nov 11, 2020
  fdac3748 Browse Files
- master分支sdk版本升级 · 2b4c4047
  缪晖 committed Nov 11, 2020
  
  2b4c4047 Browse Files
- Merge branch 'feature/2.0.5【ID1018638】【C端服务端】活动库存接口调整对接' into 'master' · 8a2c3f68
```
Feature/2.0.5【id1018638】【c端服务端】活动库存接口调整对接

See merge request !8
```
  缪晖 committed Nov 11, 2020
  8a2c3f68 Browse Files
- 预发布环境活动sdk版本升级至2.7.RELEASE · 3f38b0e7
  缪晖 committed Nov 11, 2020
  
  3f38b0e7 Browse Files
- Merge remote-tracking branch 'remotes/origin/20201026-queryRefundCount-刘鹏飞' into master · 7dd68d5b
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java
#	ordercenter-sdk/pom.xml
```
  刘鹏飞 committed Nov 11, 2020
  7dd68d5b Browse Files
10 Nov, 2020 6 commits
- 主动清除的逻辑先去掉，测试 · 7886003b
  刘鹏飞 committed Nov 10, 2020
  
  7886003b Browse Files
- 增加错误信息日志 · d2ff39e5
  刘鹏飞 committed Nov 10, 2020
  
  d2ff39e5 Browse Files
- 升级assortment-ordercenter-sdk版本为2.1.3-SNAPSHOT · 2c58fee5
  刘鹏飞 committed Nov 10, 2020
  
  2c58fee5 Browse Files
- 升级assortment-ordercenter-sdk版本号2.1.3-SNAPSHOT · de3d5cba
  刘鹏飞 committed Nov 10, 2020
  
  de3d5cba Browse Files
- 下单锁定的key设置默认时间 · d6f6a270
  刘鹏飞 committed Nov 10, 2020
  
  d6f6a270 Browse Files
- 创建订单添加redis锁，防止重复创建订单 · fdb9daa6
  刘鹏飞 committed Nov 10, 2020
  
  fdb9daa6 Browse Files
09 Nov, 2020 15 commits
- 记录骑手电话和姓名 · 59a95283
  徐康 committed Nov 10, 2020
  
  59a95283 Browse Files
- Merge branch 'feature/20201013_麦咖啡p4v1问题修复_xukangg' · 446bf581
  徐康 committed Nov 10, 2020
  
  446bf581 Browse Files
- 失败保存为remark · eea14aa7
  徐康 committed Nov 10, 2020
  
  eea14aa7 Browse Files
- sunyu::update::update assortment-shoppingcart-sdk · 70c9b307
  孙昱 committed Nov 09, 2020
  
  70c9b307 Browse Files
- sunyu::update::update for shopping-cart-sdk version · 15a9def0
  孙昱 committed Nov 09, 2020
  
  15a9def0 Browse Files
- Merge branch 'master' of gitlab.freemud.com:order-group-application/order-group · c7f58676
  孙昱 committed Nov 09, 2020
  
  c7f58676 Browse Files
- Merge remote-tracking branch 'origin/feature-yu.sun-checkCartInfoAboutCoupon-20201105' · a77cc8ac
  孙昱 committed Nov 09, 2020
  
  a77cc8ac Browse Files
- 升级sdk · 1336ba9a
  徐康 committed Nov 09, 2020
  
  1336ba9a Browse Files
- Merge branch 'feature/20201013_麦咖啡p4v1问题修复_xukangg' · 2cd5aba6
  徐康 committed Nov 09, 2020
  
  2cd5aba6 Browse Files
- 入机失败保存到remark · a77b5a85
  徐康 committed Nov 09, 2020
  
  a77b5a85 Browse Files
- 入机失败保存到remark · e5de7dbd
  徐康 committed Nov 09, 2020
  
  e5de7dbd Browse Files
- Merge branch '2020/11/2-商品券bug-huiyang' · aae2686d
  huiyang.chen committed Nov 09, 2020
  
  aae2686d Browse Files
- 入机失败原因 · b6213201
  徐康 committed Nov 09, 2020
  
  b6213201 Browse Files
- 入机失败原因 · 130a6402
  徐康 committed Nov 09, 2020
  
  130a6402 Browse Files
- fix 商品券,相同商品的处理 · 4f826835
  huiyang.chen committed Nov 09, 2020
  
  4f826835 Browse Files
06 Nov, 2020 5 commits
- sunyu::update::fix bug about couponDisable · 0901ab4b
  yu.sun committed Nov 06, 2020
  
  0901ab4b Browse Files
- fix 商品券规格信息 · c65bdbde
  huiyang.chen committed Nov 06, 2020
  
  c65bdbde Browse Files
- sunyu::update::fix bug about getCouponNameByCode · 289b24c2
  yu.sun committed Nov 06, 2020
  
  289b24c2 Browse Files
- sunyu::update::fix bug about getCouponNameByCode · cc5a6da1
  yu.sun committed Nov 06, 2020
  
  cc5a6da1 Browse Files
- sunyu::update::update about query couponName by coupnCode save to redis · d5c32ce8
  yu.sun committed Nov 06, 2020
  
  d5c32ce8 Browse Files
05 Nov, 2020 3 commits
- 券校验 · 819e070a
  徐康 committed Nov 05, 2020
  
  819e070a Browse Files
- sunyu::update::update assortment-shoppingcart-sdk · 3c091dcb
  yu.sun committed Nov 05, 2020
  
  3c091dcb Browse Files
- sunyu::update::checkout cartInfo about coupon disable · 3bb6eb3f
  yu.sun committed Nov 05, 2020
  
  3bb6eb3f Browse Files
04 Nov, 2020 3 commits
- 设置订单完成时间 · d471b8b9
  徐康 committed Nov 04, 2020
  
  d471b8b9 Browse Files
- 麦咖啡自提预约单提前五分钟提醒入机 · 3d060c67
  徐康 committed Nov 04, 2020
  
  3d060c67 Browse Files
- 麦咖啡自提预约单提前五分钟提醒入机 · 5060d916
  徐康 committed Nov 04, 2020
  
  5060d916 Browse Files
03 Nov, 2020 3 commits
- assortment-ordercenter-sdk修改版本号为2.0.17-RELEASE · c9fac5bb
  刘鹏飞 committed Nov 03, 2020
  
  c9fac5bb Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/20201022-refundReform-刘鹏飞' into master · b903b8df
  刘鹏飞 committed Nov 03, 2020
  
  b903b8df Browse Files
- 订单退款时间增加当天时间判断，assortment-ordercenter-sdk修改版本号为2.0.16-RELEASE · 7c89847e
  刘鹏飞 committed Nov 03, 2020
  
  7c89847e Browse Files