Commits · 7fdbd64efaac5516c7003cd2cb686f13189f7e41 · yimu / mall-server

09 Mar, 2022 5 commits
- Merge branch 'test' of https://gitlab.33.cn/yimu/mall-server into dev · 7fdbd64e
  wlx@33.cn authored Mar 09, 2022
  
  7fdbd64e
- 转赠记录排序 · 55c091d9
  wlx@33.cn authored Mar 09, 2022
  
  55c091d9
- Merge branch 'dev' into 'test' · b96d7cec
  wulixian authored Mar 09, 2022
```
修正转赠

See merge request !12
```
  b96d7cec
- Merge branch 'test' of https://gitlab.33.cn/yimu/mall-server into dev · 5b720e37
  wlx@33.cn authored Mar 09, 2022
  
  5b720e37
- 修正转赠 · 639ea0d9
  wlx@33.cn authored Mar 09, 2022
  
  639ea0d9
08 Mar, 2022 27 commits
- Merge branch 'dev' into 'test' · 7b9822e5
  wulixian authored Mar 08, 2022
```
修正转赠

See merge request !11
```
  7b9822e5
- Merge branch 'test' of https://gitlab.33.cn/yimu/mall-server into dev · 217d5f4b
  wlx@33.cn authored Mar 08, 2022
  
  217d5f4b
- 修正转赠 · 110dba6d
  wlx@33.cn authored Mar 08, 2022
  
  110dba6d
- Merge branch 'dev' into 'test' · 8da64938
  wulixian authored Mar 08, 2022
```
去掉异常继承

See merge request !10
```
  8da64938
- Merge branch 'test' of https://gitlab.33.cn/yimu/mall-server into dev · 7012f863
  wlx@33.cn authored Mar 08, 2022
  
  7012f863
- Merge branch 'dev' of https://gitlab.33.cn/yimu/mall-server into dev · e0813902
  wlx@33.cn authored Mar 08, 2022
  
  e0813902
- 去掉异常继承 · bca5d67d
  wlx@33.cn authored Mar 08, 2022
  
  bca5d67d
- Merge branch 'dev' into 'test' · 5306e759
  wangpeng authored Mar 08, 2022
```
修改店铺名称不一致问题

See merge request !9
```
  5306e759
- Merge branch 'test' of https://gitlab.33.cn/yimu/mall-server into dev · 9e1cfafd
  wp authored Mar 08, 2022
  
  9e1cfafd
- 修改店铺名称不一致问题 · 1a93f272
  wp authored Mar 08, 2022
  
  1a93f272
- Merge branch 'dev' into 'test' · d307d2b4
  wulixian authored Mar 08, 2022
```
积分支付订单时，增加积分使用流水

See merge request !8
```
  d307d2b4
- Merge branch 'test' of https://gitlab.33.cn/yimu/mall-server into dev · a8e5415a
  wlx@33.cn authored Mar 08, 2022
  
  a8e5415a
- 积分支付订单时，增加积分使用流水 · b5966081
  wlx@33.cn authored Mar 08, 2022
  
  b5966081
- Merge branch 'dev' into 'test' · e0484809
  wulixian authored Mar 08, 2022
```
修正目录搜索商品，修正分页

See merge request !7
```
  e0484809
- Merge branch 'test' of https://gitlab.33.cn/yimu/mall-server into dev · 8d609c80
  wlx@33.cn authored Mar 08, 2022
  
  8d609c80
- 修正目录搜索商品，修正分页 · 88a823e4
  wlx@33.cn authored Mar 08, 2022
  
  88a823e4
- Merge branch 'dev' into 'test' · 10c443c1
  wulixian authored Mar 08, 2022
```
订单关闭异常，用日志记录

See merge request !6
```
  10c443c1
- Merge branch 'test' of https://gitlab.33.cn/yimu/mall-server into dev · 42c0f42a
  wlx@33.cn authored Mar 08, 2022
  
  42c0f42a
- 订单关闭异常，用日志记录 · 855762e4
  wlx@33.cn authored Mar 08, 2022
  
  855762e4
- Merge branch 'dev' into 'test' · 914b421a
  wulixian authored Mar 08, 2022
```
修正盲盒成功下单后图片

See merge request !5
```
  914b421a
- 修正盲盒成功下单后图片 · e534b8b5
  wlx@33.cn authored Mar 08, 2022
  
  e534b8b5
- Merge branch 'test' of https://gitlab.33.cn/yimu/mall-server into dev · b653bc4b
  wlx@33.cn authored Mar 08, 2022
  
  b653bc4b
- 修改楼层名称 · 0a7bf87a
  wlx@33.cn authored Mar 08, 2022
  
  0a7bf87a
- Merge branch 'dev' into 'test' · 450be993
  wulixian authored Mar 08, 2022
```
修正取消订单接口多次触发，修正用户资产记录状态枚举魔鬼数字

See merge request !4
```
  450be993
- Merge branch 'test' of https://gitlab.33.cn/yimu/mall-server into dev · f463b94f
  wlx@33.cn authored Mar 08, 2022
  
  f463b94f
- Merge branch 'dev' of https://gitlab.33.cn/yimu/mall-server into dev · d769a736
  wlx@33.cn authored Mar 08, 2022
  
  d769a736
- 修正取消订单接口多次触发，修正用户资产记录状态枚举魔鬼数字 · 5306c8ba
  wlx@33.cn authored Mar 08, 2022
  
  5306c8ba
07 Mar, 2022 6 commits
- Merge branch 'dev' into 'test' · 2f0e41b2
  wangpeng authored Mar 07, 2022
```
Dev

See merge request !3
```
  2f0e41b2
- Merge branch 'test' of https://gitlab.33.cn/yimu/mall-server into dev · 9c6b83b6
  wp authored Mar 07, 2022
  
  9c6b83b6
- Merge branch 'dev' of https://gitlab.33.cn/yimu/mall-server into dev · 954792e8
  wp authored Mar 07, 2022
  
  954792e8
- 私服仓库地址更新，盲盒价格更新到sku表original_price字段 · d17b451b
  wp authored Mar 07, 2022
  
  d17b451b
- Merge branch 'dev' into 'test' · ee22b299
  wulixian authored Mar 07, 2022
```
取消支付接口添加幂等性校验。取消支付接口添加更新前置状态校验和更新结果校验

See merge request !2
```
  ee22b299
- 取消支付接口添加幂等性校验。取消支付接口添加更新前置状态校验和更新结果校验 · 58f3ed3d
  wlx@33.cn authored Mar 07, 2022
  
  58f3ed3d
04 Mar, 2022 2 commits
- Merge branch 'master' of https://gitlab.33.cn/yimu/mall-server into dev · 93fef0f8
  wlx@33.cn authored Mar 04, 2022
  
  93fef0f8
- 修正脚本 · 837d009f
  wlx@33.cn authored Mar 04, 2022
  
  837d009f