Commits · 42c0f42aff8f5b237b814d15e24dc91005420dc3 · yimu / mall-server

08 Mar, 2022 10 commits
- 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 3 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
- Merge branch 'dev' into 'master' · 2aaa832d
  wulixian authored Mar 04, 2022
```
v1.0上架盲盒

See merge request !1
```
  2aaa832d
03 Mar, 2022 2 commits
- Merge branch 'dev' of https://gitlab.33.cn/yimu/mall-server into dev · 33249ed0
  wlx@33.cn authored Mar 03, 2022
  
  33249ed0
- 增加盲盒楼层脚本 · 0d332ba2
  wlx@33.cn authored Mar 03, 2022
  
  0d332ba2
02 Mar, 2022 2 commits
- 发布商品bug修复 · 4a1dd47d
  wp authored Mar 02, 2022
  
  4a1dd47d
- 修正脚本 · 1e9628a8
  wlx@33.cn authored Mar 02, 2022
  
  1e9628a8
01 Mar, 2022 9 commits
- Merge branch 'dev' of https://gitlab.33.cn/yimu/mall-server into dev · 0e7b2887
  wlx@33.cn authored Mar 01, 2022
  
  0e7b2887
- 盲盒提测 · dbc97216
  wlx@33.cn authored Mar 01, 2022
  
  dbc97216
- 是否隐藏版详情缺失 · ea702a91
  wp authored Mar 01, 2022
  
  ea702a91
- Merge branch 'dev' of https://gitlab.33.cn/yimu/mall-server into dev · 11c97e9c
  wp authored Mar 01, 2022
```
# Conflicts:
#	mall-sql/mall_create.sql
```
  11c97e9c
- 盲盒商品 · 8e8ae265
  wp authored Mar 01, 2022
  
  8e8ae265
- 商品详情增加规则字段 · 5d59b8e3
  wlx@33.cn authored Mar 01, 2022
  
  5d59b8e3
- 还原test配置 · e311b7b2
  wlx@33.cn authored Mar 01, 2022
  
  e311b7b2
- 提测盲盒 · dd8fc399
  wlx@33.cn authored Mar 01, 2022
  
  dd8fc399
- 提测盲盒 · 272ef148
  wlx@33.cn authored Mar 01, 2022
  
  272ef148
28 Feb, 2022 3 commits
- 修正订单详情 · 87522e40
  wlx@33.cn authored Feb 28, 2022
  
  87522e40
- 修正盲盒下单 · 09cc5714
  wlx@33.cn authored Feb 28, 2022
  
  09cc5714
- 修正订单超卖 · 8bc10a90
  wlx@33.cn authored Feb 28, 2022
  
  8bc10a90
25 Feb, 2022 4 commits
- 优化盲盒下单 · 30c464e3
  wlx@33.cn authored Feb 25, 2022
  
  30c464e3
- 优化盲盒购买 · e6432353
  wlx@33.cn authored Feb 25, 2022
  
  e6432353
- 去掉测试main方法 · 70eaf279
  wlx@33.cn authored Feb 25, 2022
  
  70eaf279
- 提交盲盒下单 · df29a37c
  wlx@33.cn authored Feb 25, 2022
  
  df29a37c
24 Feb, 2022 1 commit
- Merge branch 'dev' of https://gitlab.33.cn/yimu/mall-server into dev · 85856bd9
  wp authored Feb 24, 2022
  
  85856bd9