java_project
/
logisticsplatform-service
4
0
Fork 0
Code Issues Pull Requests Activity
Browse Source

1.干线-bug修复

chenglong
zhenghaoyu 1 year ago
parent
44715f7265
commit
f07185f1f2
3 changed files with 222 additions and 128 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 320
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataCodeServiceImpl.java
  2. 6
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineLoadSignOrderMapper.xml
  3. 24
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java

320
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataCodeServiceImpl.java
Unescape View File

@ -1,9 +1,7 @@
package com.logpm.basicdata.service.impl; package com.logpm.basicdata.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.logpm.basic.feign.IBasicTenantCodeClient; import com.logpm.basic.feign.IBasicTenantCodeClient;
import com.logpm.basicdata.entity.BasicdataCodeRecordEntity; import com.logpm.basicdata.entity.BasicdataCodeRecordEntity;
import com.logpm.basicdata.entity.BasicdataTrayEntity;
import com.logpm.basicdata.entity.BasicdataWarehouseEntity; import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
import com.logpm.basicdata.feign.IBasicdataWarehouseClient; import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
import com.logpm.basicdata.mapper.BasicdataTrayMapper; import com.logpm.basicdata.mapper.BasicdataTrayMapper;
@ -103,23 +101,39 @@ public class BasicdataCodeServiceImpl implements IBasicdataCodeService {
} }
String dateShort = CommonUtil.dateToStringDiv(new Date(),"yyMMdd"); BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseService.getWarehouseEntityByWarehouseCode(warehouseCode);
if(Objects.isNull(basicdataWarehouseEntity)){
log.warn("############getWayBillNo: 仓库信息不存在 warehouseCode={}",warehouseCode);
return null;
}
Calendar calendar = Calendar.getInstance();
//获取年份
Integer year = calendar.get(Calendar.YEAR);
// 获取月份（注意月份从0开始计数）
Integer month = calendar.get(Calendar.MONTH) + 1;
String key = warehouseCode+":ZFQS:"+dateShort;
//获得序号 BasicdataCodeRecordEntity basicdataCodeRecordEntity = basicdataCodeRecordService.findEntityByCodeTypeAndWarehouseCodeAndYearAndMonth(type,warehouseCode,year+"",month+"");
Boolean exists = bladeRedis.exists(key);
Long incr = null; if(Objects.isNull(basicdataCodeRecordEntity)){
if(exists){ basicdataCodeRecordEntity = new BasicdataCodeRecordEntity();
incr = bladeRedis.incr(key); basicdataCodeRecordEntity.setCodeType(type);
}else{ basicdataCodeRecordEntity.setWarehouseId(basicdataWarehouseEntity.getId());
String value = dateShort+"00001"; basicdataCodeRecordEntity.setWarehouseName(basicdataWarehouseEntity.getName());
incr = Long.parseLong(value); basicdataCodeRecordEntity.setWarehouseCode(warehouseCode);
bladeRedis.set(key,incr); basicdataCodeRecordEntity.setYear(year+"");
bladeRedis.expireAt(key,CommonUtil.getDayEnd()); basicdataCodeRecordEntity.setMonth(month+"");
basicdataCodeRecordEntity.setNum(0);
basicdataCodeRecordService.save(basicdataCodeRecordEntity);
} }
Integer inrc = basicdataCodeRecordEntity.getNum() + 1;
basicdataCodeRecordEntity.setNum(inrc);
basicdataCodeRecordService.updateById(basicdataCodeRecordEntity);
return warehouseCode+"ZFQS"+CommonUtil.geFourNumber(incr,5); return warehouseCode+"ZFQS"+year+CommonUtil.geFourNumber(month.longValue(), 2)+CommonUtil.geFourNumber(inrc.longValue(), 5);
} }
@ -130,23 +144,39 @@ public class BasicdataCodeServiceImpl implements IBasicdataCodeService {
} }
String f = "ZZ"; String f = "ZZ";
String dateShort = CommonUtil.dateToStringDiv(new Date(),"yyMMdd"); BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseService.getWarehouseEntityByWarehouseCode(warehouseCode);
if(Objects.isNull(basicdataWarehouseEntity)){
log.warn("############getWayBillNo: 仓库信息不存在 warehouseCode={}",warehouseCode);
return null;
}
String key = warehouseCode+f+":"+dateShort; Calendar calendar = Calendar.getInstance();
//获取年份
Integer year = calendar.get(Calendar.YEAR);
//获得序号 // 获取月份（注意月份从0开始计数）
Boolean exists = bladeRedis.exists(key); Integer month = calendar.get(Calendar.MONTH) + 1;
Long incr = null;
if(exists){
incr = bladeRedis.incr(key); BasicdataCodeRecordEntity basicdataCodeRecordEntity = basicdataCodeRecordService.findEntityByCodeTypeAndWarehouseCodeAndYearAndMonth(type,warehouseCode,year+"",month+"");
}else{
String value = dateShort+"00001"; if(Objects.isNull(basicdataCodeRecordEntity)){
incr = Long.parseLong(value); basicdataCodeRecordEntity = new BasicdataCodeRecordEntity();
bladeRedis.set(key,incr); basicdataCodeRecordEntity.setCodeType(type);
bladeRedis.expireAt(key,CommonUtil.getDayEnd()); basicdataCodeRecordEntity.setWarehouseId(basicdataWarehouseEntity.getId());
basicdataCodeRecordEntity.setWarehouseName(basicdataWarehouseEntity.getName());
basicdataCodeRecordEntity.setWarehouseCode(warehouseCode);
basicdataCodeRecordEntity.setYear(year+"");
basicdataCodeRecordEntity.setMonth(month+"");
basicdataCodeRecordEntity.setNum(0);
basicdataCodeRecordService.save(basicdataCodeRecordEntity);
} }
Integer inrc = basicdataCodeRecordEntity.getNum() + 1;
basicdataCodeRecordEntity.setNum(inrc);
basicdataCodeRecordService.updateById(basicdataCodeRecordEntity);
return warehouseCode+f+CommonUtil.geFourNumber(incr,5); return warehouseCode+f+year+CommonUtil.geFourNumber(month.longValue(), 2)+CommonUtil.geFourNumber(inrc.longValue(),5);
} }
private String generateTrunklineCarsLineCode(Integer type, String warehouseCode, String orderCode) { private String generateTrunklineCarsLineCode(Integer type, String warehouseCode, String orderCode) {
@ -165,24 +195,39 @@ public class BasicdataCodeServiceImpl implements IBasicdataCodeService {
return null; return null;
} }
BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseService.getWarehouseEntityByWarehouseCode(warehouseCode);
if(Objects.isNull(basicdataWarehouseEntity)){
log.warn("############getWayBillNo: 仓库信息不存在 warehouseCode={}",warehouseCode);
return null;
}
String dateShort = CommonUtil.dateToStringDiv(new Date(),"yyMMdd"); Calendar calendar = Calendar.getInstance();
//获取年份
Integer year = calendar.get(Calendar.YEAR);
String key = warehouseCode+f+":"+dateShort; // 获取月份（注意月份从0开始计数）
Integer month = calendar.get(Calendar.MONTH) + 1;
//获得序号
Boolean exists = bladeRedis.exists(key); BasicdataCodeRecordEntity basicdataCodeRecordEntity = basicdataCodeRecordService.findEntityByCodeTypeAndWarehouseCodeAndYearAndMonth(type,warehouseCode,year+"",month+"");
Long incr = null;
if(exists){ if(Objects.isNull(basicdataCodeRecordEntity)){
incr = bladeRedis.incr(key); basicdataCodeRecordEntity = new BasicdataCodeRecordEntity();
}else{ basicdataCodeRecordEntity.setCodeType(type);
String value = dateShort+"00001"; basicdataCodeRecordEntity.setWarehouseId(basicdataWarehouseEntity.getId());
incr = Long.parseLong(value); basicdataCodeRecordEntity.setWarehouseName(basicdataWarehouseEntity.getName());
bladeRedis.set(key,incr); basicdataCodeRecordEntity.setWarehouseCode(warehouseCode);
bladeRedis.expireAt(key,CommonUtil.getDayEnd()); basicdataCodeRecordEntity.setYear(year+"");
basicdataCodeRecordEntity.setMonth(month+"");
basicdataCodeRecordEntity.setNum(0);
basicdataCodeRecordService.save(basicdataCodeRecordEntity);
} }
Integer inrc = basicdataCodeRecordEntity.getNum() + 1;
return warehouseCode+f+CommonUtil.geFourNumber(incr,5); basicdataCodeRecordEntity.setNum(inrc);
basicdataCodeRecordService.updateById(basicdataCodeRecordEntity);
return warehouseCode+f+year+CommonUtil.geFourNumber(month.longValue(), 2)+CommonUtil.geFourNumber(inrc.longValue(), 5);
} }
@ -191,25 +236,38 @@ public class BasicdataCodeServiceImpl implements IBasicdataCodeService {
log.warn("############generateTrunklineBillladingCode: 仓库编码为空warehouseCode={}",warehouseCode); log.warn("############generateTrunklineBillladingCode: 仓库编码为空warehouseCode={}",warehouseCode);
return null; return null;
} }
//获得年月日短字符串 BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseService.getWarehouseEntityByWarehouseCode(warehouseCode);
String dateShort = CommonUtil.dateToStringShort(new Date()); if(Objects.isNull(basicdataWarehouseEntity)){
log.warn("############getWayBillNo: 仓库信息不存在 warehouseCode={}",warehouseCode);
return null;
}
String key = warehouseCode+"TH"+":"+dateShort; Calendar calendar = Calendar.getInstance();
//获取年份
Integer year = calendar.get(Calendar.YEAR);
//获得序号 // 获取月份（注意月份从0开始计数）
Boolean exists = bladeRedis.exists(key); Integer month = calendar.get(Calendar.MONTH) + 1;
Long incr = null;
if(exists){
incr = bladeRedis.incr(key);
}else{
String value = dateShort+"00001";
incr = Long.parseLong(value);
bladeRedis.set(key,incr);
bladeRedis.expireAt(key,CommonUtil.getMonthDayEnd());
BasicdataCodeRecordEntity basicdataCodeRecordEntity = basicdataCodeRecordService.findEntityByCodeTypeAndWarehouseCodeAndYearAndMonth(type,warehouseCode,year+"",month+"");
if(Objects.isNull(basicdataCodeRecordEntity)){
basicdataCodeRecordEntity = new BasicdataCodeRecordEntity();
basicdataCodeRecordEntity.setCodeType(type);
basicdataCodeRecordEntity.setWarehouseId(basicdataWarehouseEntity.getId());
basicdataCodeRecordEntity.setWarehouseName(basicdataWarehouseEntity.getName());
basicdataCodeRecordEntity.setWarehouseCode(warehouseCode);
basicdataCodeRecordEntity.setYear(year+"");
basicdataCodeRecordEntity.setMonth(month+"");
basicdataCodeRecordEntity.setNum(0);
basicdataCodeRecordService.save(basicdataCodeRecordEntity);
} }
Integer inrc = basicdataCodeRecordEntity.getNum() + 1;
return warehouseCode+"TH"+CommonUtil.geFourNumber(incr,5); basicdataCodeRecordEntity.setNum(inrc);
basicdataCodeRecordService.updateById(basicdataCodeRecordEntity);
return warehouseCode+"TH"+year+CommonUtil.geFourNumber(month.longValue(),2)+CommonUtil.geFourNumber(inrc.longValue(),5);
} }
private String generateExOrderCode(Integer type, String warehouseCode, String orderCode) { private String generateExOrderCode(Integer type, String warehouseCode, String orderCode) {
@ -220,17 +278,41 @@ public class BasicdataCodeServiceImpl implements IBasicdataCodeService {
//HTEX+仓库code+年月日+（仓库当天的数量+1） //HTEX+仓库code+年月日+（仓库当天的数量+1）
//获得年月日短字符串 BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseService.getWarehouseEntityByWarehouseCode(warehouseCode);
String dateShort = CommonUtil.dateToStringShort(new Date()); if(Objects.isNull(basicdataWarehouseEntity)){
log.warn("############getWayBillNo: 仓库信息不存在 warehouseCode={}",warehouseCode);
return null;
}
String key = "HTEX"+":"+warehouseCode+":"+dateShort; Calendar calendar = Calendar.getInstance();
//获得序号 //获取年份
Long incr = bladeRedis.incr(key); Integer year = calendar.get(Calendar.YEAR);
if(1 == incr){
//如果为1就是刚刚才建立，给他一个过期时间 // 获取月份（注意月份从0开始计数）
bladeRedis.expireAt(key,CommonUtil.getMonthDayEnd()); Integer month = calendar.get(Calendar.MONTH) + 1;
// 获取日期
Integer day = calendar.get(Calendar.DAY_OF_MONTH);
BasicdataCodeRecordEntity basicdataCodeRecordEntity = basicdataCodeRecordService.findEntityByCodeTypeAndWarehouseCodeAndYearAndMonth(type,warehouseCode,year+"",month+"");
if(Objects.isNull(basicdataCodeRecordEntity)){
basicdataCodeRecordEntity = new BasicdataCodeRecordEntity();
basicdataCodeRecordEntity.setCodeType(type);
basicdataCodeRecordEntity.setWarehouseId(basicdataWarehouseEntity.getId());
basicdataCodeRecordEntity.setWarehouseName(basicdataWarehouseEntity.getName());
basicdataCodeRecordEntity.setWarehouseCode(warehouseCode);
basicdataCodeRecordEntity.setYear(year+"");
basicdataCodeRecordEntity.setMonth(month+"");
basicdataCodeRecordEntity.setNum(0);
basicdataCodeRecordService.save(basicdataCodeRecordEntity);
} }
return "HTEX"+warehouseCode+CommonUtil.geFourNumber(incr,5); Integer inrc = basicdataCodeRecordEntity.getNum() + 1;
basicdataCodeRecordEntity.setNum(inrc);
basicdataCodeRecordService.updateById(basicdataCodeRecordEntity);
return "HTEX"+warehouseCode+year+CommonUtil.geFourNumber(month.longValue(), 2)+CommonUtil.geFourNumber(day.longValue(), 2)+CommonUtil.geFourNumber(inrc.longValue(),5);
} }
private String generateTraysCode(Integer type, String warehouseCode) { private String generateTraysCode(Integer type, String warehouseCode) {
@ -240,42 +322,39 @@ public class BasicdataCodeServiceImpl implements IBasicdataCodeService {
} }
//托盘 HT+仓库拼音+ 年月 +【当前仓库总数+1（五位数 不足补零）】 //托盘 HT+仓库拼音+ 年月 +【当前仓库总数+1（五位数 不足补零）】
//通过仓库编码获取仓库简写 BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseService.getWarehouseEntityByWarehouseCode(warehouseCode);
BasicdataWarehouseEntity entity = basicdataWarehouseService.getWarehouseEntityByWarehouseCode(warehouseCode); if(Objects.isNull(basicdataWarehouseEntity)){
if(Objects.isNull(entity)){ log.warn("############getWayBillNo: 仓库信息不存在 warehouseCode={}",warehouseCode);
log.warn("############generateTraysCode: 未找到对应仓库warehouseCode={}",warehouseCode);
return null; return null;
} }
// String abbreviation = entity.getAbbreviation();//简称
String code = entity.getWarehouseCode();
//获得年月日短字符串
// String dateShort = CommonUtil.dateToStringShortYM(new Date());
String key = "HT"+":"+code; Calendar calendar = Calendar.getInstance();
String HTCD = "HT" + code; //获取年份
Integer year = calendar.get(Calendar.YEAR);
//获得序号 // 获取月份（注意月份从0开始计数）
Long incr = bladeRedis.incr(key); Integer month = calendar.get(Calendar.MONTH) + 1;
//托盘码查重
BasicdataTrayEntity basicdataTrayEntity = basicdataTrayMapper.selectOne(new QueryWrapper<BasicdataTrayEntity>().lambda()
.eq(BasicdataTrayEntity::getIsDeleted,0) BasicdataCodeRecordEntity basicdataCodeRecordEntity = basicdataCodeRecordService.findEntityByCodeTypeAndWarehouseCodeAndYearAndMonth(type,warehouseCode,year+"",month+"");
.like(BasicdataTrayEntity::getPalletCode,HTCD)
.orderByDesc(BasicdataTrayEntity::getCreateTime) if(Objects.isNull(basicdataCodeRecordEntity)){
.last("limit 1")); basicdataCodeRecordEntity = new BasicdataCodeRecordEntity();
if (null!= basicdataTrayEntity){ basicdataCodeRecordEntity.setCodeType(type);
int number2 = Integer.parseInt(basicdataTrayEntity.getPalletCode().substring(basicdataTrayEntity.getPalletCode().length() - 6)); basicdataCodeRecordEntity.setWarehouseId(basicdataWarehouseEntity.getId());
if (number2>=incr){ basicdataCodeRecordEntity.setWarehouseName(basicdataWarehouseEntity.getName());
//设置缓存 basicdataCodeRecordEntity.setWarehouseCode(warehouseCode);
bladeRedis.set(key,Long.valueOf(number2+1)); basicdataCodeRecordEntity.setYear(year+"");
return HTCD+CommonUtil.geFourNumber(Long.valueOf(number2+1), 6); basicdataCodeRecordEntity.setMonth(month+"");
} basicdataCodeRecordEntity.setNum(0);
basicdataCodeRecordService.save(basicdataCodeRecordEntity);
} }
// if(1 == incr){ Integer inrc = basicdataCodeRecordEntity.getNum() + 1;
// //如果为1就是刚刚才建立，给他一个过期时间
// bladeRedis.expireAt(key,CommonUtil.getMonthDayEnd());
// }
return HTCD+CommonUtil.geFourNumber(incr,6); basicdataCodeRecordEntity.setNum(inrc);
basicdataCodeRecordService.updateById(basicdataCodeRecordEntity);
return "HT"+warehouseCode+year+CommonUtil.geFourNumber(month.longValue(),2)+CommonUtil.geFourNumber(inrc.longValue(),5);
} }
@ -299,10 +378,10 @@ public class BasicdataCodeServiceImpl implements IBasicdataCodeService {
Calendar calendar = Calendar.getInstance(); Calendar calendar = Calendar.getInstance();
//获取年份 //获取年份
int year = calendar.get(Calendar.YEAR); Integer year = calendar.get(Calendar.YEAR);
// 获取月份（注意月份从0开始计数） // 获取月份（注意月份从0开始计数）
int month = calendar.get(Calendar.MONTH) + 1; Integer month = calendar.get(Calendar.MONTH) + 1;
BasicdataCodeRecordEntity basicdataCodeRecordEntity = basicdataCodeRecordService.findEntityByCodeTypeAndWarehouseCodeAndYearAndMonth(type,warehouseCode,year+"",month+""); BasicdataCodeRecordEntity basicdataCodeRecordEntity = basicdataCodeRecordService.findEntityByCodeTypeAndWarehouseCodeAndYearAndMonth(type,warehouseCode,year+"",month+"");
@ -320,7 +399,10 @@ public class BasicdataCodeServiceImpl implements IBasicdataCodeService {
} }
Integer inrc = basicdataCodeRecordEntity.getNum() + 1; Integer inrc = basicdataCodeRecordEntity.getNum() + 1;
return warehouseCode+year+month+CommonUtil.geFourNumber(inrc.longValue(),5); basicdataCodeRecordEntity.setNum(inrc);
basicdataCodeRecordService.updateById(basicdataCodeRecordEntity);
return warehouseCode+year+CommonUtil.geFourNumber(month.longValue(),5)+CommonUtil.geFourNumber(inrc.longValue(),5);
} }
@ -382,26 +464,38 @@ public class BasicdataCodeServiceImpl implements IBasicdataCodeService {
//包条 HT+仓库拼音/超管/职能+年月日时分秒+订单索引+包条个数索引 //包条 HT+仓库拼音/超管/职能+年月日时分秒+订单索引+包条个数索引
String haxCodeByLong = CommonUtil.getHaxCodeByLong(orderCode, 8); String haxCodeByLong = CommonUtil.getHaxCodeByLong(orderCode, 8);
BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseService.getWarehouseEntityByWarehouseCode(warehouseCode);
if(Objects.isNull(basicdataWarehouseEntity)){
log.warn("############getWayBillNo: 仓库信息不存在 warehouseCode={}",warehouseCode);
return null;
}
Calendar calendar = Calendar.getInstance();
//获取年份
Integer year = calendar.get(Calendar.YEAR);
//获得年月日短字符串 // 获取月份（注意月份从0开始计数）
Date date = new Date(); Integer month = calendar.get(Calendar.MONTH) + 1;
String dateShort = CommonUtil.dateToStringShort(date);
//redis的key
String key = warehouseCode + ":" + haxCodeByLong+":"+dateShort;
//获得序号
Boolean exists = bladeRedis.exists(key);
Long incr = null;
if(exists){
incr = bladeRedis.incr(key);
}else{
String value = dateShort+"00001";
incr = Long.parseLong(value);
bladeRedis.set(key,incr);
bladeRedis.expireAt(key,CommonUtil.getMonthDayEnd());
BasicdataCodeRecordEntity basicdataCodeRecordEntity = basicdataCodeRecordService.findEntityByCodeTypeAndWarehouseCodeAndYearAndMonth(type,warehouseCode,year+"",month+"");
if(Objects.isNull(basicdataCodeRecordEntity)){
basicdataCodeRecordEntity = new BasicdataCodeRecordEntity();
basicdataCodeRecordEntity.setCodeType(type);
basicdataCodeRecordEntity.setWarehouseId(basicdataWarehouseEntity.getId());
basicdataCodeRecordEntity.setWarehouseName(basicdataWarehouseEntity.getName());
basicdataCodeRecordEntity.setWarehouseCode(warehouseCode);
basicdataCodeRecordEntity.setYear(year+"");
basicdataCodeRecordEntity.setMonth(month+"");
basicdataCodeRecordEntity.setNum(0);
basicdataCodeRecordService.save(basicdataCodeRecordEntity);
} }
Integer inrc = basicdataCodeRecordEntity.getNum() + 1;
basicdataCodeRecordEntity.setNum(inrc);
basicdataCodeRecordService.updateById(basicdataCodeRecordEntity);
return "HT" + warehouseCode + dateShort + haxCodeByLong + incr; return "HT" + warehouseCode + year + CommonUtil.geFourNumber(month.longValue(),2) + haxCodeByLong + CommonUtil.geFourNumber(inrc.longValue(),6);
} }
} }

