From cd9cbc46c0774c01674be435bcc86d4a03ada687 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 27 二月 2024 14:18:13 +0800
Subject: [PATCH] 整理
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncParkServiceImpl.java | 42 ++++++++++++++++++++++++++++++++++++++----
1 files changed, 38 insertions(+), 4 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncParkServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncParkServiceImpl.java
index b5b1367..9056ab5 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncParkServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncParkServiceImpl.java
@@ -55,8 +55,10 @@
&& StringUtils.isNotBlank(c.getCarCode())){
boolean result = cancelParkBookHk(c);
c.setHkStatus(result?Constants.ONE:Constants.TWO);
+ c.setRemark(result?"鍙栨秷鍖呮湡鎴愬姛":"鍙栨秷鍖呮湡澶辫触");
}else{
c.setHkStatus(Constants.TWO);//涓嬪彂澶辫触
+ c.setRemark("鍙栨秷鍖呮湡澶辫触");
}
c.setHkDate(date);
parkBookMapper.updateById(c);
@@ -73,8 +75,10 @@
&& StringUtils.isNotBlank(c.getCarCode())){
boolean result = addParkBookHk(c);
c.setHkStatus(result?Constants.ONE:Constants.TWO);
+ c.setRemark(result?"鍖呮湡鎴愬姛":"鍖呮湡澶辫触");
}else{
c.setHkStatus(Constants.TWO);
+ c.setRemark("鍖呮湡澶辫触~");
}
c.setHkDate(date);
parkBookMapper.updateById(c);
@@ -86,13 +90,43 @@
}
}
-
+ @Override
+ public void syncParkBookBySingleModel(ParkBook c) {
+ if(Constants.equalsObject(c.getIsdeleted(),Constants.ONE)){
+ //濡傛灉鍙栨秷棰勭害锛屽垯杩涜鍙栨秷鍖呮湡
+ if(StringUtils.isNotBlank(c.getParkHkId())
+ && StringUtils.isNotBlank(c.getCarCode())){
+ boolean result = cancelParkBookHk(c);
+ c.setHkStatus(result?Constants.ONE:Constants.TWO);
+ c.setRemark(result?"鍙栨秷鍖呮湡鎴愬姛":"鍙栨秷鍖呮湡澶辫触");
+ }else{
+ c.setHkStatus(Constants.TWO);//涓嬪彂澶辫触
+ c.setRemark("鍙栨秷鍖呮湡澶辫触");
+ }
+ c.setHkDate(new Date());
+ parkBookMapper.updateById(c);
+ }else {
+ //澶勭悊鎵�鏈夐渶瑕佸寘鏈熺殑杞﹁締鏁版嵁璁板綍
+ //鏁版嵁涓嶅悎娉曪紝鐩存帴鎻愮ず涓嬪彂澶辫触
+ if (StringUtils.isNotBlank(c.getParkHkId())
+ && StringUtils.isNotBlank(c.getCarCode())) {
+ boolean result = addParkBookHk(c);
+ c.setHkStatus(result ? Constants.ONE : Constants.TWO);
+ c.setRemark(result ? "鍖呮湡鎴愬姛" : "鍖呮湡澶辫触");
+ } else {
+ c.setHkStatus(Constants.TWO);
+ c.setRemark("鍖呮湡澶辫触~");
+ }
+ c.setHkDate(new Date());
+ parkBookMapper.updateById(c);
+ }
+ }
private boolean addParkBookHk(ParkBook c) {
CarChargeAddRequest param = new CarChargeAddRequest();
param.setPlateNo(c.getCarCode());
param.setParkSyscode(c.getParkHkId());
- param.setStartTime(DateUtil.getISO8601Timestamp(c.getStartTime()));
- param.setEndTime(DateUtil.getISO8601Timestamp(c.getEndTime()));
+ param.setStartTime(DateUtil.getShortTime(c.getStartTime()));
+ param.setEndTime(DateUtil.getShortTime(c.getEndTime()));
BaseResponse response = HKService.carChargeAddtion(param);
if(response!=null
&& StringUtils.equals(response.getCode(),HKConstants.RESPONSE_SUCCEE)){
@@ -120,7 +154,7 @@
queryWrapper.selectAs(Parks::getHkId,ParkBook::getParkHkId);
queryWrapper.leftJoin(Parks.class,Parks::getId,ParkBook::getParkId);
queryWrapper.selectAs(Device::getHkId,Empower::getDeviceIndexCode);
- List<ParkBook> list = parkBookMapper.selectJoinList(ParkBook.class,queryWrapper);
+ List<ParkBook> list = parkBookMapper.selectJoinList(ParkBook.class,queryWrapper.eq(ParkBook::getHkStatus,Constants.ZERO));
return list;
}
/**
--
Gitblit v1.9.3