From d287809367d8277c6fb1cf582434e611b3809455 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 29 Jul 2022 11:42:13 +0800
Subject: [PATCH] 20220727 保存代码
---
src/main/resources/mapper/modules/MallGoodsMapper.xml | 1 +
src/main/java/cc/mrbird/febs/mall/vo/MallGoodsListVo.java | 3 +++
src/main/resources/application-test.yml | 2 --
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 1 +
4 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
index d649eb4..2c4de86 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
@@ -62,6 +62,7 @@
private final MallShopApplyMapper mallShopApplyMapper;
private final MallRegisterAppealMapper mallRegisterAppealMapper;
private final MallTeamLeaderMapper mallTeamLeaderMapper;
+ private final SpringContextHolder springContextHolder;
@Value("${spring.profiles.active}")
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/MallGoodsListVo.java b/src/main/java/cc/mrbird/febs/mall/vo/MallGoodsListVo.java
index bc3d4d4..b0f19a0 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/MallGoodsListVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/MallGoodsListVo.java
@@ -35,6 +35,9 @@
@ApiModelProperty(value = "销量")
private String saleVolume;
+ @ApiModelProperty(value = "库存")
+ private String stock;
+
@ApiModelProperty(value = "积分")
private BigDecimal score;
diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml
index 40afa92..78c9d66 100644
--- a/src/main/resources/application-test.yml
+++ b/src/main/resources/application-test.yml
@@ -61,8 +61,6 @@
xcx:
wechar_login_url: https://api.weixin.qq.com/sns/jscode2session?appid=%s&secret=%s&js_code=%s&grant_type=authorization_code
-# xcx_appid: wx5cc58f796224af61
-# xcx_secret: cab68768a444f9e25bb3d1bc208fb546
xcx_appid: wx5cc58f796224af61
xcx_secret: 71403646f666f9b9dca308d4f357765c
debug: true
diff --git a/src/main/resources/mapper/modules/MallGoodsMapper.xml b/src/main/resources/mapper/modules/MallGoodsMapper.xml
index 66ce2c7..0d125cd 100644
--- a/src/main/resources/mapper/modules/MallGoodsMapper.xml
+++ b/src/main/resources/mapper/modules/MallGoodsMapper.xml
@@ -73,6 +73,7 @@
a.score,
a.is_hot,
min(b.present_price) price,
+ sum(b.stock) stock,
sum(b.sku_volume) saleVolume
from mall_goods a
left join mall_goods_sku b on a.id=b.goods_id
--
Gitblit v1.9.1