Commits · 9211c110ffee126a3253b425a30abab58bedf7fe · order-group-application / order-group · GitLab

05 Jul, 2022 1 commit
- Merge branches 'feature/20220621_门店小助手退款处理_wuping' and 'master' of… · 9211c110
```
Merge branches 'feature/20220621_门店小助手退款处理_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
```
  ping.wu committed Jul 05, 2022
  9211c110 Browse Files
04 Jul, 2022 1 commit
- 赠品均摊修复 · 8c047f47
  查志伟 committed Jul 04, 2022
  
  8c047f47 Browse Files
28 Jun, 2022 1 commit
- 修复生产问题,余额不足的情况,导致订单走了后续流程,因为上次订单退款优化出的问题 · 7d3d3d7a
  周晓航 committed Jun 28, 2022
  
  7d3d3d7a Browse Files
27 Jun, 2022 1 commit
- 优化线上 NoSuchElementException邮件告警 · 656dd94d
  周晓航 committed Jun 27, 2022
  
  656dd94d Browse Files
24 Jun, 2022 1 commit
- 移除无效日志 · 677bea2b
  周晓航 committed Jun 24, 2022
  
  677bea2b Browse Files
23 Jun, 2022 4 commits
- Merge branch 'KA-新增同意退款回调逻辑处理' · 13ab2812
  周晓航 committed Jun 23, 2022
  
  13ab2812 Browse Files
- 拦截卖券订单不走支付回调补偿 · d76e8f43
  周晓航 committed Jun 23, 2022
  
  d76e8f43 Browse Files
- Merge branch 'KA-新增同意退款回调逻辑处理' · eb526c7f
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderAdapterServiceImpl.java
#	order-management/src/main/java/cn/freemud/management/service/adapter/OrderManagerAdapter.java
```
  周晓航 committed Jun 23, 2022
  eb526c7f Browse Files
- Merge branch 'KA-消费黑名单订单限制-20220527' · e1acc3f3
  周晓航 committed Jun 23, 2022
  
  e1acc3f3 Browse Files
22 Jun, 2022 8 commits
- Merge remote-tracking branch 'remotes/origin/feature/Ka3.0.4.1-0613-0620-爱马哥低碳活动' · 0067cb91
  胡敬轩 committed Jun 22, 2022
  
  0067cb91 Browse Files
- 低碳活动用户未报名活动的过滤掉 · f44c4045
  胡敬轩 committed Jun 22, 2022
  
  f44c4045 Browse Files
- 多卡支付混合支付接口新增参数 · 0cbcafd0
  ping.wu committed Jun 22, 2022
  
  0cbcafd0 Browse Files
- 处理退款支付异常的情况, 订单流程不往下走 · 36206fe2
  周晓航 committed Jun 22, 2022
  
  36206fe2 Browse Files
- 处理退款支付异常的情况, 订单流程不往下走 · 8e59b094
  周晓航 committed Jun 22, 2022
  
  8e59b094 Browse Files
- final.拦截退款失败,逻辑不往下走 · c0ebacdf
  周晓航 committed Jun 22, 2022
  
  c0ebacdf Browse Files
- final.拦截退款失败,逻辑不往下走 · 4c8ad19e
  周晓航 committed Jun 22, 2022
  
  4c8ad19e Browse Files
- 按照原有逻辑,无需拦截 · 9fffb199
  周晓航 committed Jun 22, 2022
  
  9fffb199 Browse Files
21 Jun, 2022 10 commits
- 退款失败不应该走冲正逻辑 · 3a05bff8
  周晓航 committed Jun 21, 2022
  
  3a05bff8 Browse Files
- Merge branch '【【华莱士】需求查看过去三个月的订单】' · 60d439c7
  周晓航 committed Jun 21, 2022
  
  60d439c7 Browse Files
- Merge branch 'KA-测试购物车list不重复调用' · e899b26c
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/CalculationCommonService.java
```
  周晓航 committed Jun 21, 2022
  e899b26c Browse Files
- 老算价,购物车优化修改 · c1238b6a
  周晓航 committed Jun 21, 2022
  
  c1238b6a Browse Files
- 新增参数用与非码付 · a6b57807
  ping.wu committed Jun 21, 2022
  
  a6b57807 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/Ka3.0.4.1-0613-0620-爱马哥低碳活动' · a3936c46
  胡敬轩 committed Jun 21, 2022
  
  a3936c46 Browse Files
- 低碳活动用户未报名活动的过滤掉 · a17f93ee
  胡敬轩 committed Jun 21, 2022
  
  a17f93ee Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/Ka3.0.4.1-0613-0620-爱马哥低碳活动' · dc1bc087
  胡敬轩 committed Jun 21, 2022
  
  dc1bc087 Browse Files
- 低碳活动用户未报名活动的过滤掉 · fb159c4d
  胡敬轩 committed Jun 21, 2022
  
  fb159c4d Browse Files
- Merge branch 'feature/套餐无固搭均摊' · b978b247
  查志伟 committed Jun 21, 2022
  
  b978b247 Browse Files
20 Jun, 2022 2 commits
- 暂时不修改 · 0c9b155f
  周晓航 committed Jun 20, 2022
  
  0c9b155f Browse Files
- 修复历史问题,购物车构建券列表数据修改 · 6b1bf2f8
  周晓航 committed Jun 20, 2022
  
  6b1bf2f8 Browse Files
17 Jun, 2022 3 commits
- Merge branch 'bugfix-门店未配置业务导致订单NPE' into 'master' · 191e66c3
```
Bugfix 门店未配置业务导致订单npe

See merge request !144
```
  缪晖 committed Jun 17, 2022
  191e66c3 Browse Files
- 修复生产bug-> 门店未有任何配置导致购物车计算配送费NPE · 364f9431
  周晓航 committed Jun 17, 2022
  
  364f9431 Browse Files
- 修复生产bug-> 门店未有任何配置导致购物车计算配送费NPE · e1601f3c
  周晓航 committed Jun 17, 2022
  
  e1601f3c Browse Files
14 Jun, 2022 4 commits
- Merge branch '紧急优化codev4接口-20220614' into 'master' · f10d0997
```
购物车优化 codev4调用传递商品id

See merge request !143
```
  缪晖 committed Jun 14, 2022
  f10d0997 Browse Files
- 拦截重复点击 · bfd25c88
  周晓航 committed Jun 14, 2022
  
  bfd25c88 Browse Files
- 购物车优化 codev4调用传递商品id · a35c7e29
  周晓航 committed Jun 14, 2022
  
  a35c7e29 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/Ka3.0.4.1-0613-0620-爱马哥低碳活动' · 9ed1ba15
  胡敬轩 committed Jun 14, 2022
  
  9ed1ba15 Browse Files
13 Jun, 2022 4 commits
- 修复购物车不能带券加车的问题 · 8b2c3915
  查志伟 committed Jun 14, 2022
  
  8b2c3915 Browse Files
- 优化NPE · 85ba6314
  周晓航 committed Jun 13, 2022
  
  85ba6314 Browse Files
- 购物车下单无效商品问题修复 · aab02add
  查志伟 committed Jun 13, 2022
  
  aab02add Browse Files
- 套餐无固搭购物车均摊优惠支持 · ba65bb08
  查志伟 committed Jun 13, 2022
  
  ba65bb08 Browse Files