From eb275c6d06d3c27fd30bbf4975d27c93d7f56eb2 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 10 十二月 2024 18:29:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/WmsServiceImpl.java | 223 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 211 insertions(+), 12 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/WmsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/WmsServiceImpl.java
index d02db23..cc451b8 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/WmsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/WmsServiceImpl.java
@@ -7,12 +7,20 @@
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.HttpsUtil;
+import com.doumee.core.utils.SmsConstants;
import com.doumee.core.wms.model.request.*;
import com.doumee.core.wms.model.response.WmsBaseDataResponse;
import com.doumee.core.wms.model.response.WmsBaseResponse;
import com.doumee.core.wms.model.response.WmsInventoryDataResponse;
+import com.doumee.core.wx.wxPlat.WxPlatConstants;
+import com.doumee.core.wx.wxPlat.WxPlatNotice;
import com.doumee.dao.business.*;
+import com.doumee.dao.business.dao.SmsConfigMapper;
+import com.doumee.dao.business.dao.SmsEmailMapper;
import com.doumee.dao.business.model.*;
+
+import com.doumee.service.business.impl.SmsEmailServiceImpl;
+import com.doumee.service.business.third.EmayService;
import com.doumee.service.business.third.WmsService;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import lombok.extern.slf4j.Slf4j;
@@ -20,8 +28,11 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+import java.math.BigDecimal;
import java.util.*;
+import java.util.stream.Collectors;
/**
* WMS骞冲彴瀵规帴Service瀹炵幇
@@ -47,7 +58,16 @@
private SystemDictDataBiz systemDictDataBiz;
@Autowired
private WmsInterfaceLogMapper wmsInterfaceLogMapper;
-
+ @Autowired
+ private SmsConfigMapper smsConfigMapper;
+ @Autowired
+ private SmsEmailMapper smsEmailMapper;
+ @Autowired
+ private EmayService emayService;
+ @Autowired
+ private RetentionMapper retentionMapper;
+ @Autowired
+ private WxNoticeConfigMapper wxNoticeConfigMapper;
/**
* 鍏ュ簱閫氱煡浠诲姟涓氬姟澶勭悊
* @param job 鍙傛暟
@@ -73,17 +93,34 @@
}
WmsOrderPlatformRequest param = new WmsOrderPlatformRequest();
param.setData(new ArrayList<>());
- WmsOrderPlatformInfoRequest o = new WmsOrderPlatformInfoRequest();
- o.setCarrierBillCode(job.getBillCode());
- o.setRailwayNo(job.getPlatformWmsCode());
- param.getData().add(o);
- String url = type == 0?systemDictDataBiz.queryByCode(Constants.WSM_PARAM,Constants.WMS_INBOUND_PLATFROM_URL).getCode():systemDictDataBiz.queryByCode(Constants.WSM_PARAM,Constants.WMS_OUTBOUND_PLATFROM_URL).getCode();;
- String name = type ==0?"銆怶MS銆戝叆搴綔涓氬崟鍒嗛厤鏈堝彴":"銆怶MS銆戝嚭搴撲綔涓氱殑鍒嗛厤鏈堝彴";
+
+ List<PlatformWmsDetail> platformWmsDetailList = platformWmsDetailMapper.selectList(new QueryWrapper<PlatformWmsDetail>().lambda()
+ .eq(PlatformWmsDetail::getJobId,job.getId())
+ .eq(PlatformWmsDetail::getIsdeleted,Constants.ZERO)
+ );
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(platformWmsDetailList)){
+ for (PlatformWmsDetail platformWmsDetail:platformWmsDetailList) {
+ if(StringUtils.isNotBlank(platformWmsDetail.getIocode())){
+ WmsOrderPlatformInfoRequest o = new WmsOrderPlatformInfoRequest();
+ o.setCarrierBillCode(platformWmsDetail.getIocode());
+ o.setRailwayNo(job.getPlatformWmsCode());
+ param.getData().add(o);
+ }
+ }
+ }
+
+ String url = type == 0?systemDictDataBiz.queryByCode(Constants.WMS_PARAM,Constants.WMS_INBOUND_PLATFROM_URL).getCode():
+ systemDictDataBiz.queryByCode(Constants.WMS_PARAM,Constants.WMS_OUTBOUND_PLATFROM_URL).getCode();;
+ String name = type ==0?"銆怶MS銆戝叆搴撲綔涓氬崟鍒嗛厤鏈堝彴":"銆怶MS銆戝嚭搴撲綔涓氱殑鍒嗛厤鏈堝彴";
WmsBaseResponse<WmsBaseDataResponse> response = sendHttpRequest(url,name,JSONObject.toJSONString(param),new TypeReference< WmsBaseResponse<WmsBaseDataResponse>>(){});
PlatformJob update = new PlatformJob();
update.setId(job.getId());
update.setWmsSendDate(new Date());
- update.setWmsSendNum(job.getWmsSendNum() + 1);
+ if(Objects.isNull(job.getWmsSendNum())){
+ job.setWmsSendNum(1);
+ }else{
+ update.setWmsSendNum(job.getWmsSendNum() + 1);
+ }
update.setWmsSendPlatformCode(job.getPlatformWmsCode());
if(response!=null && response.getData() !=null
&& response.getData().size()>0 && StringUtils.equals(response.getData().get(0).getSuccess(),WmsBaseResponse.CODE_SUCCESS)){
@@ -105,7 +142,7 @@
*/
@Override
public WmsBaseResponse<WmsInventoryDataResponse> getInventoryList(){
- String url = systemDictDataBiz.queryByCode(Constants.WSM_PARAM,Constants.WMS_GET_INVENTORYLIST_URL).getCode() ;
+ String url = systemDictDataBiz.queryByCode(Constants.WMS_PARAM,Constants.WMS_GET_INVENTORYLIST_URL).getCode() ;
String name = "銆怶MS銆戝簱瀛樻煡璇�" ;
WmsBaseResponse<WmsInventoryDataResponse> response = sendHttpRequest(url,name,JSONObject.toJSONString(new JSONObject()),new TypeReference< WmsBaseResponse<WmsInventoryDataResponse>>(){});
if(response!=null
@@ -229,6 +266,7 @@
job.setPlateNumber(param.getPlateNumber());
job.setType(Constants.ZERO);
job.setIoCreatedate(param.getCreateDate());
+// job.setOrigin(Constants.ONE);
job.setJobId(model.getId());
job.setDriverPhone(param.getDriverPhone());
platformWmsJobMapper.insert(job);
@@ -274,9 +312,32 @@
return returnSuccessReuslt(null);
}
+
private void startEndNoticeToDriver(List<PlatformJob> jobList) {
for(PlatformJob job : jobList){
- //-----TODO-----------浠诲悍锛屽彂閫佸徃鏈哄叕浼楀彿鍜岀煭淇￠�氱煡
+ //-----TODO-----------浠诲悍锛屽彂閫佸徃鏈哄叕浼楀彿鍜�
+ //鐭俊閫氱煡
+ if(Constants.equalsInteger(job.getStatus(),Constants.PlatformJobStatus.WAIT_CONFIRM.getKey())){
+ SmsEmailServiceImpl.sendPlatformJobSms(systemDictDataBiz,
+ emayService,smsEmailMapper,smsConfigMapper,platformJobMapper,job.getId(),
+ SmsConstants.platformJobContent.platformJobNewJob,null,null
+ );
+ //鏌ヨ鍙告満淇℃伅 鍙戦�佸叕浼楀彿閫氱煡
+ if(Objects.nonNull(job.getDriverId())){
+ Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda().eq(Member::getPhone,job.getDriverId()));
+ if(Objects.nonNull(member) && StringUtils.isNotBlank(member.getOpenid())){
+ WxPlatNotice wxPlatNotice = new WxPlatNotice();
+ wxPlatNotice.sendWmsTemplateNotice(
+ wxNoticeConfigMapper,job,
+ WxPlatConstants.platformJobContent.platformJobNewJob,
+ systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),
+ Arrays.asList(member.getOpenid().split(","))
+ );
+ }
+ }
+ }
+
+
}
}
@@ -291,6 +352,7 @@
job.setCarCodeFront(param.getPlateNumber());
job.setDrivierPhone(param.getDriverPhone());
job.setDriverName(param.getDriverName());
+ job.setOrigin(Constants.ONE);
//澶勭悊浣滀笟鐨勮溅杈嗐�佸徃鏈恒�佹湀鍙扮粍鍏宠仈鍏崇郴锛屽嵏璐�
dealCarPlatformAndDriverInfo(job,0);
// platformJobMapper.insert(job);
@@ -310,9 +372,22 @@
//濡傛灉鏄嚜鏈夌墿娴佽溅
job.setType(type==0?Constants.platformJobType.zycxh:Constants.platformJobType.zyczh);//鑷湁杞﹀嵏璐�/瑁呰揣
job.setCarCodeBack(job.getCarCodeFront());//鑷湁杞﹂粯璁ゅ墠鍚庤溅鐗屼竴鏍�
- if(Constants.equalsInteger(car.getInStatus(),Constants.ONE) && car.getJobNum() == 0) {
+ if(retentionMapper.selectCount(new QueryWrapper<Retention>().lambda().eq(Retention::getType,Constants.THREE)
+ .eq(Retention::getCarNo,car.getCode()))>Constants.ZERO && car.getJobNum() == 0){
//濡傛灉杞﹁締鍦ㄥ洯
job.setStatus(Constants.PlatformJobStatus.WAIT_CALL.getKey());//鍦ㄥ洯鏃犱綔涓氱姸鎬侊紝鍒欒嚜鍔ㄣ�愬凡绛惧埌銆戝鐞�
+ job.setArriveDate(new Date());
+ job.setSingType(Constants.TWO);
+ job.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)){
+ job.setSignNum(Constants.ONE);
+ } else{
+ int maxNumber = Collections.max(signList.stream().map(i->i.getSignNum()).collect(Collectors.toList()));
+ job.setSignNum(maxNumber + Constants.ONE);
+ }
}
}
PlatformGroup group = platformGroupMapper.selectOne(new QueryWrapper<PlatformGroup>().lambda()
@@ -346,6 +421,7 @@
job.setCarCodeFront(param.getPlateNumber());
job.setDrivierPhone(param.getDriverPhone());
job.setDriverName(param.getDriverName());
+ job.setOrigin(Constants.ONE);
//澶勭悊浣滀笟鐨勮溅杈嗐�佸徃鏈恒�佹湀鍙扮粍鍏宠仈鍏崇郴锛岃璐�
dealCarPlatformAndDriverInfo(job,1);
return job;
@@ -363,6 +439,7 @@
return returnFailReuslt("璇锋眰鍙傛暟涓嶆纭紝鍙傛暟涓嶈兘涓虹┖");
}
List<PlatformJob> jobList = new ArrayList<>();
+ List<Integer> jobIdList = new ArrayList<>();
List<PlatformWmsDetail> details = new ArrayList<>();
List<String> iocodeList = new ArrayList<>();
for(WmsOutboundNoticeRequest param : list.getData()){
@@ -397,9 +474,10 @@
job.setContractNum(param.getContractNum());
job.setDriverPhone(param.getDriverPhone());
job.setDriverName(param.getDriverName());
+// job.setOrigin(Constants.ONE);
platformWmsJobMapper.insert(job);
- jobList.add(model);
}
+ jobIdList.add(job.getId());
if(param.getDetails()!=null && param.getDetails().size()>0){
for(WmsOutboundDetailRequest d :param.getDetails()){
PlatformWmsDetail entity = new PlatformWmsDetail();
@@ -409,6 +487,7 @@
entity.setJobId(job.getJobId());
entity.setWmsJobId(job.getId());
entity.setIoQty(d.getIoQty());
+ entity.setRepertotyAddress(job.getRepertotyAddress());
entity.setWmsJobId(job.getId());
entity.setStatus(Constants.ZERO);
entity.setRate(d.getRate());
@@ -425,12 +504,14 @@
.in(PlatformWmsDetail::getIocode,iocodeList)
);
}
+ jobIdList.add(job.getId());
}
}
if(details.size()>0){
platformWmsDetailMapper.insert(details);
}
if(jobList.size()>0){
+ list.setJobIdList(jobIdList);
startEndNoticeToDriver(jobList);
}
}catch (Exception e){
@@ -465,6 +546,52 @@
.set(PlatformWmsDetail::getStatus,Constants.TWO)
.in(PlatformWmsDetail::getIocode,iocodeList)
.eq(PlatformWmsDetail::getIsdeleted, Constants.ZERO));
+
+ platformWmsJobMapper.update(null,new UpdateWrapper<PlatformWmsJob>().lambda()
+ .set(PlatformWmsJob::getStatus,Constants.TWO)
+ .in(PlatformWmsJob::getIocode,iocodeList)
+ .eq(PlatformWmsJob::getIsdeleted, Constants.ZERO));
+
+ List<PlatformWmsJob> platformWmsJob = platformWmsJobMapper.selectList(new QueryWrapper<PlatformWmsJob>().lambda()
+ .in(PlatformWmsJob::getIocode,iocodeList)
+ .eq(PlatformWmsJob::getIsdeleted, Constants.ZERO)
+ );
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(platformWmsJob)){
+ List<Integer> jobIds = platformWmsJob.stream().filter(i->Objects.nonNull(i.getJobId())).map(i->i.getJobId()).collect(Collectors.toList());
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(jobIds)){
+ Set<Integer> setJobIds = new HashSet<>(jobIds);
+ platformJobMapper.update(null,new UpdateWrapper<PlatformJob>()
+ .lambda()
+ .set(PlatformJob::getStatus,Constants.PlatformJobStatus.CANCEL.getKey())
+ .in(PlatformJob::getId,setJobIds)
+ );
+
+ for (Integer jobId:setJobIds
+ ) {
+ //鐭俊閫氱煡
+ SmsEmailServiceImpl.sendPlatformJobSms(systemDictDataBiz,
+ emayService,smsEmailMapper,smsConfigMapper,platformJobMapper,jobId,
+ SmsConstants.platformJobContent.platformJobStopJob,null,null
+ );
+ //鍏紬鍙烽�氱煡鍙告満 浠诲姟鍙栨秷
+ PlatformJob job = platformJobMapper.selectById(jobId);
+ if(Objects.nonNull(job)){
+ Member member = memberMapper.selectById(job.getDriverId());
+ if(Objects.nonNull(member) && StringUtils.isNotBlank(member.getOpenid())){
+ WxPlatNotice wxPlatNotice = new WxPlatNotice();
+ wxPlatNotice.sendWmsCancelTemplateNotice(
+ wxNoticeConfigMapper,job,
+ WxPlatConstants.platformJobContent.platformJobCancel,
+ systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),
+ Arrays.asList(member.getOpenid().split(","))
+ );
+ }
+ }
+
+ }
+ }
+ }
+
}catch (Exception e){
log.error("銆怶MS銆戝鐞嗗叆搴撳彇娑堥�氱煡涓氬姟===============涓氬姟澶勭悊寮傚父"+e.getMessage());
return returnFailReuslt("涓氬姟澶勭悊寮傚父");
@@ -496,6 +623,51 @@
.set(PlatformWmsDetail::getStatus,Constants.TWO)
.in(PlatformWmsDetail::getIocode,iocodeList)
.eq(PlatformWmsDetail::getIsdeleted, Constants.ZERO));
+
+ platformWmsJobMapper.update(null,new UpdateWrapper<PlatformWmsJob>().lambda()
+ .set(PlatformWmsJob::getStatus,Constants.TWO)
+ .in(PlatformWmsJob::getIocode,iocodeList)
+ .eq(PlatformWmsJob::getIsdeleted, Constants.ZERO));
+
+ List<PlatformWmsJob> platformWmsJob = platformWmsJobMapper.selectList(new QueryWrapper<PlatformWmsJob>().lambda()
+ .in(PlatformWmsJob::getIocode,iocodeList)
+ .eq(PlatformWmsJob::getIsdeleted, Constants.ZERO)
+ );
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(platformWmsJob)){
+ List<Integer> jobIds = platformWmsJob.stream().filter(i->Objects.nonNull(i.getJobId())).map(i->i.getJobId()).collect(Collectors.toList());
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(jobIds)){
+ Set<Integer> setJobIds = new HashSet<>(jobIds);
+ platformJobMapper.update(null,new UpdateWrapper<PlatformJob>()
+ .lambda()
+ .set(PlatformJob::getStatus,Constants.PlatformJobStatus.CANCEL.getKey())
+ .in(PlatformJob::getId,setJobIds)
+ );
+ for (Integer jobId:setJobIds
+ ) {
+ SmsEmailServiceImpl.sendPlatformJobSms(systemDictDataBiz,
+ emayService,smsEmailMapper,smsConfigMapper,platformJobMapper,jobId,
+ SmsConstants.platformJobContent.platformJobStopJob,null,null
+ );
+
+ //鍏紬鍙烽�氱煡鍙告満 浠诲姟鍙栨秷
+ PlatformJob job = platformJobMapper.selectById(jobId);
+ if(Objects.nonNull(job)){
+ Member member = memberMapper.selectById(job.getDriverId());
+ if(Objects.nonNull(member) && StringUtils.isNotBlank(member.getOpenid())){
+ WxPlatNotice wxPlatNotice = new WxPlatNotice();
+ wxPlatNotice.sendWmsCancelTemplateNotice(
+ wxNoticeConfigMapper,job,
+ WxPlatConstants.platformJobContent.platformJobCancel,
+ systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),
+ Arrays.asList(member.getOpenid().split(","))
+ );
+ }
+ }
+ }
+ }
+ }
+
+
}catch (Exception e){
log.error("銆怶MS銆戝嚭搴撳彇娑堥�氱煡浠诲姟涓氬姟澶勭悊===============涓氬姟澶勭悊寮傚父"+e.getMessage());
return returnFailReuslt("涓氬姟澶勭悊寮傚父");
@@ -503,6 +675,33 @@
return returnSuccessReuslt(null);
}
/**
+ * 澶勭悊浣滀笟琛屾暟鎹殑杩愯緭鎬婚噺淇℃伅
+ * @param jobList 鍙傛暟
+ * @return
+ */
+ @Override
+ public void computjobTotalNum(List<Integer> jobList) {
+ if(jobList==null || jobList.size()==0){
+ return;
+ }
+ for(Integer jobId : jobList){
+ BigDecimal num = new BigDecimal(0);
+ List<PlatformWmsDetail> details = platformWmsDetailMapper.selectList( new QueryWrapper<PlatformWmsDetail>().lambda()
+ .eq(PlatformWmsDetail::getJobId,jobId)
+ .eq(PlatformWmsDetail::getIsdeleted, Constants.ZERO));
+ if(details!=null && details.size()>0){
+ for(PlatformWmsDetail d :details){
+ num.add(Constants.formatBigdecimal(d.getIoQty()));
+ }
+ platformJobMapper.update(null,new UpdateWrapper<PlatformJob>().lambda()
+ .set(PlatformJob::getTotalNum,num)
+ .eq(PlatformJob::getOrigin, Constants.ZERO)
+ .eq(PlatformJob::getId, jobId));
+ }
+
+ }
+ }
+ /**
* 浣滀笟瀹屾垚閫氱煡浠诲姟涓氬姟澶勭悊
* @param list 鍙傛暟
* @return
--
Gitblit v1.9.3