From a8c8e4281c0298ce9a946b1d65166a2fe438ce1c Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 26 九月 2024 09:04:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java | 71 +++++++++++++++++++++--------------
1 files changed, 42 insertions(+), 29 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 7b9f344..0d6f813 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
@@ -7,6 +7,8 @@
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;
@@ -111,6 +113,9 @@
@Autowired
private ParkBookMapper parkBookMapper;
+
+ @Autowired
+ private VisitParkMapper visitParkMapper;
@Override
@@ -340,6 +345,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()
);
}
@@ -870,7 +876,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);
@@ -1450,47 +1457,53 @@
.lambda()
.isNotNull(Parks::getHkId)
.eq(Parks::getIsdeleted,Constants.ZERO));
- List<ParkBook> parkBookList = new ArrayList<>();
+ List<VisitPark> parkBookList = new ArrayList<>();
if(CollectionUtils.isNotEmpty(parksList)){
for (Parks parks:parksList) {
- ParkBook parkBook = new ParkBook();
- parkBook.setIsdeleted(Constants.ZERO);
- parkBook.setCreateDate(new Date());
- parkBook.setVisitId(visits.getId());
- parkBook.setCarCode(visits.getCarNos());
- parkBook.setParkId(parks.getId());
- parkBook.setOrigin(Constants.TWO);
- parkBook.setStartTime(visits.getStarttime());
- parkBook.setEndTime(visits.getEndtime());
- parkBook.setMemberId( visits.getMemberId());
- parkBook.setTimeType(Constants.ONE);
- parkBook.setParkHkId(parks.getHkId());
+ VisitPark visitPark = new VisitPark();
+ visitPark.setIsdeleted(Constants.ZERO);
+ visitPark.setCreateDate(new Date());
+ visitPark.setVisitApplyId(visits.getId().toString());
+ visitPark.setCarCode(visits.getCarNos());
+ visitPark.setParkId(parks.getId().toString());
+ visitPark.setStartTime(visits.getStarttime());
+ visitPark.setEndTime(visits.getEndtime());
+ visitPark.setParkHkId(parks.getHkId());
+ visitPark.setObjType(Constants.ZERO);
- CarChargeAddRequest param = new CarChargeAddRequest();
- param.setPlateNo(parkBook.getCarCode());
- param.setParkSyscode(parkBook.getParkHkId());
- param.setStartTime(Objects.isNull(parkBook.getStartTime())?DateUtil.getDate(new Date(),"yyyy-MM-dd"):DateUtil.getShortTimeToNull(parkBook.getStartTime()));
- param.setEndTime(Objects.isNull(parkBook.getEndTime())?"2999-12-31":DateUtil.getShortTimeToNull(parkBook.getEndTime()));
- BaseResponse response = HKService.carChargeAddtion(param);
- parkBook.setHkDate(new Date());
+ 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)){
- parkBook.setHkStatus(Constants.ONE);
- parkBook.setRemark("鍖呮湡鎴愬姛");
+ ParkReservationAddResponse parkReservationAddResponse = (ParkReservationAddResponse) response.getData();
+ visitPark.setHkId(parkReservationAddResponse.getReserveOrderNo());
+ visitPark.setHkStatus(Constants.ONE);
+ visitPark.setRemark("鍖呮湡鎴愬姛");
}else{
- parkBook.setHkStatus(Constants.TWO);
- parkBook.setRemark("鍖呮湡澶辫触~");
+ visitPark.setHkStatus(Constants.TWO);
+ visitPark.setRemark("鍖呮湡澶辫触~");
//涓嬪彂澶辫触 鏍囪涓讳笟鍔＄姸鎬佷负涓嬪彂澶辫触
sendStatus = false;
}
- parkBookList.add(parkBook);
+ parkBookList.add(visitPark);
+
}
- parkBookMapper.insert(parkBookList);
+ visitParkMapper.insert(parkBookList);
}
if(sendStatus){
- visits.setStatus(Constants.VisitStatus.xfFail);
- }else{
visits.setStatus(Constants.VisitStatus.xfSuccess);
+ }else{
+ visits.setStatus(Constants.VisitStatus.xfFail);
}
}
--
Gitblit v1.9.3