6
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineLoadSignOrderMapper.xml
Unescape View File

@ -31,9 +31,9 @@
<if test="param.signStatus != null and param.signStatus == '10'"> <if test="param.signStatus != null and param.signStatus == '10'">
and ltlso.sign_status != '20' and ltlso.sign_status != '20'
</if> </if>
<if test="param.driverId != null"> <!-- <if test="param.driverId != null">-->
and ltcl.driver_id = #{param.driverId} <!-- and ltcl.driver_id = #{param.driverId}-->
</if> <!-- </if>-->
</where> </where>
</select> </select>

24
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
Unescape View File

@ -2851,18 +2851,18 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
page.setCurrent(pageNum); page.setCurrent(pageNum);
page.setSize(pageSize); page.setSize(pageSize);
Long userId = AuthUtil.getUserId(); // Long userId = AuthUtil.getUserId();
if(Objects.isNull(userId)){ // if(Objects.isNull(userId)){
log.warn("###############finaSignOrderList: 登录人id为空"); // log.warn("###############finaSignOrderList: 登录人id为空");
return R.fail(405,"登录人id为空"); // return R.fail(405,"登录人id为空");
} // }
//
BasicdataDriverArteryEntity driverArteryEntity = basicdataDriverArteryClient.getDriverArtery(userId); // BasicdataDriverArteryEntity driverArteryEntity = basicdataDriverArteryClient.getDriverArtery(userId);
if(Objects.isNull(driverArteryEntity)){ // if(Objects.isNull(driverArteryEntity)){
log.warn("###############finaSignOrderList: 未找到司机信息 userId={}",userId); // log.warn("###############finaSignOrderList: 未找到司机信息 userId={}",userId);
return R.fail(405,"未找到司机信息"); // return R.fail(405,"未找到司机信息");
} // }
loadCarsDTO.setDriverId(driverArteryEntity.getId()); // loadCarsDTO.setDriverId(driverArteryEntity.getId());
IPage<TrunklineLoadSignOrderVO> pageList = trunklineLoadSignOrderService.finaSignOrderList(page,loadCarsDTO); IPage<TrunklineLoadSignOrderVO> pageList = trunklineLoadSignOrderService.finaSignOrderList(page,loadCarsDTO);

Write Preview
Loading…
Cancel
Save