java_project
/
logisticsplatform-service
4
0
Fork 0
Code Issues Pull Requests Activity
Browse Source

fix： 

1.修复预对账单的导出
2.增加运单开单的默认支付和默认结算值
master
pref_mail@163.com 3 months ago
parent
8910fbf99c
commit
6115e9bb7c
5 changed files with 343 additions and 46 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/StatisticsOrderInfoMapper.java
  2. 150
      blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/StatisticsOrderInfoMapper.xml
  3. 161
      blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/StatisticsOrderInfoServiceImpl.java
  4. 71
      blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/vo/StatisticsOrderInfoExportVO.java
  5. 6
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java

1
blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/StatisticsOrderInfoMapper.java
Unescape View File

@ -51,4 +51,5 @@ public interface StatisticsOrderInfoMapper extends BaseMapper<StatisticsOrderInf
List<AdvanceDetailDTO> selectAdvinceDetail(@Param("waybillIds") Set<Long> waybillIds, @Param("orderCodes") Set<String> orderCodes);
IPage<StatisticsOrderInfoVO> pageList2B(IPage<Object> page, @Param("param") MerchantStatisticsDTO merchantStatisticsDTO);
List<StatisticsOrderInfoVO> pageList2BNoPage( @Param("param") MerchantStatisticsDTO merchantStatisticsDTO);
}

150
blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/StatisticsOrderInfoMapper.xml
Unescape View File

