From ceb9ccee76b6b6bc77b297a1e9ed9a704a85704b Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 16 Jun 2022 10:19:53 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallActServiceImpl.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallActServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallActServiceImpl.java
index b8ffd31..f95a34d 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallActServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallActServiceImpl.java
@@ -142,8 +142,8 @@
DataDictionaryCustom cashDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
DataDictionaryEnum.WIN_CASH.getType(),
DataDictionaryEnum.WIN_CASH.getCode());
- String scoreDicValue = scoreDic.getValue();
- String cashDicValue = cashDic.getValue();
+ String scoreDicValue = scoreDic.getValue() == null? "0":scoreDic.getValue();
+ String cashDicValue = cashDic.getValue() == null? "0":cashDic.getValue();
BigDecimal totalProbability = new BigDecimal(scoreDicValue).add(new BigDecimal(cashDicValue));
//获取那个更大一点的几率
BigDecimal maxProbability = BigDecimal.ZERO;
@@ -180,6 +180,7 @@
if(CollUtil.isNotEmpty(mallActAwardSetXXCY)){
apiMallAwardDetailsVo.setAwardImage(mallActAwardSetXXCY.get(0).getAwardImage());
apiMallAwardDetailsVo.setAwardName(mallActAwardSetXXCY.get(0).getAwardName());
+ apiMallAwardDetailsVo.setAwardId(mallActAwardSetXXCY.get(0).getId());
}else{
apiMallAwardDetailsVo.setAwardName("未中奖");
}
@@ -214,6 +215,7 @@
if(CollUtil.isNotEmpty(mallActAwardSetXXCY)){
apiMallAwardDetailsVo.setAwardImage(mallActAwardSetXXCY.get(0).getAwardImage());
apiMallAwardDetailsVo.setAwardName(mallActAwardSetXXCY.get(0).getAwardName());
+ apiMallAwardDetailsVo.setAwardId(mallActAwardSetXXCY.get(0).getId());
}else{
apiMallAwardDetailsVo.setAwardName("未中奖");
}
@@ -259,6 +261,7 @@
apiMallAwardDetailsVo.setAwardType(mallActAwardSet.getAwardType());
apiMallAwardDetailsVo.setAwardValue(mallActAwardSet.getAwardValue());
apiMallAwardDetailsVo.setAwardImage(mallActAwardSet.getAwardImage());
+ apiMallAwardDetailsVo.setAwardId(mallActAwardSet.getId());
if(MallActAwardSet.AWARD_TYPE_JF == mallActAwardSet.getAwardType()){
prizeScore = prizeScore.add(new BigDecimal(mallActAwardSet.getAwardValue()));
@@ -280,6 +283,7 @@
if(CollUtil.isNotEmpty(mallActAwardSetXXCY)){
apiMallAwardDetailsVo.setAwardImage(mallActAwardSetXXCY.get(0).getAwardImage());
apiMallAwardDetailsVo.setAwardName(mallActAwardSetXXCY.get(0).getAwardName());
+ apiMallAwardDetailsVo.setAwardId(mallActAwardSetXXCY.get(0).getId());
}else{
apiMallAwardDetailsVo.setAwardName("未中奖");
}
@@ -301,6 +305,7 @@
if(CollUtil.isNotEmpty(mallActAwardSetXXCY)){
apiMallAwardDetailsVo.setAwardImage(mallActAwardSetXXCY.get(0).getAwardImage());
apiMallAwardDetailsVo.setAwardName(mallActAwardSetXXCY.get(0).getAwardName());
+ apiMallAwardDetailsVo.setAwardId(mallActAwardSetXXCY.get(0).getId());
}else{
apiMallAwardDetailsVo.setAwardName("未中奖");
}
@@ -346,6 +351,7 @@
apiMallAwardDetailsVo.setAwardType(mallActAwardSet.getAwardType());
apiMallAwardDetailsVo.setAwardValue(mallActAwardSet.getAwardValue());
apiMallAwardDetailsVo.setAwardImage(mallActAwardSet.getAwardImage());
+ apiMallAwardDetailsVo.setAwardId(mallActAwardSet.getId());
if(MallActAwardSet.AWARD_TYPE_JF == mallActAwardSet.getAwardType()){
prizeScore = prizeScore.add(new BigDecimal(mallActAwardSet.getAwardValue()));
@@ -384,6 +390,7 @@
if(CollUtil.isNotEmpty(mallActAwardSetXXCY)){
apiMallAwardDetailsVo.setAwardImage(mallActAwardSetXXCY.get(0).getAwardImage());
apiMallAwardDetailsVo.setAwardName(mallActAwardSetXXCY.get(0).getAwardName());
+ apiMallAwardDetailsVo.setAwardId(mallActAwardSetXXCY.get(0).getId());
}else{
apiMallAwardDetailsVo.setAwardName("未中奖");
}
@@ -429,6 +436,7 @@
apiMallAwardDetailsVo.setAwardType(mallActAwardSet.getAwardType());
apiMallAwardDetailsVo.setAwardValue(mallActAwardSet.getAwardValue());
apiMallAwardDetailsVo.setAwardImage(mallActAwardSet.getAwardImage());
+ apiMallAwardDetailsVo.setAwardId(mallActAwardSet.getId());
if(MallActAwardSet.AWARD_TYPE_JF == mallActAwardSet.getAwardType()){
prizeScore = prizeScore.add(new BigDecimal(mallActAwardSet.getAwardValue()));
@@ -450,6 +458,7 @@
if(CollUtil.isNotEmpty(mallActAwardSetXXCY)){
apiMallAwardDetailsVo.setAwardImage(mallActAwardSetXXCY.get(0).getAwardImage());
apiMallAwardDetailsVo.setAwardName(mallActAwardSetXXCY.get(0).getAwardName());
+ apiMallAwardDetailsVo.setAwardId(mallActAwardSetXXCY.get(0).getId());
}else{
apiMallAwardDetailsVo.setAwardName("未中奖");
}
@@ -471,6 +480,7 @@
if(CollUtil.isNotEmpty(mallActAwardSetXXCY)){
apiMallAwardDetailsVo.setAwardImage(mallActAwardSetXXCY.get(0).getAwardImage());
apiMallAwardDetailsVo.setAwardName(mallActAwardSetXXCY.get(0).getAwardName());
+ apiMallAwardDetailsVo.setAwardId(mallActAwardSetXXCY.get(0).getId());
}else{
apiMallAwardDetailsVo.setAwardName("未中奖");
}
@@ -516,6 +526,7 @@
apiMallAwardDetailsVo.setAwardType(mallActAwardSet.getAwardType());
apiMallAwardDetailsVo.setAwardValue(mallActAwardSet.getAwardValue());
apiMallAwardDetailsVo.setAwardImage(mallActAwardSet.getAwardImage());
+ apiMallAwardDetailsVo.setAwardId(mallActAwardSet.getId());
if(MallActAwardSet.AWARD_TYPE_JF == mallActAwardSet.getAwardType()){
prizeScore = prizeScore.add(new BigDecimal(mallActAwardSet.getAwardValue()));
--
Gitblit v1.9.1