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

23 Jun, 2022 1 commit
- Merge branch 'KA-消费黑名单订单限制-20220527' · e1acc3f3
  周晓航 committed Jun 23, 2022
  
  e1acc3f3 Browse Files
22 Jun, 2022 2 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
21 Jun, 2022 8 commits
- 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
- 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 3 commits
- Merge branch '紧急优化codev4接口-20220614' into 'master' · f10d0997
```
购物车优化 codev4调用传递商品id

See merge request !143
```
  缪晖 committed Jun 14, 2022
  f10d0997 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 7 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
- 微商城订单处理因为没有appid不上报 · 7090e259
  胡敬轩 committed Jun 13, 2022
  
  7090e259 Browse Files
- Merge branches 'feature/20220524_新商城_wuping' and 'master' of… · 8b57fa97
```
Merge branches 'feature/20220524_新商城_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
```
  ping.wu committed Jun 13, 2022
  8b57fa97 Browse Files
- 服务端处理购物车商品删除返回前端数据不一致情况 · e60f6782
  周晓航 committed Jun 13, 2022
  
  e60f6782 Browse Files
10 Jun, 2022 7 commits
- 商城混合支付退款 · 6d85cea6
  ping.wu committed Jun 10, 2022
  
  6d85cea6 Browse Files
- 测试返回true 前端是否会重新请求 · 81642811
  周晓航 committed Jun 10, 2022
  
  81642811 Browse Files
- 退款失败处理 · 1fdde2ea
  ping.wu committed Jun 10, 2022
  
  1fdde2ea Browse Files
- 三方流水号赋值错误 · 6a5971fe
  胡敬轩 committed Jun 10, 2022
  
  6a5971fe Browse Files
- 【华莱士】需求查看过去三个月的订单 · a84e09cc
  周晓航 committed Jun 10, 2022
  
  a84e09cc Browse Files
- 【华莱士】需求查看过去三个月的订单 · 220288db
  周晓航 committed Jun 10, 2022
  
  220288db Browse Files
- 爱马哥低碳活动活动结束即可删除此代码 · 93794d7c
  胡敬轩 committed Jun 10, 2022
  
  93794d7c Browse Files
09 Jun, 2022 4 commits
- 【华莱士】需求查看过去三个月的订单 · b5372d17
  周晓航 committed Jun 09, 2022
  
  b5372d17 Browse Files
- Merge branches 'feature/20220524_新商城_wuping' and 'master' of… · 447d6b92
```
Merge branches 'feature/20220524_新商城_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
```
  ping.wu committed Jun 09, 2022
  447d6b92 Browse Files
- 爱马哥低碳活动活动结束即可删除此代码 · a1f4e4da
  胡敬轩 committed Jun 09, 2022
  
  a1f4e4da Browse Files
- 爱马哥低碳活动活动结束即可删除此代码 · a9834867
  胡敬轩 committed Jun 09, 2022
  
  a9834867 Browse Files
08 Jun, 2022 3 commits
- Merge branches 'feature/20220606_支付退款状态码_wuping' and 'master' of… · e94c8266
```
Merge branches 'feature/20220606_支付退款状态码_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
```
  ping.wu committed Jun 08, 2022
  e94c8266 Browse Files
- 隐藏重复调用代码, · b385590c
  周晓航 committed Jun 08, 2022
  
  b385590c Browse Files
- 新版saas商城同意退款校验 · ef352fce
  ping.wu committed Jun 08, 2022
  
  ef352fce Browse Files