From 153266735473a975bbf2cf37d1d08465a13bc540 Mon Sep 17 00:00:00 2001 From: zhangheng Date: Wed, 24 Sep 2025 10:11:03 +0800 Subject: [PATCH 1/3] =?UTF-8?q?##=20=E7=9B=B4=E6=8E=A8=E5=8D=87=E7=BA=A7?= =?UTF-8?q?=E6=95=B0=E6=8D=AE,=E5=AF=BC=E5=87=BA=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../recommend/vo/AcDirectPushUpgradeListVO.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/vo/AcDirectPushUpgradeListVO.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/vo/AcDirectPushUpgradeListVO.java index 25244b0d..92460b49 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/vo/AcDirectPushUpgradeListVO.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/vo/AcDirectPushUpgradeListVO.java @@ -41,22 +41,22 @@ public class AcDirectPushUpgradeListVO { /** * 活动开始时间 */ - @Excel(name = "活动开始时间", dateFormat = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "活动开始时间", dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd") private Date actStartDate; /** * 活动结束时间 */ - @Excel(name = "活动结束时间", dateFormat = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "活动结束时间", dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd") private Date actEndDate; /** * 创建时间 */ - @Excel(name = "创建时间", dateFormat = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "创建时间", dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd") private Date creationTime; /** From 533ef4797f9a07101cc49bbd077da8b2d217928e Mon Sep 17 00:00:00 2001 From: sangelxiu1 <15781802@163.com> Date: Wed, 24 Sep 2025 10:21:23 +0800 Subject: [PATCH 2/3] =?UTF-8?q?##=20Feat=20-=20Top=2030=20(=E7=9B=B4?= =?UTF-8?q?=E6=8E=A8=E4=BA=BA=E6=95=B0/=E7=9B=B4=E6=8E=A8=E9=87=91?= =?UTF-8?q?=E9=A2=9D)=20-=20=E5=90=8E=E5=8F=B0=E7=AE=A1=E7=90=86=E7=8A=B6?= =?UTF-8?q?=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manager/BackMemberStatisticsController.java | 12 ++++++++++++ .../service/impl/MemberStatisticsServiceImpl.java | 6 ++++-- .../mapper/member/statis/MemberStatisticsMapper.xml | 2 ++ 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/controller/manager/BackMemberStatisticsController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/controller/manager/BackMemberStatisticsController.java index c34b7ba7..44dfcc64 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/controller/manager/BackMemberStatisticsController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/controller/manager/BackMemberStatisticsController.java @@ -38,6 +38,18 @@ public class BackMemberStatisticsController { redisService.setCacheObject(CacheConstants.TOP_30_ACTIVITY + ETop30Type.AMOUNT.getKey(), flag); return AjaxResult.success(); } + + + @GetMapping("/getShowPeople") + public AjaxResult getShowPeople() { + return AjaxResult.success("操作成功!", redisService.getCacheObject(CacheConstants.TOP_30_ACTIVITY + ETop30Type.PEOPLE.getKey())); + } + + @GetMapping("/getShowAmount") + public AjaxResult getShowAmount() { + return AjaxResult.success("操作成功!", redisService.getCacheObject(CacheConstants.TOP_30_ACTIVITY + ETop30Type.AMOUNT.getKey())); + } + @PostMapping("/topPeople") public AjaxResult topPeople(@RequestBody DirectStatisticsTop30QueryParam param) { param.setFaker(false); diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/service/impl/MemberStatisticsServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/service/impl/MemberStatisticsServiceImpl.java index dbaac459..66f5c870 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/service/impl/MemberStatisticsServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/service/impl/MemberStatisticsServiceImpl.java @@ -72,8 +72,10 @@ public class MemberStatisticsServiceImpl implements IMemberStatisticsService { result = generateFakeData(list, 30, fakerList, type); } for (DirectStatisticsTop30VO directStatisticsTop30VO : result) { - directStatisticsTop30VO.setMemberCode(DataMaskingUtil.mask(directStatisticsTop30VO.getMemberCode(), 2, 2)); - directStatisticsTop30VO.setMemberName(DataMaskingUtil.mask(directStatisticsTop30VO.getMemberName(), 1, 0)); + if(param.getFaker()){ + directStatisticsTop30VO.setMemberCode(DataMaskingUtil.mask(directStatisticsTop30VO.getMemberCode(), 2, 2)); + directStatisticsTop30VO.setMemberName(DataMaskingUtil.mask(directStatisticsTop30VO.getMemberName(), 1, 0)); + } directStatisticsTop30VO.setNumberOfAmount(directStatisticsTop30VO.getNumberOfAmount().divide(new BigDecimal(10000))); } return result; diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/statis/MemberStatisticsMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/statis/MemberStatisticsMapper.xml index c20f185f..e854266c 100644 --- a/bd-business/bd-business-member/src/main/resources/mapper/member/statis/MemberStatisticsMapper.xml +++ b/bd-business/bd-business-member/src/main/resources/mapper/member/statis/MemberStatisticsMapper.xml @@ -19,6 +19,7 @@ where del_flag = 0 and order_status = 1 + AND (order_type in (1,2) or (order_Type = 3 and ORDER_TYPE_EXTEND = 1)) and pay_time between #{param.startDate} and #{param.endDate} group by PK_REFERENCE ) r @@ -43,6 +44,7 @@ where del_flag = 0 and order_status = 1 + AND (order_type in (1,2) or (order_Type = 3 and ORDER_TYPE_EXTEND = 1)) and pay_time between #{param.startDate} and #{param.endDate} group by PK_REFERENCE ) r From 8c840a604bead0e0cf649c1b8eefb4bafc190cd9 Mon Sep 17 00:00:00 2001 From: zhangheng Date: Wed, 24 Sep 2025 13:25:16 +0800 Subject: [PATCH 3/3] =?UTF-8?q?##=20=E7=9B=B4=E6=8E=A8=E5=8D=87=E7=BA=A7?= =?UTF-8?q?=E6=95=B0=E6=8D=AE,=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AcRecommendConfigController.java | 5 +++-- .../recommend/AcRecomUpgradeRecordMapper.xml | 21 +++++++++---------- .../common/core/enums/EOperationBusiness.java | 2 ++ .../common/core/enums/EOperationModule.java | 2 ++ 4 files changed, 17 insertions(+), 13 deletions(-) diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/controller/AcRecommendConfigController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/controller/AcRecommendConfigController.java index 4c12a4e7..fc200098 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/controller/AcRecommendConfigController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/controller/AcRecommendConfigController.java @@ -70,7 +70,7 @@ public class AcRecommendConfigController extends BaseController { * @param acDirectPushUpgradeParam * @return */ - @Log(module = EOperationModule.AC_DIRECT_PUSH_UPGRADE, business = EOperationBusiness.AC_DIRECT_PUSH_UPGRADE, method = EOperationMethod.INSERT, remark = "在线签呈") + @Log(module = EOperationModule.AC_DIRECT_PUSH_UPGRADE, business = EOperationBusiness.AC_DIRECT_PUSH_UPGRADE, method = EOperationMethod.INSERT) @PostMapping("/directPushUpgrade") public AjaxResult directPushUpgradeSubmit(@RequestBody AcDirectPushUpgradeParam acDirectPushUpgradeParam) { acDirectPushUpgradeParam.setPkCountry(SecurityUtils.getPkCountry()); @@ -87,13 +87,14 @@ public class AcRecommendConfigController extends BaseController { * @param param * @return */ - @Log(module = EOperationModule.AC_DIRECT_PUSH_UPGRADE, business = EOperationBusiness.AC_DIRECT_PUSH_UPGRADE, method = EOperationMethod.SELECT, remark = "在线签呈") + @Log(module = EOperationModule.AC_DIRECT_PUSH_UPGRADE_LIST, business = EOperationBusiness.AC_DIRECT_PUSH_UPGRADE_LIST, method = EOperationMethod.SELECT) @GetMapping("/directPushUpgradeList") public TableDataInfo directPushUpgradeList(AcDirectPushUpgradeListParam param) { startPage(); return getDataTable(iAcRecomUpgradeRecordService.queryList(param)); } + @Log(module = EOperationModule.AC_DIRECT_PUSH_UPGRADE_LIST, business = EOperationBusiness.AC_DIRECT_PUSH_UPGRADE_LIST, method = EOperationMethod.SELECT) @PostMapping("/directPushUpgradeExport") public void export(AcDirectPushUpgradeListParam param, HttpServletResponse response) { startPage(); diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/activity/recommend/AcRecomUpgradeRecordMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/activity/recommend/AcRecomUpgradeRecordMapper.xml index 19215d02..8bc3b85b 100644 --- a/bd-business/bd-business-sale/src/main/resources/mapper/activity/recommend/AcRecomUpgradeRecordMapper.xml +++ b/bd-business/bd-business-sale/src/main/resources/mapper/activity/recommend/AcRecomUpgradeRecordMapper.xml @@ -64,8 +64,8 @@ diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationBusiness.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationBusiness.java index f0952f1d..1df60249 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationBusiness.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationBusiness.java @@ -256,6 +256,8 @@ public enum EOperationBusiness { AC_DIRECT_PUSH_UPGRADE("直推升级"), + AC_DIRECT_PUSH_UPGRADE_LIST("直推升级数据"), + AC_WARES_RULE_CONFIG("商品赠送"), diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationModule.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationModule.java index 60a4ed28..967ea00b 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationModule.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationModule.java @@ -355,6 +355,8 @@ public enum EOperationModule { AC_DIRECT_PUSH_UPGRADE("直推升级"), + AC_DIRECT_PUSH_UPGRADE_LIST("直推升级数据"), + AC_TOURISM_CONFIG("旅游活动"), AC_WARES_RULE_CONFIG("商品赠送"),