From 0f4b325b237f9f906a0dd341eb1e3ec036d416f1 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 08 十月 2024 13:56:47 +0800
Subject: [PATCH] 代码初始化
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java | 35 ++++++++++++++++++++---------------
1 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
index ca8f763..75c28e9 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
@@ -6,7 +6,8 @@
import com.doumee.core.exception.BusinessException;
import com.doumee.core.haikang.model.HKConstants;
import com.doumee.core.haikang.model.param.BaseResponse;
-import com.doumee.core.haikang.model.param.request.CarChargeAddRequest;
+import com.doumee.core.haikang.model.param.request.ParkReservationAddRequest;
+import com.doumee.core.haikang.model.param.respose.ParkReservationAddResponse;
import com.doumee.core.haikang.service.HKService;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
@@ -31,19 +32,12 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.doumee.service.business.impl.hksync.HkSyncParkServiceImpl;
-import com.doumee.service.business.impl.hksync.fhk.HkSyncVehicleFromHKServiceImpl;
-import com.doumee.service.system.NoticesService;
import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import io.swagger.models.auth.In;
-import javafx.application.Platform;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
-import org.apache.xpath.operations.Bool;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -343,6 +337,7 @@
internalHomeVO.setNoticeCopyNum(
noticesList.stream().filter(i->Constants.equalsInteger(i.getUserId(),noticesDTO.getMemberId())
&&Constants.equalsInteger(i.getSendacopy(),Constants.ONE)
+ &&Constants.equalsInteger(i.getReaded(),Constants.ZERO)
).count()
);
}
@@ -873,7 +868,8 @@
if(Constants.equalsInteger(level.getStatus(),Constants.approveStatus.pass)){
waitModel.setStatus(level.getStatus());
waitModel.setType(Constants.ONE);
- waitModel.setTitle("瀹℃壒浜猴紙鎶勯�佹垨绛惧鎵逛汉锛�");
+ waitModel.setCheckDate(level.getCheckDate());
+ waitModel.setTitle(StringUtils.defaultString(level.getTitle(),"瀹℃壒浜�"));
}else{
waitModel.setStatus(level.getStatus());
waitModel.setType(Constants.ZERO);
@@ -1465,16 +1461,24 @@
visitPark.setStartTime(visits.getStarttime());
visitPark.setEndTime(visits.getEndtime());
visitPark.setParkHkId(parks.getHkId());
+ visitPark.setObjType(Constants.ZERO);
- CarChargeAddRequest param = new CarChargeAddRequest();
- param.setPlateNo(visitPark.getCarCode());
- param.setParkSyscode(visitPark.getParkHkId());
- param.setStartTime(Objects.isNull(visitPark.getStartTime())?DateUtil.getDate(new Date(),"yyyy-MM-dd"):DateUtil.getShortTimeToNull(visitPark.getStartTime()));
- param.setEndTime(Objects.isNull(visitPark.getEndTime())?"2999-12-31":DateUtil.getShortTimeToNull(visitPark.getEndTime()));
- BaseResponse response = HKService.carChargeAddtion(param);
+ ParkReservationAddRequest request = new ParkReservationAddRequest();
+ request.setPlateNo(visitPark.getCarCode());
+ request.setParkSyscode(visitPark.getParkHkId());
+ request.setPhoneNo(visits.getPhone());
+ request.setOwner(visits.getName());
+ request.setAllowTimes(Constants.ONE+"");
+ request.setIsCharge(Constants.ONE+"");
+ request.setStartTime(Objects.isNull(visitPark.getStartTime())?DateUtil.getISO8601Timestamp2(new Date()):DateUtil.getISO8601Timestamp2(visitPark.getStartTime()));
+ request.setEndTime(Objects.isNull(visitPark.getEndTime())?"2999-12-31T00:00:00+08:00":DateUtil.getISO8601Timestamp2(visitPark.getEndTime()));
+ BaseResponse response = HKService.parkReservationAddition(request);
+
visitPark.setHkDate(new Date());
if(response!=null
&& StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE)){
+ ParkReservationAddResponse parkReservationAddResponse = (ParkReservationAddResponse) response.getData();
+ visitPark.setHkId(parkReservationAddResponse.getReserveOrderNo());
visitPark.setHkStatus(Constants.ONE);
visitPark.setRemark("鍖呮湡鎴愬姛");
}else{
@@ -1484,6 +1488,7 @@
sendStatus = false;
}
parkBookList.add(visitPark);
+
}
visitParkMapper.insert(parkBookList);
}
--
Gitblit v1.9.3