From 9cbfd132ac3d7dc1aa85ed282cc3d67a10eda8a0 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Mon, 9 Jan 2023 16:19:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/api/basevehicle/app/VinQuery.java | 2 ++ .../base/biz/basevehicle/BaseVehicleRest.java | 5 +-- .../biz/basevehicle/BaseVehicleService.java | 4 +-- .../busmaindeposit/AppBusMainDepositVo.java | 3 ++ .../busdepositvehicle/ScheduledService.java | 32 +++++++++++++++++-- .../busmaindeposit/BusMainDepositService.java | 1 + .../FinCollectionConfirmation.java | 3 ++ .../FinCollectionConfirmationFeign.java | 2 +- ...inCollectionConfirmationFeignFallback.java | 2 +- .../FinCollectionRejectQuery.java | 17 ++++++++++ .../FinCollectionConfirmationRest.java | 4 +-- .../FinCollectionConfirmationService.java | 6 +++- .../virtualOrders/orders/MainDepositVo.java | 3 ++ 13 files changed, 72 insertions(+), 12 deletions(-) create mode 100644 anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionRejectQuery.java diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/app/VinQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/app/VinQuery.java index 9390b09e71..0a582d0ab1 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/app/VinQuery.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/app/VinQuery.java @@ -18,4 +18,6 @@ public class VinQuery implements Query { private String userSid; @ApiModelProperty("组织机构sid") private String orgPath; + + private String name; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java index 78ae1dd03e..ed83f369d6 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java @@ -987,7 +987,7 @@ public class BaseVehicleRest implements BaseVehicleFeign { */ @Override public ResultBean> getVins(String modelSid, String configSid, String userSid) { - List vo = baseVehicleService.getVins(modelSid, configSid, userSid, ""); + List vo = baseVehicleService.getVins(modelSid, configSid, userSid, "",""); return new ResultBean>().success().setData(vo); } @@ -997,7 +997,8 @@ public class BaseVehicleRest implements BaseVehicleFeign { String configSid = vinQuery.getConfigSid(); String userSid = vinQuery.getUserSid(); String orgPath = vinQuery.getOrgPath(); - List vo = baseVehicleService.getVins(modelSid, configSid, userSid, orgPath); + String name = vinQuery.getName(); + List vo = baseVehicleService.getVins(modelSid, configSid, userSid, orgPath,name); return new ResultBean>().success().setData(vo); } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java index 2550f353eb..575970e6e0 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java @@ -1121,13 +1121,13 @@ public class BaseVehicleService extends MybatisBaseService getVins(String modelSid, String configSid, String userSid, String orgPath) { + public List getVins(String modelSid, String configSid, String userSid, String orgPath,String name) { if (StringUtils.isBlank(orgPath)) { orgPath = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData(); } else { orgPath = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); } - List vins = baseMapper.getVins(modelSid, configSid, VehicleState.LockEnum.UN_LOCK.getCode(), orgPath); + List vins = baseMapper.getVins(modelSid, configSid, VehicleState.LockEnum.UN_LOCK.getCode(), orgPath,name); if (vins.size() <= 0) { for (AppVinsDetailsVo vin : vins) { vins.add(vin); diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/AppBusMainDepositVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/AppBusMainDepositVo.java index 2b0fa71b4b..2b9c31bb01 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/AppBusMainDepositVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/AppBusMainDepositVo.java @@ -119,4 +119,7 @@ public class AppBusMainDepositVo implements Vo { @ApiModelProperty("财务确认状态") private String paymentState; + @ApiModelProperty("财务驳回原因") + private String reason; + } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/ScheduledService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/ScheduledService.java index 2303adf897..89d88b1ccd 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/ScheduledService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/ScheduledService.java @@ -7,14 +7,15 @@ import com.yxt.anrui.base.common.enums.VehicleState; import com.yxt.anrui.buscenter.api.busdepositvehicle.AppBusDepositVehicleDetailVo; import com.yxt.anrui.buscenter.api.busdepositvehicle.AppBusDepositVehicleListVo; import com.yxt.anrui.buscenter.api.busmaindeposit.BusMainDeposit; +import com.yxt.messagecenter.api.message.MessageFeign; +import com.yxt.messagecenter.api.message.OrderListMessageDto; +import com.yxt.messagecenter.api.message.OrderMesageDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import java.text.SimpleDateFormat; -import java.util.Calendar; -import java.util.Date; -import java.util.List; +import java.util.*; import java.util.stream.Collectors; /** @@ -29,6 +30,8 @@ public class ScheduledService { private BusDepositVehicleService busDepositVehicleService; @Autowired private BaseVehicleFeign baseVehicleFeign; + @Autowired + private MessageFeign messageFeign; @Scheduled(cron = "0 0 0 * * ?") // @Scheduled(cron = "0 0/5 12 * * ?") @@ -46,6 +49,8 @@ public class ScheduledService { //查询简易订单-车辆预定中 //查询修改日期包含该日期的已经通过的简易订车单 List strList = busDepositVehicleService.selectListByState(tomorrow); + OrderMesageDto dto = new OrderMesageDto(); + List orderListMessageDtoList = new ArrayList<>(); for (BusMainDeposit strDeposit : strList) { String sid = strDeposit.getSid(); AppBusDepositVehicleDetailVo appBusDepositVehicleDetailVo = busDepositVehicleService.getReserveCarDetails(sid).getData(); @@ -55,7 +60,28 @@ public class ScheduledService { busMainDepositUpdateQuery.setLockedState(VehicleState.LockEnum.UN_LOCK.getCode()); busMainDepositUpdateQuery.setLockedStateValue(VehicleState.LockEnum.UN_LOCK.getRemarks()); baseVehicleFeign.updateMainDepositByVinNo(busMainDepositUpdateQuery); + //推送解锁提醒 + OrderListMessageDto orderListMessageDto = new OrderListMessageDto(); + orderListMessageDto.setBusinessSid(strDeposit.getSid());//业务sid + List createBySidList = new ArrayList<>(); + createBySidList.add(strDeposit.getCreateBySid()); + orderListMessageDto.setCreateBySid(createBySidList);//接收人sid + Map appMaps = new HashMap<>(); + appMaps.put("virtualOrderSid", strDeposit.getSid());//简易订单sid + orderListMessageDto.setModuleName("业务"); + orderListMessageDto.setMsgTitle("简易订单-车辆预定解锁提醒"); + List vinList = appBusDepositVehicleDetailVo.getVehicleList().stream().map(AppBusDepositVehicleListVo::getVin).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList()); + String msgContent = "您在简易订单-车辆预定中预定的车架号："+String.join(",",vinList)+"的"+vinList.size()+"台车现在已经解锁，如需继续预定请重新申请或在销售订单走销售流程。"; + orderListMessageDto.setMsgContent(msgContent); + orderListMessageDto.setMsgTargetUri("com.anrui.android.plugin.autoservice.activity.DetailVirtualOrderReserveCarActivity"); + orderListMessageDto.setAppMap(appMaps); + orderListMessageDto.setModuleSid("e25e13b5-f2ed-421f-bdb3-6f2eca2a3028"); + orderListMessageDtoList.add(orderListMessageDto); + orderListMessageDto.setApp_type("2"); } + dto.setList(orderListMessageDtoList); + messageFeign.sendOrderMessage(dto); + } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java index 6f3c5e1fcc..fdc08748e8 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java @@ -670,6 +670,7 @@ public class BusMainDepositService extends MybatisBaseService