From 0b6ae5f2287b9ed992395aadcd47131b96c988a9 Mon Sep 17 00:00:00 2001
From: sangelxiu1 <15781802@163.com>
Date: Fri, 13 Jun 2025 15:06:26 +0800
Subject: [PATCH] =?UTF-8?q?##=20Opt=20-=20=E5=B8=82=E5=9C=BA=E5=8A=A8?=
 =?UTF-8?q?=E6=80=81=E9=83=A8=E5=88=86=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/ApiRetailHomePageController.java      | 10 +++++
 .../param/MarketDynamicsQueryDateParam.java   | 37 +++++++++++++++++++
 .../ICuMemberRetailAchieveService.java        |  4 ++
 .../CuMemberRetailAchieveServiceImpl.java     |  5 ++-
 .../member/utils/DataStatisticsUtil.java      | 19 ++++++++++
 5 files changed, 73 insertions(+), 2 deletions(-)
 create mode 100644 bd-business/bd-business-member/src/main/java/com/hzs/retail/member/param/MarketDynamicsQueryDateParam.java

diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/controller/api/ApiRetailHomePageController.java b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/controller/api/ApiRetailHomePageController.java
index d7db832d..86b03605 100644
--- a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/controller/api/ApiRetailHomePageController.java
+++ b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/controller/api/ApiRetailHomePageController.java
@@ -5,6 +5,7 @@ import com.hzs.common.core.web.controller.BaseController;
 import com.hzs.common.core.web.domain.AjaxResult;
 import com.hzs.common.core.web.page.TableDataInfo;
 import com.hzs.common.security.utils.SecurityUtils;
+import com.hzs.retail.member.param.MarketDynamicsQueryDateParam;
 import com.hzs.retail.member.service.ICuMemberRetailAchieveService;
 import com.hzs.retail.member.vo.CuMemberRetailAchieveVO;
 import com.hzs.retail.member.vo.CuMemberRetailDataStatisticsResultVO;
@@ -174,4 +175,13 @@ public class ApiRetailHomePageController extends BaseController {
         List<CuMemberRetailAchieveVO> retailAchieveVOList = retailAchieveService.selectMemberSmallBoxList(cuMemberRetailAchieveVO);
         return getDataTable(retailAchieveVOList);
     }
+
+    /**
+     * 市场动态
+     */
+    @PostMapping("/market-dynamics")
+    public AjaxResult getMarketDynamics(@RequestBody MarketDynamicsQueryDateParam param) {
+        retailAchieveService.getMarketDynamics(param);
+        return AjaxResult.success();
+    }
 }
diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/param/MarketDynamicsQueryDateParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/param/MarketDynamicsQueryDateParam.java
new file mode 100644
index 00000000..76f0c1ce
--- /dev/null
+++ b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/param/MarketDynamicsQueryDateParam.java
@@ -0,0 +1,37 @@
+package com.hzs.retail.member.param;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+/**
+ * 市场动态查询参数
+ */
+public class MarketDynamicsQueryDateParam implements Serializable {
+    private Long pkId;
+    private String nowDate;
+    private String lastMonthDate;
+
+    /**
+     * 本月日结表名
+     */
+    private String currentMonthTableName;
+    /**
+     * 
+     */
+    private String lastMonthTableName;
+    private String currentDayTableName;
+    /**
+     * 查询条件 (会员编号/会员姓名)
+     */
+    private String keyWords;
+    private Integer pageNum = 1;
+    private Integer pageSize = 10;
+}
diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/ICuMemberRetailAchieveService.java b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/ICuMemberRetailAchieveService.java
index 1c7a795c..bb6488f8 100644
--- a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/ICuMemberRetailAchieveService.java
+++ b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/ICuMemberRetailAchieveService.java
@@ -2,9 +2,11 @@ package com.hzs.retail.member.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.hzs.common.domain.member.achieve.CuMemberRetailRange;
+import com.hzs.retail.member.param.MarketDynamicsQueryDateParam;
 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 java.util.List;
 import java.util.Map;
@@ -111,4 +113,6 @@ public interface ICuMemberRetailAchieveService extends IService<CuMemberRetailRa
      * @return
      */
     CuMemberRetailDataStatisticsResultVO getRetailDataStatisticsDetail(Long pkMember, Integer pkCountry, Integer systemType);
+
+    List<MarketDynamicsDetailVO> getMarketDynamics(MarketDynamicsQueryDateParam param);
 }
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 2602fe09..70609c88 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
@@ -596,10 +596,11 @@ public class CuMemberRetailAchieveServiceImpl extends ServiceImpl<CuMemberRetail
     }
 
     private String getDayTableName(String localDate) {
-        int period = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(localDate).getPkId();
-        if(ObjectUtil.isEmpty(period)){
+        CuMemberSettlePeriod cuMemberSettlePeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(localDate);
+        if(ObjectUtil.isEmpty(cuMemberSettlePeriod)){
             return null;
         }
+        int period = cuMemberSettlePeriod.getPkId();
         return TableNameConstants.CU_MEMBER_RETAIL_RANGE + period;
     }
 
diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/utils/DataStatisticsUtil.java b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/utils/DataStatisticsUtil.java
index d70dfc11..537017ac 100644
--- a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/utils/DataStatisticsUtil.java
+++ b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/utils/DataStatisticsUtil.java
@@ -3,11 +3,16 @@ package com.hzs.retail.member.utils;
 import cn.hutool.core.util.ObjectUtil;
 import com.hzs.common.core.enums.EYesNo;
 import com.hzs.common.domain.member.base.CuMember;
+import com.hzs.retail.member.param.MarketDynamicsQueryDateParam;
 import com.hzs.retail.member.vo.CuMemberRetailDataStatisticsDetailVO;
 import com.hzs.retail.member.vo.CuMemberRetailDataStatisticsResultVO;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.TemporalAdjusters;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
@@ -230,4 +235,18 @@ public class DataStatisticsUtil {
                 RoundingMode.FLOOR
         );
     }
+    public static void setQueryDateParam(MarketDynamicsQueryDateParam param){
+        LocalDate.now(ZoneId.of("Asia/Shanghai"));
+        LocalDate currentDate = LocalDate.now();
+        LocalDate previousMonthDate = currentDate.minusMonths(1);
+        LocalDate lastDayOfPreviousMonth = previousMonthDate.with(TemporalAdjusters.lastDayOfMonth());
+        param.setNowDate(currentDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
+        param.setLastMonthDate(lastDayOfPreviousMonth.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
+//        System.out.println("当前日期: " + currentDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
+//        System.out.println("上一个月最后一天: " + lastDayOfPreviousMonth.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
+//        return MarketDynamicsQueryDateParam.builder()
+//                        .nowDate(currentDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")))
+//                                .lastMonthDate(lastDayOfPreviousMonth.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")))
+//                                        .build();
+    }
 }