diff --git a/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/dto/MerchantStatisticsDTO.java b/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/dto/MerchantStatisticsDTO.java index 23aa095c9..fc6c153f3 100644 --- a/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/dto/MerchantStatisticsDTO.java +++ b/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/dto/MerchantStatisticsDTO.java @@ -35,6 +35,7 @@ public class MerchantStatisticsDTO implements Serializable { private Integer syncFeeSstatus; private Integer signStatus; + private Integer isAftersales; private String waybillNo; private String orderCode; diff --git a/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/entity/StatisticsReconciliationOrderInfoEntity.java b/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/entity/StatisticsReconciliationOrderInfoEntity.java index 91f3aab5e..535118854 100644 --- a/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/entity/StatisticsReconciliationOrderInfoEntity.java +++ b/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/entity/StatisticsReconciliationOrderInfoEntity.java @@ -62,6 +62,7 @@ public class StatisticsReconciliationOrderInfoEntity extends TenantEntity { private BigDecimal totalWeight;//总重量 private BigDecimal totalVolume;//总体积 + private BigDecimal systemTotalFee;//开单预估价 private BigDecimal realTotalFee;//实际费用 private BigDecimal pickupFee;//提货费 private BigDecimal freightFee;//运费 diff --git a/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/vo/StatisticsOrderInfoVO.java b/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/vo/StatisticsOrderInfoVO.java index 9770ccfdf..68e6f5094 100644 --- a/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/vo/StatisticsOrderInfoVO.java +++ b/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/vo/StatisticsOrderInfoVO.java @@ -44,6 +44,9 @@ public class StatisticsOrderInfoVO implements Serializable { private BigDecimal totalWeight;//订单重量 private BigDecimal totalVolume;//订单体积 + private BigDecimal sysTotalFee; + private BigDecimal totalFee; + private BigDecimal systemFreightPrice; private BigDecimal freightPrice; private BigDecimal systemPickupPrice; diff --git a/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/vo/StatisticsReconciliationOrderInfoVO.java b/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/vo/StatisticsReconciliationOrderInfoVO.java new file mode 100644 index 000000000..0766af01b --- /dev/null +++ b/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/vo/StatisticsReconciliationOrderInfoVO.java @@ -0,0 +1,15 @@ +package com.logpm.statistics.vo; + +import com.logpm.statistics.entity.StatisticsReconciliationOrderInfoEntity; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +@Data +public class StatisticsReconciliationOrderInfoVO extends StatisticsReconciliationOrderInfoEntity { + + + private List list = new ArrayList<>(); + +} diff --git a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/controller/MerchantStatisticsController.java b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/controller/MerchantStatisticsController.java index 60100695c..411a27371 100644 --- a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/controller/MerchantStatisticsController.java +++ b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/controller/MerchantStatisticsController.java @@ -8,9 +8,10 @@ import com.logpm.statistics.dto.MerchantStatisticsDTO; import com.logpm.statistics.entity.StatisticsReconciliationOrderInfoEntity; import com.logpm.statistics.service.IStatisticsOrderInfoService; import com.logpm.statistics.service.IStatisticsReconciliationOrderInfoService; -import com.logpm.statistics.vo.StatisticsChangesRecordVO; import com.logpm.statistics.vo.StatisticsOrderInfoExportVO; import com.logpm.statistics.vo.StatisticsOrderInfoVO; +import com.logpm.statistics.vo.StatisticsReconciliationInfoExportVO; +import com.logpm.statistics.vo.StatisticsReconciliationOrderInfoVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; @@ -125,12 +126,12 @@ public class MerchantStatisticsController { @ApiOperationSupport(order = 1) @ApiOperation(value = "对账单列表导出", notes = "传入merchantStatisticsDTO") public void reconciliationListExport(@RequestBody MerchantStatisticsDTO merchantStatisticsDTO, HttpServletResponse response) { - String method = "############orderInfoListExport: "; + String method = "############reconciliationListExport: "; log.info(method + "请求参数{}", merchantStatisticsDTO); - //TODO 做到这个了 -// List ls = reconciliationOrderInfoService.reconciliationListExport(merchantStatisticsDTO); -// //导出ls -// ExcelUtil.export(response, "对账单数据", "对账单数据", ls, StatisticsReconciliationOrderInfoExportVO.class); + + List ls = reconciliationOrderInfoService.reconciliationListExport(merchantStatisticsDTO); + //导出ls + ExcelUtil.export(response, "对账单数据", "对账单数据", ls, StatisticsReconciliationInfoExportVO.class); } @@ -206,9 +207,9 @@ public class MerchantStatisticsController { return R.fail(405, "对账单id为空"); } - List list = statisticsOrderInfoService.findChangesRecordList(merchantStatisticsDTO); + StatisticsReconciliationOrderInfoVO reconciliationOrderInfo = statisticsOrderInfoService.findChangesRecordList(merchantStatisticsDTO); - return R.data(list); + return R.data(reconciliationOrderInfo); } catch (CustomerException e) { log.error(e.message, e); return R.fail(e.code, e.message); @@ -233,11 +234,11 @@ public class MerchantStatisticsController { return R.fail(405, "对账单id为空"); } - Long statisticsWarehouseId = changesRecordDTO.getStatisticsWarehouseId(); - if (Objects.isNull(statisticsWarehouseId)) { - log.warn(method + "仓库id为空 statisticsWarehouseId={}", statisticsWarehouseId); - return R.fail(405, "仓库id为空"); - } +// Long statisticsWarehouseId = changesRecordDTO.getStatisticsWarehouseId(); +// if (Objects.isNull(statisticsWarehouseId)) { +// log.warn(method + "仓库id为空 statisticsWarehouseId={}", statisticsWarehouseId); +// return R.fail(405, "仓库id为空"); +// } return statisticsOrderInfoService.addChangesRecord(changesRecordDTO); diff --git a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/listener/mq/PackageFanoutListener.java b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/listener/mq/PackageFanoutListener.java index 69637ae97..b94c2240e 100644 --- a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/listener/mq/PackageFanoutListener.java +++ b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/listener/mq/PackageFanoutListener.java @@ -91,6 +91,7 @@ public class PackageFanoutListener { } } statisticsDistributionPackageEntity.setIsSign(1); + statisticsDistributionPackageEntity.setSignNum(statisticsDistributionPackageEntity.getNum()); statisticsDistributionPackageEntity.setSignTime(new Date()); Long orderInfoId = statisticsDistributionPackageEntity.getOrderInfoId(); StatisticsOrderInfoEntity orderInfoEntity = statisticsOrderInfoService.getById(orderInfoId); diff --git a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/StatisticsOrderInfoMapper.xml b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/StatisticsOrderInfoMapper.xml index f5c30d11f..c3552b750 100644 --- a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/StatisticsOrderInfoMapper.xml +++ b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/StatisticsOrderInfoMapper.xml @@ -36,13 +36,14 @@ lsoi.create_reconciliation_date createReconciliationDate, lsoi.cycle cycle, lsoi.warehouse_fee_interval warehouseFeeInterval, - lsoi.sync_fee_status syncFeeSstatus, + lsoi.sync_fee_status syncFeeStatus, lsoi.sync_fee_date syncFeeDate, lbc.clean_obj_type cleanObjType from logpm_statistics_order_info lsoi left join logpm_basicdata_client lbc on lbc.id = lsoi.consignee_id left join logpm_warehouse_waybill lww on lww.id = lsoi.waybill_id where 1=1 + and lsoi.create_reconciliation_order_status = 0 and lsoi.type_service != '2' @@ -424,8 +425,8 @@ IFNULL(sum(lsdp.delivery_other_fee),0) deliveryOtherFee, IFNULL(sum(lsdp.delivery_crossing_fee),0) deliveryCrossingFee from logpm_statistics_trunkline_package lstp - left join logpm_statistics_warehouse_package lswp on lswp.order_info_id = lstp.order_info_id and lswp.order_package_code = lstp.order_package_code and lswp.product_id = lstp.product_id - left join logpm_statistics_distribution_package lsdp on lsdp.order_info_id = lswp.order_info_id and lsdp.order_package_code = lswp.order_package_code and lswp.product_id = lsdp.product_id + left join logpm_statistics_warehouse_package lswp on lswp.order_info_id = lstp.order_info_id and IFNULL(lswp.order_package_code,0) = IFNULL(lstp.order_package_code,0) and IFNULL(lswp.product_id,1) = IFNULL(lstp.product_id,1) + left join logpm_statistics_distribution_package lsdp on lsdp.order_info_id = lswp.order_info_id and IFNULL(lsdp.order_package_code,0) = IFNULL(lswp.order_package_code,0) and IFNULL(lswp.product_id,1) = IFNULL(lsdp.product_id,1) where lstp.order_info_id in #{item} @@ -461,8 +462,8 @@ IFNULL(sum(lsdp.sign_num),0) signNum, max(lsdp.sign_time) signTime from logpm_statistics_trunkline_package lstp - left join logpm_statistics_warehouse_package lswp on lswp.order_info_id = lstp.order_info_id and lswp.order_package_code = lstp.order_package_code and lswp.product_id = lstp.product_id - left join logpm_statistics_distribution_package lsdp on lsdp.order_info_id = lswp.order_info_id and lsdp.order_package_code = lswp.order_package_code and lswp.product_id = lsdp.product_id + left join logpm_statistics_warehouse_package lswp on lswp.order_info_id = lstp.order_info_id and IFNULL(lswp.order_package_code,'0') = IFNULL(lstp.order_package_code,'0') and IFNULL(lswp.product_id,1) = IFNULL(lstp.product_id,1) + left join logpm_statistics_distribution_package lsdp on lsdp.order_info_id = lswp.order_info_id and IFNULL(lsdp.order_package_code,'0') = IFNULL(lswp.order_package_code,'0') and IFNULL(lswp.product_id,1) = IFNULL(lsdp.product_id,1) where lstp.order_info_id in #{item} diff --git a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/StatisticsReconciliationOrderInfoMapper.java b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/StatisticsReconciliationOrderInfoMapper.java index df4379184..8d117da8c 100644 --- a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/StatisticsReconciliationOrderInfoMapper.java +++ b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/StatisticsReconciliationOrderInfoMapper.java @@ -4,10 +4,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.statistics.dto.MerchantStatisticsDTO; import com.logpm.statistics.entity.StatisticsReconciliationOrderInfoEntity; +import com.logpm.statistics.vo.StatisticsReconciliationInfoExportVO; import org.apache.ibatis.annotations.Param; import org.mapstruct.Mapper; import java.math.BigDecimal; +import java.util.List; @Mapper public interface StatisticsReconciliationOrderInfoMapper extends BaseMapper { @@ -16,4 +18,6 @@ public interface StatisticsReconciliationOrderInfoMapper extends BaseMapper pageReconciliationList(IPage page, @Param("param")MerchantStatisticsDTO merchantStatisticsDTO); void addAftersalesFeeById(@Param("reconciliationOrderId") Long reconciliationOrderId, @Param("aftersalesFee") BigDecimal aftersalesFee); + + List reconciliationListExport(IPage page, @Param("param") MerchantStatisticsDTO merchantStatisticsDTO); } diff --git a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/StatisticsReconciliationOrderInfoMapper.xml b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/StatisticsReconciliationOrderInfoMapper.xml index 5fe4aeea7..58ffb11ff 100644 --- a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/StatisticsReconciliationOrderInfoMapper.xml +++ b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/StatisticsReconciliationOrderInfoMapper.xml @@ -6,7 +6,7 @@ @@ -35,4 +40,69 @@ + + diff --git a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/IStatisticsOrderInfoService.java b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/IStatisticsOrderInfoService.java index 4402e4a9d..5d6089a44 100644 --- a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/IStatisticsOrderInfoService.java +++ b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/IStatisticsOrderInfoService.java @@ -4,10 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.statistics.dto.ChangesRecordDTO; import com.logpm.statistics.dto.MerchantStatisticsDTO; import com.logpm.statistics.entity.StatisticsOrderInfoEntity; -import com.logpm.statistics.vo.StatisticsChangesRecordVO; -import com.logpm.statistics.vo.StatisticsOrderInfoExportVO; -import com.logpm.statistics.vo.StatisticsOrderInfoVO; -import com.logpm.statistics.vo.StatisticsPackageFeeInfoVO; +import com.logpm.statistics.vo.*; import org.springblade.core.mp.base.BaseService; import org.springblade.core.tool.api.R; @@ -21,7 +18,7 @@ public interface IStatisticsOrderInfoService extends BaseService pageList(MerchantStatisticsDTO merchantStatisticsDTO); - List findChangesRecordList(MerchantStatisticsDTO merchantStatisticsDTO); + StatisticsReconciliationOrderInfoVO findChangesRecordList(MerchantStatisticsDTO merchantStatisticsDTO); R addChangesRecord(ChangesRecordDTO changesRecordDTO); diff --git a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/IStatisticsReconciliationOrderInfoService.java b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/IStatisticsReconciliationOrderInfoService.java index 3a12dff5e..3193e4d7a 100644 --- a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/IStatisticsReconciliationOrderInfoService.java +++ b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/IStatisticsReconciliationOrderInfoService.java @@ -3,12 +3,16 @@ package com.logpm.statistics.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.statistics.dto.MerchantStatisticsDTO; import com.logpm.statistics.entity.StatisticsReconciliationOrderInfoEntity; +import com.logpm.statistics.vo.StatisticsReconciliationInfoExportVO; import org.springblade.core.mp.base.BaseService; import java.math.BigDecimal; +import java.util.List; public interface IStatisticsReconciliationOrderInfoService extends BaseService { IPage pageReconciliationList(MerchantStatisticsDTO merchantStatisticsDTO); void addAftersalesFeeById(Long reconciliationOrderId, BigDecimal aftersalesFee); + + List reconciliationListExport(MerchantStatisticsDTO merchantStatisticsDTO); } diff --git a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/StatisticsOrderInfoServiceImpl.java b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/StatisticsOrderInfoServiceImpl.java index 84bcd07c3..35fb76b68 100644 --- a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/StatisticsOrderInfoServiceImpl.java +++ b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/StatisticsOrderInfoServiceImpl.java @@ -19,10 +19,7 @@ import com.logpm.statistics.dto.MerchantStatisticsDTO; import com.logpm.statistics.entity.*; import com.logpm.statistics.mapper.StatisticsOrderInfoMapper; import com.logpm.statistics.service.*; -import com.logpm.statistics.vo.StatisticsChangesRecordVO; -import com.logpm.statistics.vo.StatisticsOrderInfoExportVO; -import com.logpm.statistics.vo.StatisticsOrderInfoVO; -import com.logpm.statistics.vo.StatisticsPackageFeeInfoVO; +import com.logpm.statistics.vo.*; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.common.enums.BooleanZeroOneEnums; @@ -100,39 +97,50 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl findChangesRecordList(MerchantStatisticsDTO merchantStatisticsDTO) { + public StatisticsReconciliationOrderInfoVO findChangesRecordList(MerchantStatisticsDTO merchantStatisticsDTO) { Long reconciliationOrderId = merchantStatisticsDTO.getReconciliationOrderId(); + StatisticsReconciliationOrderInfoEntity reconciliationOrderInfo = reconciliationOrderInfoService.getById(reconciliationOrderId); + + StatisticsReconciliationOrderInfoVO statisticsReconciliationOrderInfoVO = new StatisticsReconciliationOrderInfoVO(); + + BeanUtil.copy(reconciliationOrderInfo, statisticsReconciliationOrderInfoVO); + QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("reconciliation_order_id", reconciliationOrderId); List list = changesRecordService.list(queryWrapper); - if (list.isEmpty()) { - return CollUtil.newArrayList(); + + + if (CollUtil.isNotEmpty(list)) { + + // 获取list中所有元素的id + List changesRecordIdList = list.stream().map(StatisticsChangesRecordEntity::getId).collect(Collectors.toList()); + + QueryWrapper changesPhotoEntityQueryWrapper = new QueryWrapper<>(); + changesPhotoEntityQueryWrapper.in("changes_record_id", changesRecordIdList); + + List changesPhotoEntityList = changesPhotoService.list(changesPhotoEntityQueryWrapper); + // 把changesPhotoEntityList中的元素通过changesRecordId为key进行分组 + Map> groupedEntities = + changesPhotoEntityList.stream() + .collect(Collectors.groupingBy(StatisticsChangesPhotoEntity::getChangesRecordId)); + + List ls = new ArrayList<>(); + list.forEach(statisticsChangesRecordEntity -> { + StatisticsChangesRecordVO statisticsChangesRecordVO = new StatisticsChangesRecordVO(); + BeanUtil.copy(statisticsChangesRecordEntity, statisticsChangesRecordVO); + List statisticsChangesPhotoEntities = groupedEntities.get(statisticsChangesRecordEntity.getId()); + statisticsChangesRecordVO.setChangesPhotoEntityList(statisticsChangesPhotoEntities); + ls.add(statisticsChangesRecordVO); + }); + statisticsReconciliationOrderInfoVO.setList(ls); + } - // 获取list中所有元素的id - List changesRecordIdList = list.stream().map(StatisticsChangesRecordEntity::getId).collect(Collectors.toList()); - - QueryWrapper changesPhotoEntityQueryWrapper = new QueryWrapper<>(); - changesPhotoEntityQueryWrapper.in("changes_record_id", changesRecordIdList); - - List changesPhotoEntityList = changesPhotoService.list(changesPhotoEntityQueryWrapper); - // 把changesPhotoEntityList中的元素通过changesRecordId为key进行分组 - Map> groupedEntities = - changesPhotoEntityList.stream() - .collect(Collectors.groupingBy(StatisticsChangesPhotoEntity::getChangesRecordId)); - - List ls = new ArrayList<>(); - list.forEach(statisticsChangesRecordEntity -> { - StatisticsChangesRecordVO statisticsChangesRecordVO = new StatisticsChangesRecordVO(); - BeanUtil.copy(statisticsChangesRecordEntity, statisticsChangesRecordVO); - List statisticsChangesPhotoEntities = groupedEntities.get(statisticsChangesRecordEntity.getId()); - statisticsChangesRecordVO.setChangesPhotoEntityList(statisticsChangesPhotoEntities); - ls.add(statisticsChangesRecordVO); - }); - return ls; + + return statisticsReconciliationOrderInfoVO; } @Override @@ -395,6 +403,11 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl { - entity.setDeliveryServiceFee(entity.getDeliveryFee() - .add(entity.getDeliveryLoadingFee()) - .add(entity.getDeliveryMoveFee()) - .add(entity.getDeliveryCrossingFee()) - .add(entity.getDeliverySortingFee()) - .add(entity.getDeliveryUpfloorFee())); - }); - distributionPackageService.saveOrUpdateBatch(distributionPackageEntities); - } + } + + // 保存配送包件信息 + if (CollUtil.isNotEmpty(distributionPackageEntities)) { + // 计算配送服务费 realDeliveryServiceFee = 所有real费用的和 + distributionPackageEntities.stream().forEach(entity -> { + entity.setDeliveryServiceFee(entity.getDeliveryFee() + .add(entity.getDeliveryLoadingFee()) + .add(entity.getDeliveryMoveFee()) + .add(entity.getDeliveryCrossingFee()) + .add(entity.getDeliverySortingFee()) + .add(entity.getDeliveryUpfloorFee())); + }); + distributionPackageService.saveOrUpdateBatch(distributionPackageEntities); } } } diff --git a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/StatisticsReconciliationOrderInfoServiceImpl.java b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/StatisticsReconciliationOrderInfoServiceImpl.java index 205a5cbff..d575e03fc 100644 --- a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/StatisticsReconciliationOrderInfoServiceImpl.java +++ b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/StatisticsReconciliationOrderInfoServiceImpl.java @@ -6,6 +6,7 @@ import com.logpm.statistics.dto.MerchantStatisticsDTO; import com.logpm.statistics.entity.StatisticsReconciliationOrderInfoEntity; import com.logpm.statistics.mapper.StatisticsReconciliationOrderInfoMapper; import com.logpm.statistics.service.IStatisticsReconciliationOrderInfoService; +import com.logpm.statistics.vo.StatisticsReconciliationInfoExportVO; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.common.utils.CommonUtil; @@ -13,6 +14,8 @@ import org.springblade.core.mp.base.BaseServiceImpl; import org.springframework.stereotype.Service; import java.math.BigDecimal; +import java.util.Collections; +import java.util.List; @Service @Slf4j @@ -35,4 +38,16 @@ public class StatisticsReconciliationOrderInfoServiceImpl extends BaseServiceImp public void addAftersalesFeeById(Long reconciliationOrderId, BigDecimal aftersalesFee) { baseMapper.addAftersalesFeeById(reconciliationOrderId,aftersalesFee); } + + @Override + public List reconciliationListExport(MerchantStatisticsDTO merchantStatisticsDTO) { + IPage page = new Page<>(); + page.setCurrent(merchantStatisticsDTO.getPageNum()); + page.setSize(merchantStatisticsDTO.getPageSize()); + + merchantStatisticsDTO.setOpenTimeStart(CommonUtil.getStartByDateStr(merchantStatisticsDTO.getOpenTimeStartStr())); + merchantStatisticsDTO.setOpenTimeEnd(CommonUtil.getEndByDateStr(merchantStatisticsDTO.getOpenTimeEndStr())); + + return baseMapper.reconciliationListExport(page, merchantStatisticsDTO); + } } diff --git a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/vo/StatisticsReconciliationInfoExportVO.java b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/vo/StatisticsReconciliationInfoExportVO.java new file mode 100644 index 000000000..c4303cf7d --- /dev/null +++ b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/vo/StatisticsReconciliationInfoExportVO.java @@ -0,0 +1,117 @@ +package com.logpm.statistics.vo; + +import com.alibaba.excel.annotation.ExcelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; + +@Data +public class StatisticsReconciliationInfoExportVO implements Serializable { + + @ExcelProperty(value = "对账单号") + private String reconciliationOrderNo;//对账单号 + + @ExcelProperty(value = "订单编号") + private String orderCode;//订单号 + + @ExcelProperty(value = "运单号") + private String waybillNo;//运单号 + + @ExcelProperty(value = "收货单位") + private String consignee;//收货单位 + + @ExcelProperty(value = "总数量") + private Integer totalNum;//总数量 + + @ExcelProperty(value = "总重量") + private BigDecimal totalWeight;//总重量 + + @ExcelProperty(value = "总体积") + private BigDecimal totalVolume;//总体积 + + @ExcelProperty(value = "开单预估价") + private BigDecimal systemTotalFee;//开单预估价 + + @ExcelProperty(value = "实际费用") + private BigDecimal realTotalFee;//实际费用 + + @ExcelProperty(value = "提货费") + private BigDecimal pickupFee;//提货费 + + @ExcelProperty(value = "运费") + private BigDecimal freightFee;//运费 + + @ExcelProperty(value = "仓库服务费") + private BigDecimal warehouseServiceFee;//仓库服务费 + + @ExcelProperty(value = "仓储费") + private BigDecimal warehouseFee;//仓储费 + + @ExcelProperty(value = "仓储管理费") + private BigDecimal warehouseManageFee;//仓储管理费 + + @ExcelProperty(value = "仓储分拣费") + private BigDecimal warehouseSortingFee;//仓储分拣费 + + @ExcelProperty(value = "仓储操作费") + private BigDecimal warehouseOperatingFee;//仓储操作费 + + @ExcelProperty(value = "配送服务费") + private BigDecimal deliveryServiceFee;//配送服务费 + + @ExcelProperty(value = "开单配送费") + private BigDecimal deliveryFee;//配送费 + + @ExcelProperty(value = "配送装卸费") + private BigDecimal deliveryLoadingFee;//配送装卸费 + + @ExcelProperty(value = "配送分货费") + private BigDecimal deliverySortingFee;//配送分货费 + + @ExcelProperty(value = "配送上楼费") + private BigDecimal deliveryUpfloorFee;//配送上楼费 + + @ExcelProperty(value = "配送平移费") + private BigDecimal deliveryMoveFee;//配送平移费 + + @ExcelProperty(value = "配送超区费") + private BigDecimal deliveryCrossingFee;//超区费 + + @ExcelProperty(value = "安装费") + private BigDecimal installFee;//安装费 + + @ExcelProperty(value = "其他费") + private BigDecimal otherFee;//其他费 + + @ExcelProperty(value = "目的仓") + private String destinationWarehouseName;//目的仓名称 + + @ExcelProperty(value = "是否售后") + private String isAftersale;//是否有售后 + + @ExcelProperty(value = "售后单号") + private String aftersaleOrder;//售后单号 + + @ExcelProperty(value = "售后金额") + private BigDecimal aftersalesFee;//售后金额 + + @ExcelProperty(value = "对账单金额") + private BigDecimal totalFee;//对账单金额 + + @ExcelProperty(value = "对账单创建人") + private String createUserName; + + @ExcelProperty(value = "是否异动") + private String isChanges;//是否有异动 0 否 1是 + + @ExcelProperty(value = "异动金额") + private BigDecimal changesFee;//异动金额 + + @ExcelProperty(value = "异动栏目") + private String changesItems;//异动栏目 + + @ExcelProperty(value = "异动备注") + private String changesRemark;//异动备注 + +}