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 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 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