From 10c28ce3d0b384584c77ce9111a66a0641250752 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 27 二月 2025 18:30:32 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java | 68 ++++++++++++++++++++++++++++------
1 files changed, 56 insertions(+), 12 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
index f356c7c..b88c838 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
@@ -25,9 +25,13 @@
import com.doumee.dao.business.model.Member;
import com.doumee.dao.web.reqeust.SavePlatformWarnEventDTO;
import com.doumee.service.business.impl.PlatformWarnEventServiceImpl;
+import com.doumee.service.business.third.TmsService;
+import com.doumee.service.business.third.model.request.TmsOrderInfoRequest;
+import com.doumee.service.business.third.model.response.TmsOrderInfoResponse;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
+import org.checkerframework.checker.units.qual.C;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -80,6 +84,8 @@
private PlatformBroadcastLogMapper platformBroadcastLogMapper;
@Autowired
private PlatformJobMapper platformJobMapper;
+ @Autowired
+ private TmsService tmsService;
@Autowired
private PlatformWmsDetailMapper platformWmsDetailMapper;
@Autowired
@@ -901,7 +907,7 @@
Constants.PlatformJobStatus.TRANSFERING.getKey(),
Constants.PlatformJobStatus.EXCEPTION.getKey()
)
- )==Constants.ZERO){
+ )==Constants.ZERO){//濡傛灉娌¤繘琛屼腑浠诲姟
PlatformJob platformJob = platformJobMapper.selectOne(new QueryWrapper<PlatformJob>().lambda()
.eq(PlatformJob::getCarCodeFront,event.getPlateNos())
.eq(PlatformJob::getIsdeleted,Constants.ZERO)
@@ -913,18 +919,14 @@
.last(" limit 1")
);
if(Objects.nonNull(platformJob)){
- platformJob.setStatus(Constants.PlatformJobStatus.WAIT_CALL.getKey());
- platformJob.setArriveDate(new Date());
- platformJob.setSingType(Constants.TWO);
- platformJob.setSignDate(new Date());
- List<PlatformJob> signList = platformJobMapper.selectList(new QueryWrapper<PlatformJob>().lambda().apply(" DATE(SIGN_DATE) = DATE(NOW()) and sign_date is not null "));
- if(CollectionUtils.isEmpty(signList)){
- platformJob.setSignNum(Constants.ONE);
- } else{
- int maxNumber = Collections.max(signList.stream().map(i->i.getSignNum()).collect(Collectors.toList()));
- platformJob.setSignNum(maxNumber + Constants.ONE);
+ if(Constants.equalsInteger(platformJob.getType(),Constants.ONE)){
+ //濡傛灉鏄嚜鏈夎溅瑁呰揣鑷姩绛惧埌
+ jobAutoSignBiz(platformJob);
+ }else if(Constants.equalsInteger(platformJob.getType(),Constants.ZERO)){
+ //濡傛灉鏄嚜鏈夎溅鍗歌揣 鏌ヨTMS鍚堝悓鐘舵�侊紝鍐冲畾鏄惁鑷姩绛惧埌
+ checkTmsContractStatusBiz(platformJob);
}
- platformJobMapper.updateById(platformJob);
+
}
}
};
@@ -956,6 +958,48 @@
return event;
}
+ /**
+ * 锛涘鏋滄槸鍗歌揣浠诲姟锛岄渶瑕侀�氳繃TMS鎻愪緵鐨勨��2.2鍚堝悓鍒楄〃鎺ュ彛鈥濇帴鍙ｆ煡璇㈣溅杈嗗搴旂殑鍚堝悓鐘舵�佹槸鍚︿负鍦ㄩ�旂姸鎬侊紙瀵瑰簲orderStatus鍊间负3/4/5/6锛夛紝
+ * 濡傛灉鏄嚜鍔ㄧ鍒帮紝鍚﹀垯涓嶈嚜鍔ㄧ鍒帮紱濡傛灉涓�涓溅杈嗗搴斿涓悎鍚屽彿锛屽垯鍙栬繍鍗曚笅浠讳竴鍚堝悓鏌ヨ瀵瑰簲鍦ㄩ�斾俊鎭�
+ * @param platformJob
+ */
+ private void checkTmsContractStatusBiz(PlatformJob platformJob) {
+ PlatformWmsDetail detail = platformWmsDetailMapper.selectOne(new QueryWrapper<PlatformWmsDetail>().lambda()
+ .eq(PlatformWmsDetail::getIsdeleted, Constants.ZERO)
+ .eq(PlatformWmsDetail::getJobId, platformJob.getId())
+ .isNotNull(PlatformWmsDetail::getContractNum)
+ .last("limit 1")
+ );
+ if(detail!=null && StringUtils.isNotBlank(detail.getContractNum())){
+ TmsOrderInfoRequest param = new TmsOrderInfoRequest();
+ param.setContractNumber(detail.getContractNum());
+ TmsOrderInfoResponse response = tmsService.orderInfo(param);
+ if(response!=null &&( StringUtils.equals(response.getOrderStatus(),"3") )
+ ||StringUtils.equals(response.getOrderStatus(),"4")
+ ||StringUtils.equals(response.getOrderStatus(),"5")
+ ||StringUtils.equals(response.getOrderStatus(),"6")){
+ //濡傛灉鍚堝悓鍦ㄩ�旓紝鍒欒嚜鍔ㄧ鍒�
+ jobAutoSignBiz(platformJob);
+ }
+ }
+
+ }
+
+ private void jobAutoSignBiz(PlatformJob platformJob) {
+ platformJob.setStatus(Constants.PlatformJobStatus.WAIT_CALL.getKey());
+ platformJob.setArriveDate(new Date());
+ platformJob.setSingType(Constants.TWO);
+ platformJob.setSignDate(new Date());
+ List<PlatformJob> signList = platformJobMapper.selectList(new QueryWrapper<PlatformJob>().lambda().apply(" DATE(SIGN_DATE) = DATE(NOW()) and sign_date is not null "));
+ if(CollectionUtils.isEmpty(signList)){
+ platformJob.setSignNum(Constants.ONE);
+ } else{
+ int maxNumber = Collections.max(signList.stream().map(i->i.getSignNum()).collect(Collectors.toList()));
+ platformJob.setSignNum(maxNumber + Constants.ONE);
+ }
+ platformJobMapper.updateById(platformJob);
+ }
+
private Retention getRetentionModelByParkRequest(EventParkInfoRequest request,CarEvent event) {
Retention retention = new Retention();
retention.setIsdeleted(Constants.ZERO);
--
Gitblit v1.9.3