Commits · d003c4d80bcb27afed2e073efeefcf76ee920792 · order-group-application / order-group

22 Jul, 2021 1 commit
- 订单信息修改也推送mq · d003c4d8
  ping.wu committed Jul 22, 2021
  
  d003c4d8 Browse Files
16 Jul, 2021 1 commit
- 代码调整，删除无用代码 · 33bb191b
  ping.wu committed Jul 16, 2021
  
  33bb191b Browse Files
14 Jul, 2021 1 commit
- 支付宝订单推送调试修改 · d90d4169
  ping.wu committed Jul 14, 2021
  
  d90d4169 Browse Files
12 Jul, 2021 1 commit
- 支付宝订单状态变更上报 · 578902ad
  ping.wu committed Jul 12, 2021
  
  578902ad Browse Files
10 Jul, 2021 5 commits
- Merge branch 'hotfix/20210711_ordercentersdk_scope_miaohui' into 'master' · 3e6d6b40
```
rollback

See merge request !125
```
  缪晖 committed Jul 10, 2021
  3e6d6b40 Browse Files
- rollback · 5669215f
  缪晖 committed Jul 10, 2021
  
  5669215f Browse Files
- 订单聚合SDK版本升级只2.1.83，对订单基础SDK引用添加scope · 2bfd73b5
  缪晖 committed Jul 10, 2021
  
  2bfd73b5 Browse Files
- Merge branch 'hotfix/20210711_ordercentersdk_scope_miaohui' into 'master' · 5614acc7
```
订单基础SDK添加scope为provided，各服务需自行引入

See merge request !124
```
  缪晖 committed Jul 10, 2021
  5614acc7 Browse Files
- 订单基础SDK添加scope为provided，各服务需自行引入 · d681915c
  缪晖 committed Jul 10, 2021
  
  d681915c Browse Files
09 Jul, 2021 3 commits
- 加价购问题发布 · 55593257
  zhiheng.zhang committed Jul 09, 2021
  
  55593257 Browse Files
- sdk 升级 · 5438af80
  zhiheng.zhang committed Jul 09, 2021
  
  5438af80 Browse Files
- 修改 bug · 328e4148
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Jul 09, 2021
  328e4148 Browse Files
08 Jul, 2021 14 commits
- 修改 bug · dff7e16c
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Jul 08, 2021
  dff7e16c Browse Files
- 修改 bug · 9a1e9745
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Jul 08, 2021
  9a1e9745 Browse Files
- 修改 bug · ac9b3966
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Jul 08, 2021
  ac9b3966 Browse Files
- Merge branch '20210702-日志规范-lxx' · 7307f2d9
  李学兴 committed Jul 08, 2021
  
  7307f2d9 Browse Files
- opt@20210702-日志规范-lxx:#logback.xml · f894cc3c
  李学兴 committed Jul 08, 2021
  
  f894cc3c Browse Files
- Merge branch 'feature/20210609-v2.0.34-购物车支持配送券ID1030707-周晓航' · 8449e707
  周晓航 committed Jul 08, 2021
  
  8449e707 Browse Files
- 重新校验一遍参数 · 46cb98b9
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Jul 08, 2021
  46cb98b9 Browse Files
- Merge branches 'feature/20210624_购买虚拟商品校验是否在菜单_wuping' and 'master' of… · 75972eee
```
Merge branches 'feature/20210624_购买虚拟商品校验是否在菜单_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
```
  ping.wu committed Jul 08, 2021
  75972eee Browse Files
- 打印耗时 · 36ebad8e
  ping.wu committed Jul 08, 2021
  
  36ebad8e Browse Files
- Merge branches 'feature/20210624_购买虚拟商品校验是否在菜单_wuping' and 'master' of… · 1af74b5c
```
Merge branches 'feature/20210624_购买虚拟商品校验是否在菜单_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
```
  ping.wu committed Jul 08, 2021
  1af74b5c Browse Files
- 可能为空判断 · 9c7ef681
  ping.wu committed Jul 08, 2021
  
  9c7ef681 Browse Files
- Merge branch 'feature/20210609-v2.0.34-购物车支持配送券ID1030707-周晓航' · 9466a9c0
  周晓航 committed Jul 08, 2021
  
  9466a9c0 Browse Files
- opt@20210702-日志规范-lxx:#master 合入编译失败处理 · b97e59e0
  李学兴 committed Jul 08, 2021
  
  b97e59e0 Browse Files
- Merge branch 'master' into 20210702-日志规范-lxx · c3447b89
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
#	order-application-service/src/main/java/cn/freemud/service/thirdparty/ActivityApplicationClient.java
```
  李学兴 committed Jul 08, 2021
  c3447b89 Browse Files
07 Jul, 2021 10 commits
- 重新校验一遍参数 · a921eeab
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Jul 07, 2021
  a921eeab Browse Files
- Merge branches 'feature/20210624_购买虚拟商品校验是否在菜单_wuping' and 'master' of… · 236f2051
```
Merge branches 'feature/20210624_购买虚拟商品校验是否在菜单_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
```
  ping.wu committed Jul 07, 2021
  236f2051 Browse Files
- Merge branch 'KA-20210617评价有礼ID1031153-周晓航' · c6dc0449
  周晓航 committed Jul 07, 2021
  
  c6dc0449 Browse Files
- 字段属性赋值 · b4ad3cc4
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Jul 07, 2021
  b4ad3cc4 Browse Files
- Merge branch 'master' of gitlab.freemud.com:order-group-application/order-group · cc0e4a3d
  周晓航 committed Jul 07, 2021
  
  cc0e4a3d Browse Files
- 修改 pom里面 assortment-data-manager 的版本为最新 5.5.16.reseale · 0a899b25
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Jul 07, 2021
  0a899b25 Browse Files
- Merge branches 'feature/20210707_wuping' and 'master' of… · e71f74bc
```
Merge branches 'feature/20210707_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
```
  ping.wu committed Jul 07, 2021
  e71f74bc Browse Files
- 去除打印日志 · 592ab7ee
  ping.wu committed Jul 07, 2021
  
  592ab7ee Browse Files
- Merge branch 'KA-20210617评价有礼ID1031153-周晓航' · 5a7c5e71
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/thirdparty/ActivityApplicationClient.java
```
  周晓航 committed Jul 07, 2021
  5a7c5e71 Browse Files
- LogIgnore换ApiAnnotation注解 · 73c7ee60
  ping.wu committed Jul 07, 2021
  
  73c7ee60 Browse Files
06 Jul, 2021 4 commits
- 增加消耗时间 · 4fd3538c
  胡博文 committed Jul 07, 2021
  
  4fd3538c Browse Files
- 打印日志 · 965f3d1f
  ping.wu committed Jul 07, 2021
  
  965f3d1f Browse Files
- 蜜雪APP取消订单重复，取消支付准确提示 · af9af288
  ping.wu committed Jul 06, 2021
  
  af9af288 Browse Files
- 调用取消支付接口查询支付状态，关闭预支付订单 · 5b14488d
  ping.wu committed Jul 06, 2021
  
  5b14488d Browse Files