From 0f12e32a1bc284f4970375dcd81f81fb8ebfd618 Mon Sep 17 00:00:00 2001 From: sangelxiu1 <15781802@163.com> Date: Thu, 9 Oct 2025 16:54:10 +0800 Subject: [PATCH 1/3] =?UTF-8?q?##=20Opt=20-=20=E7=A7=BB=E5=8A=A8=E7=AB=AF?= =?UTF-8?q?=E5=B8=82=E5=9C=BA=E5=8A=A8=E6=80=81=E6=80=BB=E4=B8=9A=E7=BB=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CuMemberRetailAchieveServiceImpl.java | 2 +- .../member/utils/DataStatisticsUtil.java | 19 +++++++++++-------- 2 files changed, 12 insertions(+), 9 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 aa2b0ad3..4d21136f 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 @@ -348,7 +348,7 @@ public class CuMemberRetailAchieveServiceImpl extends ServiceImpl pkMemberList = baseMapper.selectDirectPushByPkMember(pkMember, systemType); - pkMemberList.add(userId); +// pkMemberList.add(userId); CuMemberRetailAchieveVO memberAchieveVO = CuMemberRetailAchieveVO.builder() .memberRetailTable(memberRetailTable) .memberRetailSTable(memberSecondTable) 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 2878886b..fc19173b 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 @@ -36,16 +36,19 @@ public class DataStatisticsUtil { Long pkId = cuMember.getPkId(); // 非激活直接返0 // 激活判断上一天的ENABLE_STATUS 0为正常 1为当天激活 不计算日结数据 - if (EYesNo.NO.getIntValue() == cuMember.getIsActivate()) { - return CuMemberRetailDataStatisticsResultVO.builder() - .totalPv(BigDecimal.ZERO) - .bigRangeTotalPv(BigDecimal.ZERO) - .smallRangeTotalPv(BigDecimal.ZERO) - .build(); - } +// if (EYesNo.NO.getIntValue() == cuMember.getIsActivate()) { +// return CuMemberRetailDataStatisticsResultVO.builder() +// .totalPv(BigDecimal.ZERO) +// .bigRangeTotalPv(BigDecimal.ZERO) +// .smallRangeTotalPv(BigDecimal.ZERO) +// .build(); +// } calcDetailVOTotalField(detailVOList, pkId); // addVirtualBranch(detailVOList, pkId); - CuMemberRetailDataStatisticsDetailVO total = getDetailVOByPKID(detailVOList, pkId); +// CuMemberRetailDataStatisticsDetailVO total = getDetailVOByPKID(detailVOList, pkId); + CuMemberRetailDataStatisticsDetailVO total = CuMemberRetailDataStatisticsDetailVO.builder() + .totalPv(detailVOList.stream().map(CuMemberRetailDataStatisticsDetailVO::getConsumePv).reduce(BigDecimal.ZERO, BigDecimal::add)) + .build(); // if (EYesNo.NO.getIntValue() == cuMember.getIsActivate()) { // // 昨日非激活 排除昨日日结表数据 // excludeDailySettlementData(detailVOList); From 49c4a4b89ed5900e2d50c89347eb36b9fbf42453 Mon Sep 17 00:00:00 2001 From: zhangheng Date: Thu, 9 Oct 2025 17:10:09 +0800 Subject: [PATCH 2/3] =?UTF-8?q?##=20bug425=20=E5=8F=91=E8=B4=A7=E6=B8=85?= =?UTF-8?q?=E5=8D=95=E8=AE=A2=E5=8D=95=E7=B1=BB=E5=9E=8B=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/SaDeliverController.java | 24 ++++++++--- .../manage/SaDeliverHandledController.java | 41 +++++++++++++++---- .../hzs/sale/deliver/vo/DeliverHandledVO.java | 8 ---- .../com/hzs/sale/deliver/vo/DeliverVO.java | 6 --- 4 files changed, 50 insertions(+), 29 deletions(-) diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/controller/manage/SaDeliverController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/controller/manage/SaDeliverController.java index 328e1ae6..33b2dded 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/controller/manage/SaDeliverController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/controller/manage/SaDeliverController.java @@ -94,6 +94,18 @@ public class SaDeliverController extends BaseController { for (DeliverVO deliver : resultList) { // 省市区处理 OrderUtil.handleOrderAddress(areaMap, deliver); + // 订单类型枚举转换 + deliver.setOrderTypeVal(EOrderType.getLabelByValue(deliver.getOrderType())); + // 发货类型 + deliver.setShippingChannelVal(EShippingChannel.getLabelByValue(deliver.getShippingChannel())); + // 发货方式 + deliver.setDeliveryWayVal(EDelivery.getLabelByValue(deliver.getDeliveryWay())); + // 供应方式 + deliver.setOperateScopeVal(ESupplyWay.getLabelByVal(deliver.getOperateScope())); + // 运输方式 + deliver.setTranTypeVal(ETransportType.getLabelByValue(deliver.getTranType())); + // 发货状态 + deliver.setDeliverStatusVal(EDeliveryStatus.getEnumByValue(deliver.getDeliverStatus()).getLabel()); } } return getDataTable(resultList); @@ -142,12 +154,12 @@ public class SaDeliverController extends BaseController { // 省市区处理 OrderUtil.handleOrderAddress(areaMap, deliver); - deliver.setDeliverStatusVal(transactionMap.get(EnumsPrefixConstants.DELIVERY_STATUS + deliver.getDeliverStatus())); - deliver.setDeliveryWayVal(transactionMap.get(EnumsPrefixConstants.DELIVERY + deliver.getDeliveryWay())); - deliver.setOperateScopeVal(transactionMap.get(EnumsPrefixConstants.SUPPLY_WAY + deliver.getOperateScope())); - deliver.setOrderTypeVal(transactionMap.get(EnumsPrefixConstants.ORDER_TYPE + deliver.getOrderType())); - deliver.setTranTypeVal(transactionMap.get(EnumsPrefixConstants.ENU_TRA + deliver.getTranType())); - deliver.setShippingChannelVal(transactionMap.get(EnumsPrefixConstants.E_SHIPPING_CHANNEL + deliver.getShippingChannel())); + deliver.setDeliverStatusVal(EDeliveryStatus.getEnumByValue(deliver.getDeliverStatus()).getLabel()); + deliver.setDeliveryWayVal(EDelivery.getLabelByValue(deliver.getDeliveryWay())); + deliver.setOperateScopeVal(ESupplyWay.getLabelByVal(deliver.getOperateScope())); + deliver.setOrderTypeVal(EOrderType.getLabelByValue(deliver.getOrderType())); + deliver.setTranTypeVal(ETransportType.getLabelByValue(deliver.getTranType())); + deliver.setShippingChannelVal(EShippingChannel.getLabelByValue(deliver.getShippingChannel())); } } ExcelUtil util = new ExcelUtil<>(DeliverVO.class); diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/controller/manage/SaDeliverHandledController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/controller/manage/SaDeliverHandledController.java index 5bb99e33..4777fd0d 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/controller/manage/SaDeliverHandledController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/controller/manage/SaDeliverHandledController.java @@ -98,6 +98,22 @@ public class SaDeliverHandledController extends BaseController { for (DeliverHandledVO deliverHandled : resultList) { // 省市区处理 OrderUtil.handleOrderAddress(areaMap, deliverHandled); + // 订单类型枚举转换 + deliverHandled.setOrderTypeVal(EOrderType.getLabelByValue(deliverHandled.getOrderType())); + // 发货类型 + deliverHandled.setShippingChannelVal(EShippingChannel.getLabelByValue(deliverHandled.getShippingChannel())); + // 订单状态 + deliverHandled.setOrderStatusVal(EOrderStatus.getLabelByValue(deliverHandled.getOrderStatus())); + // 发货方式 + deliverHandled.setDeliveryWayVal(EDelivery.getLabelByValue(deliverHandled.getDeliveryWay())); + // 供应方式 + deliverHandled.setOperateScopeVal(ESupplyWay.getLabelByVal(deliverHandled.getOperateScope())); + // 运输方式 + deliverHandled.setTranTypeVal(ETransportType.getLabelByValue(deliverHandled.getTranType())); + // 预售状态 + deliverHandled.setPreSaleStatusVal(EPresaleStatus.getLabelByValue(deliverHandled.getPreSaleStatus())); + // 打印状态 + deliverHandled.setPrintStatusVal(EPrintStatus.getEnumByValue(deliverHandled.getPrintStatus()).getLabel()); } } return getDataTable(resultList); @@ -140,15 +156,22 @@ public class SaDeliverHandledController extends BaseController { for (DeliverHandledVO deliverHandled : resultList) { // 省市区处理 OrderUtil.handleOrderAddress(areaMap, deliverHandled); - - deliverHandled.setOrderStatusVal(transactionMap.get(EnumsPrefixConstants.ORDER_STATUS + deliverHandled.getOrderStatus())); - deliverHandled.setOrderTypeVal(transactionMap.get(EnumsPrefixConstants.ORDER_TYPE + deliverHandled.getOrderType())); - deliverHandled.setDeliveryWayVal(transactionMap.get(EnumsPrefixConstants.DELIVERY + deliverHandled.getDeliveryWay())); - deliverHandled.setOperateScopeVal(transactionMap.get(EnumsPrefixConstants.SUPPLY_WAY + deliverHandled.getOperateScope())); - deliverHandled.setPreSaleStatusVal(transactionMap.get(EnumsPrefixConstants.PRESALE_STATUS + deliverHandled.getPreSaleStatus())); - deliverHandled.setPrintStatusVal(transactionMap.get(EnumsPrefixConstants.E_PRINT_STATUS + deliverHandled.getPrintStatus())); - deliverHandled.setTranTypeVal(transactionMap.get(EnumsPrefixConstants.ENU_TRA + deliverHandled.getTranType())); - deliverHandled.setShippingChannelVal(transactionMap.get(EnumsPrefixConstants.E_SHIPPING_CHANNEL + deliverHandled.getShippingChannel())); + // 订单类型枚举转换 + deliverHandled.setOrderTypeVal(EOrderType.getLabelByValue(deliverHandled.getOrderType())); + // 发货类型 + deliverHandled.setShippingChannelVal(EShippingChannel.getLabelByValue(deliverHandled.getShippingChannel())); + // 订单状态 + deliverHandled.setOrderStatusVal(EOrderStatus.getLabelByValue(deliverHandled.getOrderStatus())); + // 发货方式 + deliverHandled.setDeliveryWayVal(EDelivery.getLabelByValue(deliverHandled.getDeliveryWay())); + // 供应方式 + deliverHandled.setOperateScopeVal(ESupplyWay.getLabelByVal(deliverHandled.getOperateScope())); + // 运输方式 + deliverHandled.setTranTypeVal(ETransportType.getLabelByValue(deliverHandled.getTranType())); + // 预售状态 + deliverHandled.setPreSaleStatusVal(EPresaleStatus.getLabelByValue(deliverHandled.getPreSaleStatus())); + // 打印状态 + deliverHandled.setPrintStatusVal(EPrintStatus.getEnumByValue(deliverHandled.getPrintStatus()).getLabel()); deliverHandled.setRecProvinceVal(deliverHandled.getRecProvinceVal()); deliverHandled.setRecCityVal(StringUtils.isNotEmpty(deliverHandled.getRecCityVal()) ? deliverHandled.getRecCityVal() : ""); diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/vo/DeliverHandledVO.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/vo/DeliverHandledVO.java index 6e53ffc5..d1a1c65e 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/vo/DeliverHandledVO.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/vo/DeliverHandledVO.java @@ -58,7 +58,6 @@ public class DeliverHandledVO { * 订单类型（EOrderType） */ @JsonIgnore - @Transaction(transactionKey = EnumsPrefixConstants.ORDER_TYPE) private Integer orderType; /** * 订单类型显示 @@ -69,7 +68,6 @@ public class DeliverHandledVO { /** * 订单状态（EOrderStatus） */ - @Transaction(transactionKey = EnumsPrefixConstants.ORDER_STATUS) private Integer orderStatus; /** * 订单状态显示 @@ -177,7 +175,6 @@ public class DeliverHandledVO { /** * 发货类型 */ - @Transaction(transactionKey = EnumsPrefixConstants.E_SHIPPING_CHANNEL) @JsonIgnore private Integer shippingChannel; /** @@ -196,7 +193,6 @@ public class DeliverHandledVO { * 打印状态（EPrintStatus） */ @JsonIgnore - @Transaction(transactionKey = EnumsPrefixConstants.E_PRINT_STATUS) private Integer printStatus; /** * 打印状态显示 @@ -215,7 +211,6 @@ public class DeliverHandledVO { * 发货方式（EDelivery） */ @JsonIgnore - @Transaction(transactionKey = EnumsPrefixConstants.DELIVERY) private Integer deliveryWay; /** * 发货方式显示 @@ -228,7 +223,6 @@ public class DeliverHandledVO { * 供应方式（ESupplyWay） */ @JsonIgnore - @Transaction(transactionKey = EnumsPrefixConstants.SUPPLY_WAY) private Integer operateScope; /** * 供应方式显示 @@ -240,7 +234,6 @@ public class DeliverHandledVO { * 运输方式（ETransportType） */ @JsonIgnore - @Transaction(transactionKey = EnumsPrefixConstants.ENU_TRA) private Integer tranType; /** * 运输方式显示 @@ -252,7 +245,6 @@ public class DeliverHandledVO { * 预售状态（EPresaleStatus） */ @JsonIgnore - @Transaction(transactionKey = EnumsPrefixConstants.PRESALE_STATUS) private Integer preSaleStatus; /** * 预售状态显示 diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/vo/DeliverVO.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/vo/DeliverVO.java index c5fdc009..d87bda37 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/vo/DeliverVO.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/vo/DeliverVO.java @@ -41,7 +41,6 @@ public class DeliverVO { * 订单类型（EOrderType） */ @JsonIgnore - @Transaction(transactionKey = EnumsPrefixConstants.ORDER_TYPE) private Integer orderType; /** * 订单类型显示 @@ -54,7 +53,6 @@ public class DeliverVO { * 发货单状态（EDeliveryStatus） */ @JsonIgnore - @Transaction(transactionKey = EnumsPrefixConstants.DELIVERY_STATUS) private Integer deliverStatus; /** * 发货单状态显示 @@ -165,7 +163,6 @@ public class DeliverVO { /** * 发货类型 */ - @Transaction(transactionKey = EnumsPrefixConstants.E_SHIPPING_CHANNEL) private Integer shippingChannel; /** * 发货类型 @@ -195,7 +192,6 @@ public class DeliverVO { * 发货方式（EDelivery） */ @JsonIgnore - @Transaction(transactionKey = EnumsPrefixConstants.DELIVERY) private Integer deliveryWay; /** * 发货方式显示 @@ -207,7 +203,6 @@ public class DeliverVO { * 供应方式（ESupplyWay） */ @JsonIgnore - @Transaction(transactionKey = EnumsPrefixConstants.SUPPLY_WAY) private Integer operateScope; /** * 供应方式显示 @@ -219,7 +214,6 @@ public class DeliverVO { * 运输方式（ETransportType） */ @JsonIgnore - @Transaction(transactionKey = EnumsPrefixConstants.ENU_TRA) private Integer tranType; /** * 运输方式显示 From bf3b59df4470fdb09b1dd278cf58b4459357af37 Mon Sep 17 00:00:00 2001 From: sangelxiu1 <15781802@163.com> Date: Thu, 9 Oct 2025 17:17:48 +0800 Subject: [PATCH 3/3] =?UTF-8?q?##=20Opt=20-=20=E7=A7=BB=E5=8A=A8=E7=AB=AF?= =?UTF-8?q?=E5=B8=82=E5=9C=BA=E5=8A=A8=E6=80=81=E6=80=BB=E4=B8=9A=E7=BB=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../retail/member/utils/DataStatisticsUtil.java | 16 ++++++++-------- .../member/achieve/CuMemberRetailRangeMapper.xml | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) 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 fc19173b..e4e6dcab 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 @@ -47,7 +47,7 @@ public class DataStatisticsUtil { // addVirtualBranch(detailVOList, pkId); // CuMemberRetailDataStatisticsDetailVO total = getDetailVOByPKID(detailVOList, pkId); CuMemberRetailDataStatisticsDetailVO total = CuMemberRetailDataStatisticsDetailVO.builder() - .totalPv(detailVOList.stream().map(CuMemberRetailDataStatisticsDetailVO::getConsumePv).reduce(BigDecimal.ZERO, BigDecimal::add)) + .totalPv(detailVOList.stream().map(CuMemberRetailDataStatisticsDetailVO::getTotalPv).reduce(BigDecimal.ZERO, BigDecimal::add)) .build(); // if (EYesNo.NO.getIntValue() == cuMember.getIsActivate()) { // // 昨日非激活 排除昨日日结表数据 @@ -72,17 +72,17 @@ public class DataStatisticsUtil { */ public static void calcDetailVOTotalField(List detailVOList, Long pkId) { detailVOList.forEach(detailVO -> { -// detailVO.setTotalPv( -// detailVO.getConsumePv() -// .add(detailVO.getTeamConsumePv()) -// .add(detailVO.getSNewConsumePv()) -// .add(detailVO.getSTeamNewPv()) -// ); detailVO.setTotalPv( - detailVO.getTeamConsumePv() + detailVO.getConsumePv() + .add(detailVO.getTeamConsumePv()) .add(detailVO.getSNewConsumePv()) .add(detailVO.getSTeamNewPv()) ); +// detailVO.setTotalPv( +// detailVO.getTeamConsumePv() +// .add(detailVO.getSNewConsumePv()) +// .add(detailVO.getSTeamNewPv()) +// ); }); } diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberRetailRangeMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberRetailRangeMapper.xml index 3e586aec..b6548be6 100644 --- a/bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberRetailRangeMapper.xml +++ b/bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberRetailRangeMapper.xml @@ -455,7 +455,7 @@ NVL( mr.CONSUME_PV, 0 ) consumePv, 0 newConsumePv, - NVL( mr.TEAM_CONSUME_PV, 0 ) + NVL( mr.CONSUME_PV, 0 ) teamConsumePv, + NVL( mr.TEAM_CONSUME_PV, 0 ) teamConsumePv, 0 teamNewPv, 0 sNewConsumePv,