From 779298eb527bce4c508ea9d1b050c4a795dddebe Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 10 May 2022 15:27:41 +0800
Subject: [PATCH] fix sign setting
---
src/main/resources/mapper/modules/MallGoodsMapper.xml | 6 ++++--
src/main/java/cc/mrbird/febs/mall/service/impl/ScoreServiceImpl.java | 5 +++--
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ScoreServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ScoreServiceImpl.java
index a7e79cf..9bc7c00 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ScoreServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ScoreServiceImpl.java
@@ -49,12 +49,13 @@
MallMemberWallet wallet = mallMemberWalletMapper.selectWalletByMemberId(member.getId());
+ MallScoreSignRecord mallScoreSignRecord = mallScoreSignRecordMapper.selectRecentSignRecord(member.getId());
+
ScoreSignVo scoreSign = new ScoreSignVo();
scoreSign.setMineScore(wallet.getPrizeScore().intValue());
- scoreSign.setHasSignDays(1);
+ scoreSign.setHasSignDays(mallScoreSignRecord == null ? 0 : mallScoreSignRecord.getTotalCnt());
DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.SCORE_SIGN_SETTING.getType(), DataDictionaryEnum.SCORE_SIGN_SETTING.getCode());
-
if (dic != null) {
scoreSign.setSetting(JSONObject.parseObject(dic.getValue(), ScoreSettingDto.class));
}
diff --git a/src/main/resources/mapper/modules/MallGoodsMapper.xml b/src/main/resources/mapper/modules/MallGoodsMapper.xml
index bf6af19..552d078 100644
--- a/src/main/resources/mapper/modules/MallGoodsMapper.xml
+++ b/src/main/resources/mapper/modules/MallGoodsMapper.xml
@@ -14,6 +14,8 @@
<result property="originalPrice" column="original_price" />
<result property="presentPrice" column="present_price" />
<result property="categoryId" column="category_id" />
+ <result property="volume" column="volume" />
+ <result property="stock" column="stock" />
<collection property="styles" ofType="cc.mrbird.febs.mall.entity.MallGoodsStyle">
<id property="id" column="style_id" />
<result property="name" column="style_name" />
@@ -48,8 +50,8 @@
c.style_id sku_style_id,
c.goods_id sku_goods_id
from mall_goods a
- inner join mall_goods_style b on a.id = b.goods_id
- inner join mall_goods_sku c on b.id=c.style_id
+ left join mall_goods_style b on a.id = b.goods_id
+ left join mall_goods_sku c on b.id=c.style_id
where a.id=#{id}
</select>
--
Gitblit v1.9.1