@ -775,6 +775,156 @@
group by lsoi.waybill_id
</select>
<select id="pageList2BNoPage" resultType="com.logpm.statistics.vo.StatisticsOrderInfoVO">
select lsoi.id orderInfoId,
lsoi.brand_id brandId,
lsoi.brand brand,
lsoi.waybill_id waybillId,
lsoi.waybill_no waybillNo,
lww.order_no orderCode,
lsoi.type_service typeService,
lww.shipper shipper,
lww.shipper_name shipperPerson,
lww.shipper_mobile shipperMobile,
lww.shipper_address shipperAddress,
lww.consignee consignee,
lww.consignee_name consigneePerson,
lww.consignee_mobile consigneeMobile,
lww.consignee_address consigneeAddress,
case lww.waybill_status
when 100 then 2
when 90 then 1
else 0
end
as signStatus,
lww.sign_time signTime,
lww.sign_num signNum,
lww.create_time openTime,
lww.departure departure,
lww.destination destination,
lsoi.departure_warehouse_id departureWarehouseId,
lsoi.departure_warehouse_name departureWarehouseName,
lsoi.destination_warehouse_id destinationWarehouseId,
lsoi.destination_warehouse_name destinationWarehouseName,
lww.delivery_method deliveryMethod,
lww.customer_train customerTrain,
lww.pay_type payType,
lww.pay_way payWay,
lsoi.create_reconciliation_order_status createReconciliationOrderStatus,
lsoi.create_reconciliation_user_name createReconciliationUserName,
lsoi.create_reconciliation_date createReconciliationDate,
lsoi.cycle cycle,
lsoi.warehouse_fee_interval warehouseFeeInterval,
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
<if test="param.listType == 1">
and lsoi.type_service != '2'
</if>
<if test="param.listType == 2">
and lsoi.type_service = '2'
</if>
<if test="param.consignee != null and param.consignee != '' ">
and Locate(#{param.consignee},lww.consignee) > 0
</if>
<if test="param.confirmStatisticsOrder != null">
and lsoi.confirm_statistics_order = #{param.confirmStatisticsOrder}
</if>
<if test="param.syncFeeSstatus != null">
and lsoi.sync_fee_status = #{param.syncFeeSstatus}
</if>
<if test="param.signStatus != null">
and CASE
lww.waybill_status
WHEN 100 THEN
2
WHEN 90 THEN
1 ELSE 0
END = #{param.signStatus}
</if>
<if test="param.signStatuses != null">
and CASE
lww.waybill_status
WHEN 100 THEN
2
WHEN 90 THEN
1 ELSE 0
END in
<foreach collection="param.signStatuses" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="param.waybillNo != null and param.waybillNo != '' ">
and Locate(#{param.waybillNo},lww.waybill_no) > 0
</if>
<if test="param.orderCode != null and param.orderCode != '' ">
and Locate(#{param.orderCode},lww.order_no) > 0
</if>
<if test="param.shipper != null and param.shipper != '' ">
and Locate(#{param.shipper},lww.shipper) > 0
</if>
<if test="param.departureWarehouseName != null and param.departureWarehouseName != '' ">
and Locate(#{param.departureWarehouseName},lsoi.departure_warehouse_name) > 0
</if>
<if test="param.destinationWarehouseName != null and param.destinationWarehouseName != '' ">
and Locate(#{param.destinationWarehouseName},lsoi.destination_warehouse_name) > 0
</if>
<if test="param.typeService != null">
and lsoi.type_service = #{param.typeService}
</if>
<if test="param.openTimeStart != null">
and lww.document_making_time &gt;= #{param.openTimeStart}
</if>
<if test="param.openTimeEnd != null">
and lww.document_making_time &lt;= #{param.openTimeEnd}
</if>
<if test="param.signTimeStart != null">
and lww.sign_time &gt;= #{param.signTimeStart}
</if>
<if test="param.signTimeEnd != null">
and lww.sign_time &lt;= #{param.signTimeEnd}
</if>
<if test="param.syncFeeDateStart != null">
and lsoi.sync_fee_date &gt;= #{param.syncFeeDateStart}
</if>
<if test="param.syncFeeDateEnd != null">
and lsoi.sync_fee_date &lt;= #{param.syncFeeDateEnd}
</if>
<if test="param.shipperPerson != null and param.shipperPerson != '' ">
and Locate(#{param.shipperPerson},lww.shipper_person) > 0
</if>
<if test="param.shipperMoblie != null and param.shipperMoblie != '' ">
and Locate(#{param.shipperMoblie},lww.shipper_mobile) > 0
</if>
<if test="param.consigneePerson != null and param.consigneePerson != '' ">
and Locate(#{param.consigneePerson},lww.consignee_name) > 0
</if>
<if test="param.consigneeMobile != null and param.consigneeMobile != '' ">
and Locate(#{param.consigneeMobile},lww.consignee_mobile) > 0
</if>
<if test="param.cleanObjType != null and param.cleanObjType != '' ">
and lbc.clean_obj_type = #{param.cleanObjType}
</if>
<if test="param.payType != null and param.payType != '' ">
and lww.pay_type = #{param.payType}
</if>
<if test="param.payWay != null and param.payWay != '' ">
and lww.pay_way = #{param.payWay}
</if>
and lsoi.destination_warehouse_id in
<foreach collection="param.warehouseIds" item="item" open="(" separator="," close=")">
#{item}
</foreach>
group by lsoi.waybill_id
</select>
<delete id="deleteDataByWaybillId" >
delete from logpm_statistics_order_info

161
blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/StatisticsOrderInfoServiceImpl.java
Unescape View File

@ -36,6 +36,8 @@ import com.logpm.warehouse.feign.IWarehouseWaybillClient;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.jetbrains.annotations.NotNull;
import org.springblade.common.constant.DictBizConstant;
import org.springblade.common.constant.DistributionTypeConstant;
import org.springblade.common.enums.BooleanZeroOneEnums;
import org.springblade.common.exception.CustomerException;
import org.springblade.common.utils.CommonUtil;
@ -45,6 +47,7 @@ import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.StringUtil;
import org.springblade.system.cache.DictBizCache;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
@ -1289,23 +1292,157 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl<StatisticsOr
@Override
public List<StatisticsOrderInfoExportVO> orderInfoListExport(MerchantStatisticsDTO merchantStatisticsDTO) {
List<StatisticsOrderInfoExportVO> records = baseMapper.orderInfoListExport(merchantStatisticsDTO);
//把records中所有的orderInfoId放入一个集合
List<Long> orderInfoIdList = records.stream().map(StatisticsOrderInfoExportVO::getOrderInfoId).collect(Collectors.toList());
List<StatisticsPackageFeeInfoVO> orderPackageInfoList = baseMapper.findPackageListByOrderIdsGroupById(orderInfoIdList);
//把orderPackageInfoList转化成以orderInfoId为key的Map
Map<Long, StatisticsPackageFeeInfoVO> orderPackageInfoMap = orderPackageInfoList.stream()
.collect(Collectors.toMap(StatisticsPackageFeeInfoVO::getOrderInfoId, statisticsPackageFeeInfoVO -> statisticsPackageFeeInfoVO));
List<StatisticsOrderInfoExportVO> result = new ArrayList<>();
List<Long> warehouseIds = warehouseClient.getWarehouseIds();
if (!warehouseIds.isEmpty()) {
merchantStatisticsDTO.setWarehouseIds(warehouseIds);
}
List<StatisticsOrderInfoVO> statisticsOrderInfoVOIPage = baseMapper.pageList2BNoPage(merchantStatisticsDTO);
records.forEach(statisticsOrderInfoVO -> {
Long orderInfoId = statisticsOrderInfoVO.getOrderInfoId();
StatisticsPackageFeeInfoVO statisticsPackageFeeInfoVO = orderPackageInfoMap.get(orderInfoId);
BeanUtil.copy(statisticsPackageFeeInfoVO, statisticsOrderInfoVO);
Set<Long> waybillIds = statisticsOrderInfoVOIPage.stream().map(StatisticsOrderInfoVO::getWaybillId).collect(Collectors.toSet());
// 查询运单明细集合
List<WaybillDetailByWaybillNoVo> waybillDetailByWaybillId = baseMapper.findWaybillDetailByWaybillId(waybillIds);
//得到运单号
Set<String> orderCodeSet = statisticsOrderInfoVOIPage.stream().map(StatisticsOrderInfoVO::getOrderCode).collect(Collectors.toSet());
// 通过运单号进行分组
Map<Long, List<WaybillDetailByWaybillNoVo>> waybillDetailByWaybillIdMap = waybillDetailByWaybillId.stream().collect(Collectors.groupingBy(WaybillDetailByWaybillNoVo::getWaybillId));
Map<Long, StatisticsPackageFeeInfoVO> orderPackageInfoMap;
if (CollUtil.isNotEmpty(waybillIds)) {
List<StatisticsPackageFeeInfoVO> orderPackageInfoList = baseMapper.findPackageListByOrderIdsGroupByWaybillId(waybillIds);
//把orderPackageInfoList转化成以orderInfoId为key的Map
if (CollUtil.isNotEmpty(orderPackageInfoList)) {
orderPackageInfoMap = orderPackageInfoList.stream()
.collect(Collectors.toMap(StatisticsPackageFeeInfoVO::getWaybillId, statisticsPackageFeeInfoVO -> statisticsPackageFeeInfoVO));
} else {
orderPackageInfoMap = null;
}
} else {
orderPackageInfoMap = null;
}
List<AdvanceDetailDTO> advanceDetailDTOS = baseMapper.selectAdvinceDetail(waybillIds, orderCodeSet);
statisticsOrderInfoVOIPage.forEach(statisticsOrderInfoVO -> {
// Long waybillId = statisticsOrderInfoVO.getWaybillId();
Long waybillId = statisticsOrderInfoVO.getWaybillId();
String orderCode = statisticsOrderInfoVO.getOrderCode();
// 查询站存单上的
List<AdvanceDetailDTO> advanceDetailDTOList = advanceDetailDTOS.stream().
filter(advanceDetailDTO -> advanceDetailDTO.getWaybillId().equals(waybillId) && advanceDetailDTO.getOrderCode().equals(orderCode)).collect(Collectors.toList());
// 对advanceDetailDTOList 按照 incomeCategoryName 进分组 并统计数量
Map<String, List<AdvanceDetailDTO>> collect = advanceDetailDTOList.stream().filter(advanceDetailDTO -> !Objects.isNull(advanceDetailDTO.getIncomeCategoryName())).collect(Collectors.groupingBy(AdvanceDetailDTO::getIncomeCategoryName));
Long waybillId1 = statisticsOrderInfoVO.getWaybillId();
if (orderPackageInfoMap != null) {
StatisticsPackageFeeInfoVO statisticsPackageFeeInfoVO = orderPackageInfoMap.get(waybillId1);
if (statisticsPackageFeeInfoVO != null) {
// statisticsPackageFeeInfoVO.setGoodsName(statisticsOrderInfoVO.getGoodsName());
BeanUtil.copy(statisticsPackageFeeInfoVO, statisticsOrderInfoVO);
if (StringUtil.isNotBlank(statisticsOrderInfoVO.getGoodsName())) {
// String[] split = statisticsOrderInfoVO.getGoodsName().split(",");
List<WaybillDetailByWaybillNoVo> waybillDetailByWaybillNoVos = waybillDetailByWaybillIdMap.get(statisticsOrderInfoVO.getWaybillId());
StringBuffer sb = new StringBuffer();
StringBuffer sb1 = new StringBuffer();
StringBuffer sb3 = new StringBuffer();
if (collect.isEmpty()) {
if (!waybillDetailByWaybillNoVos.isEmpty()) {
for (WaybillDetailByWaybillNoVo waybillDetailByWaybillNoVo : waybillDetailByWaybillNoVos) {
if (!sb3.toString().isEmpty()) {
sb3.append(",");
}
sb3.append(waybillDetailByWaybillNoVo.getProductName());
if (!sb.toString().isEmpty()) {
sb.append(",");
}
sb.append(waybillDetailByWaybillNoVo.getNum());
if (!sb1.toString().isEmpty()) {
sb1.append(",");
}
sb1.append(waybillDetailByWaybillNoVo.getPrice());
}
}
} else {
collect.keySet().forEach(s -> {
if (!sb3.toString().isEmpty()) {
sb3.append(",");
}
sb3.append(s);
List<AdvanceDetailDTO> advanceDetailDTOS1 = collect.get(s);
Optional<WaybillDetailByWaybillNoVo> first = waybillDetailByWaybillNoVos.stream().filter(waybillDetailByWaybillNoVo -> waybillDetailByWaybillNoVo.getProductName().equals(s)).findFirst();
if (first.isPresent()) {
WaybillDetailByWaybillNoVo waybillDetailByWaybillNoVo = first.get();
if (!sb.toString().isEmpty()) {
sb.append(",");
}
//统计 advanceDetailDTOS1 这个集合种 quantity 的和值
int sum = advanceDetailDTOS1.stream().mapToInt(AdvanceDetailDTO::getQuantity).sum();
sb.append(sum);
if (!sb1.toString().isEmpty()) {
sb1.append(",");
}
sb1.append(waybillDetailByWaybillNoVo.getPrice());
}
});
}
statisticsOrderInfoVO.setGoodsName(sb3.toString());
statisticsOrderInfoVO.setGoodsNum(sb.toString());
statisticsOrderInfoVO.setGoodsPrice(sb1.toString());
}
}
}
StatisticsOrderInfoExportVO statisticsOrderInfoExportVO = new StatisticsOrderInfoExportVO();
BeanUtil.copy(statisticsOrderInfoVO, statisticsOrderInfoExportVO);
statisticsOrderInfoExportVO.setTypeServiceName(DistributionTypeConstant.getName(statisticsOrderInfoVO.getTypeService()));
statisticsOrderInfoExportVO.setPayType(DictBizCache.getValue(DictBizConstant.OPEN_ORDER_PAY_TYPE, statisticsOrderInfoVO.getPayType()));
statisticsOrderInfoExportVO.setPayWay(DictBizCache.getValue(DictBizConstant.OPEN_ORDER_PAY_WAY, statisticsOrderInfoVO.getPayWay()));
String signName = "未签收";
if (90 == statisticsOrderInfoVO.getSignStatus()) {
signName = "部分签收";
} else if (100 == statisticsOrderInfoVO.getSignStatus()) {
signName = "已签收";
}
// statisticsOrderInfoExportVO.setSignStatus();
statisticsOrderInfoExportVO.setSignStatusName(signName);
result.add(statisticsOrderInfoExportVO);
});
return result;
return records;
// return records;
}
@Override

71
blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/vo/StatisticsOrderInfoExportVO.java
Unescape View File

@ -2,6 +2,7 @@ package com.logpm.statistics.vo;
import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.format.DateTimeFormat;
import lombok.Data;
import java.io.Serializable;
@ -23,7 +24,7 @@ public class StatisticsOrderInfoExportVO implements Serializable {
private String orderCode;//订单号
@ExcelProperty(value = "商家服务类型")
private String typeService; // 商家服务类型
private String typeServiceName; // 商家服务类型
@ExcelProperty(value = "发货单位")
private String shipper; // 发货单位
@ -49,13 +50,15 @@ public class StatisticsOrderInfoExportVO implements Serializable {
@ExcelProperty(value = "收货地址")
private String consigneeAddress; // 收货地址
@ExcelProperty(value = "订单签收状态")
private String signStatus; // 订单签收状态
@ExcelProperty(value = "签收状态")
private String signStatusName; // 订单签收状态
@ExcelProperty(value = "签收时间")
private Date signDate; // 签收时间
@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
private Date signTime; // 签收时间
@ExcelProperty(value = "开单时间")
@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
private Date openTime; // 开单时间
@ExcelProperty(value = "发站仓")
@ -73,11 +76,11 @@ public class StatisticsOrderInfoExportVO implements Serializable {
@ExcelProperty(value = "客户车次号")
private String customerTrain; // 客户车次号
@ExcelProperty(value = "支付类型")
private String payType; // 支付类型
@ExcelProperty(value = "支付方式")
private String payWay; // 支付方式
private String payType;
@ExcelProperty(value = "付款方式")
private String payWay; //
@ExcelProperty(value = "品类名称")
private String goodsName; // 物料品类
@ -148,14 +151,14 @@ public class StatisticsOrderInfoExportVO implements Serializable {
@ExcelProperty(value = "配送过路费")
private BigDecimal deliveryCrossingFee;
@ExcelProperty(value = "在库周期")
private Integer cycle; // 在库周期
@ExcelProperty(value = "结算方类型")
private String cleanObjType; // 结算方
@ExcelProperty(value = "费用区间")
private String warehouseFeeInterval; // 费用区间
// @ExcelProperty(value = "在库周期")
// private Integer cycle; // 在库周期
//
// @ExcelProperty(value = "结算方类型")
// private String cleanObjType; // 结算方
//
// @ExcelProperty(value = "费用区间")
// private String warehouseFeeInterval; // 费用区间
@ExcelProperty(value = "安装费")
private BigDecimal installFee = BigDecimal.ZERO; // 安装费
@ -163,24 +166,24 @@ public class StatisticsOrderInfoExportVO implements Serializable {
@ExcelProperty(value = "其他费")
private BigDecimal otherFee = BigDecimal.ZERO; // 其他费
@ExcelProperty(value = "签收次数")
@ExcelProperty(value = "签收件数")
private Integer signNum;
@ExcelProperty(value = "最后签收时间")
private Date signTime; // 最晚一条
@ExcelProperty(value = "同步费用状态")
private Integer syncFeeStatus;
@ExcelProperty(value = "同步费用时间")
private Date syncFeeDate;
@ExcelProperty(value = "生成对账单状态")
private Integer createReconciliationOrderStatus; // 0未生成 1已生成
@ExcelProperty(value = "生成对账单确认人")
private String createReconciliationUserName; // 生成对账单确认人
@ExcelProperty(value = "生成对账单时间")
private Date createReconciliationDate; // 生成对账单时间
// @ExcelProperty(value = "最后签收时间")
// private Date signTime; // 最晚一条
// @ExcelProperty(value = "同步费用状态")
// private Integer syncFeeStatus;
//
// @ExcelProperty(value = "同步费用时间")
// private Date syncFeeDate;
// @ExcelProperty(value = "生成对账单状态")
// private Integer createReconciliationOrderStatus; // 0未生成 1已生成
//
// @ExcelProperty(value = "生成对账单确认人")
// private String createReconciliationUserName; // 生成对账单确认人
//
// @ExcelProperty(value = "生成对账单时间")
// private Date createReconciliationDate; // 生成对账单时间
}

6
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java
Unescape View File

@ -740,6 +740,8 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
waybillEntity.setReturnStatus(0);
waybillEntity.setCheckStatus(0);
waybillEntity.setUpdateStatus(0);
waybillEntity.setSettlementStatus("10");
waybillEntity.setPayStatus("10");
Long waybillId = warehouseWaybillClient.addEnntity(waybillEntity);
waybillEntity.setId(waybillId);
@ -1095,6 +1097,10 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
waybillEntity.setReturnStatus(0);
waybillEntity.setCheckStatus(0);
waybillEntity.setUpdateStatus(0);
waybillEntity.setPayStatus("10");
waybillEntity.setSettlementStatus("10");
Long waybillId = warehouseWaybillClient.addEnntity(waybillEntity);
waybillEntity.setId(waybillId);
List<WarehouseWayBillDetail> details = new ArrayList<>();

Write Preview
Loading…
Cancel
Save