From 2ea179b58ce7b3b624f4dad02cd0f4375ce3c939 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Thu, 14 Dec 2023 16:53:02 +0800
Subject: [PATCH] 微信小程序配置
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 47 +++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 43 insertions(+), 4 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 ea45fef..3e63cf0 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
@@ -63,6 +63,7 @@
private final IMallMoneyFlowService mallMoneyFlowService;
private final MallProductBuyRecordMapper mallProductBuyRecordMapper;
private final MallProductBuyMapper mallProductBuyMapper;
+ private final MallMemberSpeakMapper mallMemberSpeakMapper;
@Value("${spring.profiles.active}")
@@ -156,8 +157,8 @@
mallMemberPaymentMapper.insert(mallMemberPayment);
ApiRegisterVo apiRegisterVo = new ApiRegisterVo();
- apiRegisterVo.setAccount(accountLogin);
- apiRegisterVo.setAccount(userKey);
+ apiRegisterVo.setAccount(mallMember.getAccountLogin());
+ apiRegisterVo.setUserKey(mallMember.getUserKey());
return new FebsResponse().success().data(apiRegisterVo);
}
@@ -241,6 +242,16 @@
mallMemberVo.setHasPayment(1);
}
+ DataDictionaryCustom nftMinDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.NFT_MIN.getType(),
+ DataDictionaryEnum.NFT_MIN.getCode());
+ mallMemberVo.setNftMin(ObjectUtil.isEmpty(nftMinDic) ? new BigDecimal(100) : new BigDecimal(nftMinDic.getValue()));
+
+ DataDictionaryCustom outFcmMinDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.OUT_FCM_MIN.getType(),
+ DataDictionaryEnum.OUT_FCM_MIN.getCode());
+ mallMemberVo.setOutFcmMin(ObjectUtil.isEmpty(outFcmMinDic) ? new BigDecimal(100) : new BigDecimal(outFcmMinDic.getValue()));
+
DataDictionaryCustom fcmPriceDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
DataDictionaryEnum.FCM_PRICE.getType(),
DataDictionaryEnum.FCM_PRICE.getCode());
@@ -263,6 +274,13 @@
);
BigDecimal memberFrozenFcmCnt = ObjectUtil.isEmpty(memberFrozenFcmCntDic) ? new BigDecimal(100) : new BigDecimal(memberFrozenFcmCntDic.getValue());
mallMemberVo.setUnfrozenCnt(memberFrozenFcmCnt);
+
+ DataDictionaryCustom insureMinuteDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.INSURE_END_MINUTE.getType(),
+ DataDictionaryEnum.INSURE_END_MINUTE.getCode()
+ );
+ Integer insureMinute = Integer.parseInt(ObjectUtil.isEmpty(insureMinuteDic) ? "60" : insureMinuteDic.getValue());
+ mallMemberVo.setMinuteCnt(insureMinute);
DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(AppContants.AGENT_LEVEL, mallMember.getLevel());
if (dic != null) {
@@ -287,7 +305,7 @@
);
mallMemberVo.setEndTime(endTimeDic.getValue());
- Integer pickCount = mallProductBuyMapper.selectListByMemberIdAndState(id,ProductEnum.PRODUCT_BUY_SUCCESS.getValue());
+ Integer pickCount = mallProductBuyMapper.selectListByMemberIdAndState(id);
mallMemberVo.setPickCount(pickCount);
return new FebsResponse().success().data(mallMemberVo);
}
@@ -457,7 +475,7 @@
}
if(2 == type){
if (amount.compareTo(mallMemberAmountLogin.getTokenAva()) > 0) {
- throw new FebsException("令牌不足");
+ throw new FebsException("门票不足");
}
mallMemberAmountLogin.setTokenAva(mallMemberAmountLogin.getTokenAva().subtract(amount));
mallMemberAmountMapper.updateTokenAvaById(mallMemberAmountLogin);
@@ -837,6 +855,27 @@
return new FebsResponse().success().message("操作成功");
}
+ @Override
+ public FebsResponse memberSpeak(ApiMemberSpeakDto memberSpeakDto) {
+ MallMemberSpeak mallMemberSpeak = new MallMemberSpeak();
+ if(ObjectUtil.isNotEmpty(memberSpeakDto.getMemberId())){
+ mallMemberSpeak.setMemberId(memberSpeakDto.getMemberId());
+ }
+ mallMemberSpeak.setState(ProductEnum.SPEAK_NO_DEAL.getValue());
+ mallMemberSpeak.setDescription(memberSpeakDto.getDescription());
+ mallMemberSpeakMapper.insert(mallMemberSpeak);
+ return new FebsResponse().success().message("操作成功");
+ }
+
+ @Override
+ public FebsResponse moneyFlowInside(MoneyFlowDto moneyFlowDto) {
+ IPage<MoneyFlowVo> page = new Page<>(moneyFlowDto.getPageNum(), moneyFlowDto.getPageSize());
+ Long id = LoginUserUtil.getLoginUser().getId();
+ moneyFlowDto.setMemberId(id);
+ IPage<MoneyFlowVo> pages = mallMoneyFlowMapper.selectApiFcmMoneyFlowInsideInPage(page, moneyFlowDto);
+ return new FebsResponse().success().data(pages);
+ }
+
public static void main(String[] args) {
Set<String> objectsAccount = new HashSet<>();
Set<String> objects = new HashSet<>();
--
Gitblit v1.9.1