From 3b9b6d8eebebc31c6ef51bd4346b5f62edeae9b7 Mon Sep 17 00:00:00 2001
From: sangelxiu1 <15781802@163.com>
Date: Fri, 13 Jun 2025 15:03:40 +0800
Subject: [PATCH] =?UTF-8?q?##=20Fix=20-=20=E9=80=89=E6=8B=A9=E5=8C=BA?=
 =?UTF-8?q?=E5=9F=9F=20=E8=AE=A1=E7=AE=97=E8=87=AA=E5=B7=B1=E4=B8=9A?=
 =?UTF-8?q?=E7=BB=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CuMemberRetailAchieveServiceImpl.java     | 38 ++++++++++++++++---
 1 file changed, 32 insertions(+), 6 deletions(-)

diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/impl/CuMemberRetailAchieveServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/impl/CuMemberRetailAchieveServiceImpl.java
index 3da9a7a0..2602fe09 100644
--- a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/impl/CuMemberRetailAchieveServiceImpl.java
+++ b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/impl/CuMemberRetailAchieveServiceImpl.java
@@ -16,11 +16,13 @@ import com.hzs.member.account.service.ICuMemberBaseService;
 import com.hzs.member.achieve.service.ICuMemberSettlePeriodService;
 import com.hzs.member.base.service.ICuMemberService;
 import com.hzs.retail.member.mapper.CuMemberRetailRangeMapper;
+import com.hzs.retail.member.param.MarketDynamicsQueryDateParam;
 import com.hzs.retail.member.service.ICuMemberRetailAchieveService;
 import com.hzs.retail.member.utils.DataStatisticsUtil;
 import com.hzs.retail.member.vo.CuMemberRetailAchieveVO;
 import com.hzs.retail.member.vo.CuMemberRetailDataStatisticsDetailVO;
 import com.hzs.retail.member.vo.CuMemberRetailDataStatisticsResultVO;
+import com.hzs.retail.member.vo.MarketDynamicsDetailVO;
 import com.hzs.system.config.IGradeServiceApi;
 import com.hzs.system.config.dto.GradeDTO;
 import lombok.extern.slf4j.Slf4j;
@@ -306,11 +308,17 @@ public class CuMemberRetailAchieveServiceImpl extends ServiceImpl<CuMemberRetail
     private String getTableName() {
         String localDate = LocalDate.now().minus(1, ChronoUnit.DAYS).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
         int period = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(localDate).getPkId();
+        if(ObjectUtil.isEmpty(period)){
+            return null;
+        }
         return TableNameConstants.CU_MEMBER_RETAIL_RANGE + period;
     }
     private String getDayTableName() {
         String localDate = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
         int period = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(localDate).getPkId();
+        if(ObjectUtil.isEmpty(period)){
+            return null;
+        }
         return TableNameConstants.CU_MEMBER_RETAIL_S + period;
     }
 
@@ -404,12 +412,12 @@ public class CuMemberRetailAchieveServiceImpl extends ServiceImpl<CuMemberRetail
         List<CuMemberRetailAchieveVO> memberSelfAchieveList = new ArrayList<>();
 
         //会员业绩
-//        CuMemberRetailAchieveVO memberAchieveVO = CuMemberRetailAchieveVO.builder().memberRetailTable(memberRetailTable).pkMember(pkMember).systemType(systemType).build();
-//        CuMemberRetailAchieveVO orderAchieveVO = baseMapper.selectMemberOrderSumAchieveByPkMember(memberAchieveVO);
-//        if (null != orderAchieveVO && orderAchieveVO.getArealPv().compareTo(BigDecimal.ZERO) > 0) {
-//            orderAchieveVO.setPkMember(pkMember);
-//            memberSelfAchieveList.add(orderAchieveVO);
-//        }
+        CuMemberRetailAchieveVO memberAchieveVO = CuMemberRetailAchieveVO.builder().memberRetailTable(memberRetailTable).pkMember(pkMember).systemType(systemType).build();
+        CuMemberRetailAchieveVO orderAchieveVO = baseMapper.selectMemberOrderSumAchieveByPkMember(memberAchieveVO);
+        if (null != orderAchieveVO && orderAchieveVO.getArealPv().compareTo(BigDecimal.ZERO) > 0) {
+            orderAchieveVO.setPkMember(pkMember);
+            memberSelfAchieveList.add(orderAchieveVO);
+        }
         //查询伞下业绩
         if (CollUtil.isNotEmpty(pkMemberList)) {
             List<CuMemberRetailAchieveVO> memberPushAchieveList = getMemberPushSumAchieve(pkMemberList, memberRetailTable, memberSecondTable, systemType);
@@ -577,6 +585,24 @@ public class CuMemberRetailAchieveServiceImpl extends ServiceImpl<CuMemberRetail
         return result;
     }
 
+    @Override
+    public List<MarketDynamicsDetailVO> getMarketDynamics(MarketDynamicsQueryDateParam param) {
+        DataStatisticsUtil.setQueryDateParam(param);
+        param.setCurrentDayTableName(getDayTableName());
+        param.setCurrentMonthTableName(getDayTableName(param.getNowDate()));
+        param.setCurrentDayTableName(getDayTableName(param.getLastMonthDate()));
+        log.info("MarketDynamicsQueryDateParam : {}", JSONUtil.toJsonStr(param));
+        return Collections.emptyList();
+    }
+
+    private String getDayTableName(String localDate) {
+        int period = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(localDate).getPkId();
+        if(ObjectUtil.isEmpty(period)){
+            return null;
+        }
+        return TableNameConstants.CU_MEMBER_RETAIL_RANGE + period;
+    }
+
     /**
      * 查询会员是否激活
      *