From 4196b93e01b92cded16ffa7a634b0ac30a9b2c6b Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Thu, 07 Dec 2023 14:55:12 +0800
Subject: [PATCH] 用户留言

---
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java |   50 +++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 47 insertions(+), 3 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 87e9ee6..f650600 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
@@ -61,6 +61,9 @@
     private final MallRegisterAppealMapper mallRegisterAppealMapper;
     private final MallMemberBankMapper mallMemberBankMapper;
     private final IMallMoneyFlowService mallMoneyFlowService;
+    private final MallProductBuyRecordMapper mallProductBuyRecordMapper;
+    private final MallProductBuyMapper mallProductBuyMapper;
+    private final MallMemberSpeakMapper mallMemberSpeakMapper;
 
 
     @Value("${spring.profiles.active}")
@@ -148,7 +151,15 @@
         MallMemberAmount mallMemberAmount = new MallMemberAmount();
         mallMemberAmount.setMemberId(mallMember.getId());
         mallMemberAmountMapper.insert(mallMemberAmount);
-        return new FebsResponse().success().message("注册成功");
+
+        MallMemberPayment mallMemberPayment = new MallMemberPayment();
+        mallMemberPayment.setMemberId(mallMember.getId());
+        mallMemberPaymentMapper.insert(mallMemberPayment);
+
+        ApiRegisterVo apiRegisterVo = new ApiRegisterVo();
+        apiRegisterVo.setAccount(mallMember.getAccountLogin());
+        apiRegisterVo.setUserKey(mallMember.getUserKey());
+        return new FebsResponse().success().data(apiRegisterVo);
     }
 
     @Override
@@ -231,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());
@@ -246,6 +267,13 @@
                 DataDictionaryEnum.NFT_FEE.getCode());
         BigDecimal nftFeePercent = ObjectUtil.isEmpty(nftFeeDic) ? new BigDecimal(20) : new BigDecimal(nftFeeDic.getValue());
         mallMemberVo.setNftFee(nftFeePercent);
+
+        DataDictionaryCustom memberFrozenFcmCntDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+                DataDictionaryEnum.MEMBER_FROZEN_FCM_CNT.getType(),
+                DataDictionaryEnum.MEMBER_FROZEN_FCM_CNT.getCode()
+        );
+        BigDecimal memberFrozenFcmCnt = ObjectUtil.isEmpty(memberFrozenFcmCntDic) ? new BigDecimal(100) : new BigDecimal(memberFrozenFcmCntDic.getValue());
+        mallMemberVo.setUnfrozenCnt(memberFrozenFcmCnt);
 
         DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(AppContants.AGENT_LEVEL, mallMember.getLevel());
         if (dic != null) {
@@ -269,6 +297,9 @@
                 DataDictionaryEnum.YU_YUE_END_TIME.getCode()
         );
         mallMemberVo.setEndTime(endTimeDic.getValue());
+
+        Integer pickCount = mallProductBuyMapper.selectListByMemberIdAndState(id);
+        mallMemberVo.setPickCount(pickCount);
         return new FebsResponse().success().data(mallMemberVo);
     }
 
@@ -353,7 +384,8 @@
         IPage<MoneyFlowVo> page = new Page<>(moneyFlowDto.getPageNum(), moneyFlowDto.getPageSize());
         Long id = LoginUserUtil.getLoginUser().getId();
         moneyFlowDto.setMemberId(id);
-        IPage<MoneyFlowVo> pages = mallMoneyFlowMapper.selectApiMoneyFlowInPage(page, moneyFlowDto);
+//        IPage<MoneyFlowVo> pages = mallMoneyFlowMapper.selectApiMoneyFlowInPage(page, moneyFlowDto);
+        IPage<MoneyFlowVo> pages = mallMoneyFlowMapper.selectApiFcmMoneyFlowInPage(page, moneyFlowDto);
         return new FebsResponse().success().data(pages);
     }
 
@@ -380,7 +412,7 @@
         BigDecimal amount = transferDto.getAmount();
         int type = transferDto.getType();
 
-        if(1 != type || 2 != type){
+        if(1 != type && 2 != type){
             throw new FebsException("请选择互转类型");
         }
         Integer insideWith = loginMember.getInsideWith() == null ? 2 :loginMember.getInsideWith();
@@ -816,6 +848,18 @@
         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("操作成功");
+    }
+
     public static void main(String[] args) {
         Set<String> objectsAccount = new HashSet<>();
         Set<String> objects = new HashSet<>();

--
Gitblit v1.9.1