From f215f23bae13f1e6984c38b5893103a184c3c534 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Thu, 21 Dec 2023 14:07:25 +0800
Subject: [PATCH] 富文本框输入版本变化

---
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java |   20 ++++++++++++++++++--
 1 files changed, 18 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 8f34ad8..16b591a 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
@@ -105,10 +105,10 @@
         }
 //        mallMember.setName(registerDto.getName());
 //        mallMember.setAccountStatus(MallMember.ACCOUNT_STATUS_ENABLE);
-        mallMember.setAccountStatus(MallMember.ACCOUNT_STATUS_DISABLED);
+        mallMember.setAccountStatus(MallMember.ACCOUNT_STATUS_ENABLE);
         mallMember.setAccountType(MallMember.ACCOUNT_TYPE_NORMAL);
         mallMember.setLevel(AgentLevelEnum.ZERO_LEVEL.getCode());
-        mallMember.setIsFrozen(ProductEnum.MEMBER_FROZEN.getValue());
+        mallMember.setIsFrozen(ProductEnum.MEMBER_UNFROZEN.getValue());
 //        mallMember.setSex("男");
 //        mallMember.setBindPhone(registerDto.getAccount());
 
@@ -274,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) {
@@ -860,6 +867,15 @@
         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