angelo
/
java-zk-app
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
cabbage 2025-10-10 09:40:41 +08:00
parent 9d20405ca8 58ef72207a
commit e558f3ad5c
7 changed files with 70 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/impl/CuMemberRetailAchieveServiceImpl.java
View File

@ -348,7 +348,7 @@ public class CuMemberRetailAchieveServiceImpl extends ServiceImpl<CuMemberRetail
String memberSecondTable = getDayTableNameSpecial();
//查询直推会员
List<Long> pkMemberList = baseMapper.selectDirectPushByPkMember(pkMember, systemType);
pkMemberList.add(userId);
// pkMemberList.add(userId);
CuMemberRetailAchieveVO memberAchieveVO = CuMemberRetailAchieveVO.builder()
.memberRetailTable(memberRetailTable)
.memberRetailSTable(memberSecondTable)

33
bd-business/bd-business-member/src/main/java/com/hzs/retail/member/utils/DataStatisticsUtil.java
View File

@ -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::getTotalPv).reduce(BigDecimal.ZERO, BigDecimal::add))
.build();
// if (EYesNo.NO.getIntValue() == cuMember.getIsActivate()) {
// // 昨日非激活 排除昨日日结表数据
// excludeDailySettlementData(detailVOList);
@ -69,17 +72,17 @@ public class DataStatisticsUtil {
*/
public static void calcDetailVOTotalField(List<CuMemberRetailDataStatisticsDetailVO> 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())
// );
});
}

2
bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberRetailRangeMapper.xml
View File

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

24
bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/controller/manage/SaDeliverController.java
View File

@ -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<DeliverVO> util = new ExcelUtil<>(DeliverVO.class);

41
bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/controller/manage/SaDeliverHandledController.java
View File

@ -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() : "");

8
bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/vo/DeliverHandledVO.java
View File

@ -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;
/**
* 预售状态显示

6
bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/vo/DeliverVO.java
View File

@ -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;
/**
* 运输方式显示