From 970391bdbb4f391a2a7de88ecffd5fc395a830fe Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Sun, 28 Apr 2024 18:49:05 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=8E=A8=E9=80=81=E8=80=81=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E5=A4=8D=E6=A0=B8=E7=AD=BE=E6=94=B6=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E3=80=81=E7=BB=B4=E6=8A=A4=E8=AE=A1=E5=88=92=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/logpm/oldproject/dto/SignPushDataDTO.java | 5 +++++ .../mapper/DistributionDeliveryListMapper.xml | 1 + .../mapper/DistributionReservationMapper.xml | 2 +- .../impl/DistributionDeliveryListServiceImpl.java | 9 +++++++-- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/dto/SignPushDataDTO.java b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/dto/SignPushDataDTO.java index ed7bacd15..8d3274728 100644 --- a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/dto/SignPushDataDTO.java +++ b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/dto/SignPushDataDTO.java @@ -125,6 +125,11 @@ public class SignPushDataDTO { */ private String kind; + /** + * 复核时间 + */ + private Date reviewTime; + /** * 签收客户集合 */ diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml index 4519138db..1e32d1365 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml @@ -1905,6 +1905,7 @@ lddl.kind AS kind, lddl.warehouse_id AS warehouseId, lddl.warehouse_name AS warehouseName, + lds.signing_time AS reviewTime, CASE lddl.type WHEN 1 THEN 2 WHEN 2 THEN 1 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml index b2c7de152..ade2ad7f8 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml @@ -1364,7 +1364,7 @@ ldr.delivery_phone AS phone, (ldr.reservation_num + ldr.reservation_stock_list_num) AS plan, (lds.loaded_number + lds.loadedin_number) AS actualPlan, - lddl.delivery_number AS delivery, + ldr.reservation_num AS delivery, (lds.received_quantity + lds.receivedin_quantity) AS sign, lds.signing_status AS state, lds.create_time AS createTime, diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java index 0a0fbddb9..fe50c8a64 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java @@ -4131,9 +4131,11 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl newReservationIds = reservationInfos.stream().map(DistributionReservationDTO::getId).collect(Collectors.toList()); List distributionReservationEntities = distributionReservationMapper.selectList(Wrappers.query().lambda().in(DistributionReservationEntity::getId, newReservationIds)); List needStockUpReservationList = distributionReservationEntities.stream().filter(r -> r.getStockupStatus().equals(ReservationStockupStatusConstant.weibeihuo.getValue())).collect(Collectors.toList()); + DistributionStockupEntity stockupEntity = null; BladeUser user = AuthUtil.getUser(); if (Func.isNotEmpty(needStockUpReservationList)) { + log.info("修改市配配送任务需要进行备货的预约计划>>>reservationCodes:{}",needStockUpReservationList.stream().map(DistributionReservationEntity::getReservationCode).collect(Collectors.joining(","))); //需要进行备货的预约列表 stockupEntity = new DistributionStockupEntity(); stockupEntity.setAssignStatus(StockAssignStatusConstant.weizhipai.getValue()); @@ -4159,6 +4161,11 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImplupdate().lambda() + .eq(DistributionReservationEntity::getId,distributionReservationEntity.getId()) + .set(DistributionReservationEntity::getStockupStatus,ReservationStockupStatusConstant.daibeihuo.getValue()) + ); + log.info("编辑配送车次维护预约备货状态 reservationId>>>>>>>>>>>>>>>>>:{}",distributionReservationEntity.getId()); } } //这里暂时不考虑出现新增的情况 @@ -4194,8 +4201,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl Date: Sun, 28 Apr 2024 19:25:27 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=8E=A8=E9=80=81=E8=80=81=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IDistributionDeliveryListClient.java | 3 ++ .../distribution/dto/PushNotificationDTO.java | 41 +++++++++++++++++++ .../feign/DistributionDeliveryListClient.java | 11 +++++ .../mapper/DistributionSignforMapper.java | 7 ++++ .../mapper/DistributionSignforMapper.xml | 22 ++++++++++ .../IDistributionDeliveryListService.java | 6 +++ .../DistributionDeliveryListServiceImpl.java | 24 +++++++++++ .../jobhandle/DistributionDatarepair.java | 17 ++++++++ 8 files changed, 131 insertions(+) create mode 100644 blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/PushNotificationDTO.java diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionDeliveryListClient.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionDeliveryListClient.java index fd5d8e912..4187b249c 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionDeliveryListClient.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionDeliveryListClient.java @@ -128,6 +128,9 @@ public interface IDistributionDeliveryListClient { @GetMapping(TOP+"/maintenanceDeliveryInfoByWarehouseId") void maintenanceDeliveryInfoByWarehouseId(@RequestParam("warehouseId")String params); + @GetMapping(TOP+"/pushNotification") + void pushNotification(String params); + // /** // * 根据配送任务ID查询配送司机信息 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/PushNotificationDTO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/PushNotificationDTO.java new file mode 100644 index 000000000..d6ac25cc3 --- /dev/null +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/PushNotificationDTO.java @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.distribution.dto; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 签收管理 数据传输对象实体类 + * + * @author lmy + * @since 2023-06-13 + */ +@Data +public class PushNotificationDTO implements Serializable { + private static final long serialVersionUID = 1L; + + private Long id ; + + private Long warehouseId; + + private String warehouseName; + + + +} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionDeliveryListClient.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionDeliveryListClient.java index 5ba924b2a..79a3cfcc9 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionDeliveryListClient.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionDeliveryListClient.java @@ -16,6 +16,7 @@ */ package com.logpm.distribution.feign; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.logpm.aftersales.vo.AftersalesAbnormalPackageVO; @@ -25,6 +26,7 @@ import com.logpm.distribution.vo.DistributionDeliveryListVO; import com.logpm.distribution.vo.DistributionDeliverySelfVO; import com.logpm.distribution.vo.DistributionRetentionScanVo; import lombok.AllArgsConstructor; +import org.apache.logging.log4j.util.Strings; import org.springblade.core.mp.support.BladePage; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; @@ -114,5 +116,14 @@ public class DistributionDeliveryListClient implements IDistributionDeliveryList } + /** + * @param params + */ + @Override + public void pushNotification(String params) { + + distributionDeliveryListService.pushNotification(params); + } + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java index 5b5a783a0..2609de68f 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java @@ -20,6 +20,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.distribution.dto.DistributionSignforDTO; +import com.logpm.distribution.dto.PushNotificationDTO; import com.logpm.distribution.dto.app.DistributionAppDeliveryListDTO; import com.logpm.distribution.entity.DistributionParcelListEntity; import com.logpm.distribution.entity.DistributionReservationEntity; @@ -350,4 +351,10 @@ public interface DistributionSignforMapper extends BaseMapper> getByReservationIds(@Param("reservationIds") List longList); + /** + * 查询需要推送老系统的签收信息 + * @param warehouseIds + * @return + */ + List pushNotification(@Param("warehouseIds") List warehouseIds); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml index ad2403b3b..9fd18d52a 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml @@ -1381,4 +1381,26 @@ + diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java index 91011f4c8..8cf504e91 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java @@ -442,6 +442,12 @@ public interface IDistributionDeliveryListService extends BaseService warehouseIds = null; + if (Strings.isNotBlank(params)){ + warehouseIds = Arrays.stream(params.split(",")).collect(Collectors.toList()); + } + List reservationEntityList = distributionReservationService.list(Wrappers.query().lambda() + .in(DistributionReservationEntity::getWarehouseId, warehouseIds) + .ne(DistributionReservationEntity::getReservationStatus, ReservationStatusConstant.yiquexiao.getValue()) + .apply("(reservation_num + reservation_stock_list_num) > 0") + .apply("date_format(create_time,'%y%m%d%') <= date_format('2024-04-28','%y%m%d%')") + ); + List pushNotification = distributionSignforMapper.pushNotification(warehouseIds); + if (!pushNotification.isEmpty()){ + for (PushNotificationDTO pushNotificationDTO : pushNotification) { + distributionAsyncService.sendReviewFactory(pushNotificationDTO.getId(), pushNotificationDTO.getWarehouseName(), pushNotificationDTO.getWarehouseId()); + } + } + } + @Override @Transactional public void maintenanceDeliveryInfo(Long deliveryId) { diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/DistributionDatarepair.java b/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/DistributionDatarepair.java index 062a8b88d..b661f19a0 100644 --- a/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/DistributionDatarepair.java +++ b/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/DistributionDatarepair.java @@ -161,6 +161,23 @@ public class DistributionDatarepair { + /** + * 推送老系统系统 + * @return + */ + @XxlJob("pushNotification") + public ReturnT pushNotification(String params) { + //维护配送的状态 + String method = "######################DistributionDatarepair.maintenanceDeliveryStatus"; + log.info(method+"维护配送订单id:{}",params); + deliveryListClient.pushNotification(params); + log.info(method+"维护配送订单结束"); + return ReturnT.SUCCESS; + } + + + +