From f6f097390b999e261f4369313ee6c6afa1b8c276 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 16 十二月 2024 19:37:36 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/WmsServiceImpl.java | 81 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 76 insertions(+), 5 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 018ff70..17f07a1 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
@@ -12,11 +12,15 @@
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.dao.system.SystemUserMapper;
+import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.impl.SmsEmailServiceImpl;
import com.doumee.service.business.third.EmayService;
import com.doumee.service.business.third.WmsService;
@@ -49,6 +53,8 @@
@Autowired
private MemberMapper memberMapper;
@Autowired
+ private SystemUserMapper systemUserMapper;
+ @Autowired
private PlatformJobMapper platformJobMapper;
@Autowired
private PlatformWmsDetailMapper platformWmsDetailMapper;
@@ -64,6 +70,8 @@
private EmayService emayService;
@Autowired
private RetentionMapper retentionMapper;
+ @Autowired
+ private WxNoticeConfigMapper wxNoticeConfigMapper;
/**
* 鍏ュ簱閫氱煡浠诲姟涓氬姟澶勭悊
* @param job 鍙傛暟
@@ -215,9 +223,9 @@
}
private static void logResult(WmsBaseResponse<WmsBaseDataResponse> res,String name) {
if(StringUtils.equals(res.getData().get(0).getSuccess(), WmsBaseResponse.CODE_SUCCESS)){
- log.info("銆怶MS鎺ュ彛锛�"+name+"銆�================鎴愬姛====\n"+res);
+ log.info("銆怶MS鎺ュ彛锛�"+name+"銆�================鎴愬姛====\n"+ JSONObject.toJSONString(res));
}else{
- log.error("銆怶MS鎺ュ彛锛�"+name+"銆�================澶辫触====锛歕n"+ res);
+ log.error("銆怶MS鎺ュ彛锛�"+name+"銆�================澶辫触====锛歕n"+ JSONObject.toJSONString(res));
}
}
/**
@@ -262,7 +270,7 @@
job.setPlateNumber(param.getPlateNumber());
job.setType(Constants.ZERO);
job.setIoCreatedate(param.getCreateDate());
- job.setOrigin(Constants.ONE);
+// job.setOrigin(Constants.ONE);
job.setJobId(model.getId());
job.setDriverPhone(param.getDriverPhone());
platformWmsJobMapper.insert(job);
@@ -311,14 +319,33 @@
private void startEndNoticeToDriver(List<PlatformJob> jobList) {
for(PlatformJob job : jobList){
- //-----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())){
+ //鍙戦�佸叕浼楀彿閫氱煡 缁欐彁浜や汉
+ SystemUser driver = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda()
+ .eq(SystemUser::getDeleted, Constants.ZERO)
+ .eq(SystemUser::getType, Constants.ZERO)
+ .eq(SystemUser::getMobile,job.getDrivierPhone())
+ .last(" limit 1 "));
+ if(Objects.nonNull(driver) && StringUtils.isNotBlank(driver.getOpenid())){
+ WxPlatNotice wxPlatNotice = new WxPlatNotice();
+ wxPlatNotice.sendWmsTemplateNotice(systemDictDataBiz,
+ wxNoticeConfigMapper,job,
+ WxPlatConstants.platformJobContent.platformJobNewJob,
+ systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),
+ Arrays.asList(driver.getOpenid().split(","))
+ );
+ }
+ }
}
+
+
}
}
@@ -333,6 +360,7 @@
job.setCarCodeFront(param.getPlateNumber());
job.setDrivierPhone(param.getDriverPhone());
job.setDriverName(param.getDriverName());
+ job.setOrigin(Constants.ONE);
//澶勭悊浣滀笟鐨勮溅杈嗐�佸徃鏈恒�佹湀鍙扮粍鍏宠仈鍏崇郴锛屽嵏璐�
dealCarPlatformAndDriverInfo(job,0);
// platformJobMapper.insert(job);
@@ -401,6 +429,7 @@
job.setCarCodeFront(param.getPlateNumber());
job.setDrivierPhone(param.getDriverPhone());
job.setDriverName(param.getDriverName());
+ job.setOrigin(Constants.ONE);
//澶勭悊浣滀笟鐨勮溅杈嗐�佸徃鏈恒�佹湀鍙扮粍鍏宠仈鍏崇郴锛岃璐�
dealCarPlatformAndDriverInfo(job,1);
return job;
@@ -453,7 +482,7 @@
job.setContractNum(param.getContractNum());
job.setDriverPhone(param.getDriverPhone());
job.setDriverName(param.getDriverName());
- job.setOrigin(Constants.ONE);
+// job.setOrigin(Constants.ONE);
platformWmsJobMapper.insert(job);
}
jobIdList.add(job.getId());
@@ -544,12 +573,35 @@
.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)){
+
+ //鍙戦�佸叕浼楀彿閫氱煡 缁欐彁浜や汉
+ SystemUser driver = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda()
+ .eq(SystemUser::getDeleted, Constants.ZERO)
+ .eq(SystemUser::getType, Constants.ZERO)
+ .eq(SystemUser::getMobile,job.getDrivierPhone())
+ .last(" limit 1 "));
+ if(Objects.nonNull(driver) && StringUtils.isNotBlank(driver.getOpenid())){
+ WxPlatNotice wxPlatNotice = new WxPlatNotice();
+ wxPlatNotice.sendWmsCancelTemplateNotice(systemDictDataBiz,
+ wxNoticeConfigMapper,job,
+ WxPlatConstants.platformJobContent.platformJobCancel,
+ systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),
+ Arrays.asList(driver.getOpenid().split(","))
+ );
+ }
+ }
+
}
}
}
@@ -610,6 +662,25 @@
emayService,smsEmailMapper,smsConfigMapper,platformJobMapper,jobId,
SmsConstants.platformJobContent.platformJobStopJob,null,null
);
+
+ //鍏紬鍙烽�氱煡鍙告満 浠诲姟鍙栨秷
+ PlatformJob job = platformJobMapper.selectById(jobId);
+ if(Objects.nonNull(job)){ //鍙戦�佸叕浼楀彿閫氱煡 缁欐彁浜や汉
+ SystemUser driver = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda()
+ .eq(SystemUser::getDeleted, Constants.ZERO)
+ .eq(SystemUser::getType, Constants.ZERO)
+ .eq(SystemUser::getMobile,job.getDrivierPhone())
+ .last(" limit 1 "));
+ if(Objects.nonNull(driver) && StringUtils.isNotBlank(driver.getOpenid())){
+ WxPlatNotice wxPlatNotice = new WxPlatNotice();
+ wxPlatNotice.sendWmsCancelTemplateNotice(systemDictDataBiz,
+ wxNoticeConfigMapper,job,
+ WxPlatConstants.platformJobContent.platformJobCancel,
+ systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),
+ Arrays.asList(driver.getOpenid().split(","))
+ );
+ }
+ }
}
}
}
--
Gitblit v1.9.3