|
@@ -22,6 +22,7 @@ import org.springframework.transaction.annotation.Transactional;
|
|
|
import org.springframework.util.CollectionUtils;
|
|
|
|
|
|
import java.lang.reflect.Array;
|
|
|
+import java.text.DateFormat;
|
|
|
import java.text.SimpleDateFormat;
|
|
|
import java.util.*;
|
|
|
|
|
@@ -52,6 +53,8 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
|
|
|
private IRepaymentInfoService repaymentInfoService;
|
|
|
@Autowired
|
|
|
private IProvinceCityInfoService provinceCityInfoService;
|
|
|
+ @Autowired
|
|
|
+ private ICompanyInfoService companyInfoService;
|
|
|
|
|
|
/**
|
|
|
* 地球半径,单位 km
|
|
@@ -77,6 +80,22 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
|
|
|
cargoOwnerInfo.setRefreshTimes(0L);
|
|
|
});
|
|
|
}
|
|
|
+
|
|
|
+ //获取当前年月日
|
|
|
+ SimpleDateFormat f = new SimpleDateFormat("yyyy-MM-dd");//设置日期格式
|
|
|
+ String date = f.format(new Date(System.currentTimeMillis()));
|
|
|
+
|
|
|
+ //查询企业
|
|
|
+// List<CompanyInfo> companyInfos = companyInfoService.selectList(new EntityWrapper<CompanyInfo>().eq("delete_flag","0")
|
|
|
+// .ne("business_term_date","长期"));
|
|
|
+// if(!CollectionUtils.isEmpty(companyInfos)){
|
|
|
+// companyInfos.forEach(companyInfo -> {
|
|
|
+// int result = companyInfo.getBusinessTermDate().compareTo(date);
|
|
|
+// if(result > 0){
|
|
|
+//
|
|
|
+// }
|
|
|
+// });
|
|
|
+// }
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -149,29 +168,96 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
|
|
|
pageView.put("currentPage", publishTaskInfo.getCurrentPage());
|
|
|
// 查询货源总数
|
|
|
Integer dataCount = baseMapper.getCounstByCondition(pageView);
|
|
|
- Page<PublishTaskInfo> page = new Page<>();
|
|
|
+ //货源列表
|
|
|
+ List<PublishTaskInfo> publishTaskInfoList = new ArrayList<>();
|
|
|
+
|
|
|
//推荐货源列表
|
|
|
if ("1".equals(publishTaskInfo.getSearchKeyWord())) {
|
|
|
List<PublishTaskInfo> dataList = baseMapper.getListsByCondition(pageView);
|
|
|
- page.setRecords(dataList == null ? Lists.newArrayList() : dataList);
|
|
|
+ if (!CollectionUtils.isEmpty(dataList)) {
|
|
|
+ //查询发货地经纬度
|
|
|
+ for (int i = 0; i < dataList.size(); i++) {
|
|
|
+ PublishTaskInfo publishTaskInfo1 = dataList.get(i);
|
|
|
+ //发货地经纬度
|
|
|
+ double lat2 = Math.toRadians(Double.valueOf(publishTaskInfo1.getSendLatitude()));
|
|
|
+ double lng2 = Math.toRadians(Double.valueOf(publishTaskInfo1.getSendLongitude()));
|
|
|
+ //根据司机经纬度求货距
|
|
|
+ if(!StringUtils.isEmpty(publishTaskInfo.getDriverLatitude()) && !StringUtils.isEmpty(publishTaskInfo.getDriverLongitude())){
|
|
|
+ double lat1 = Math.toRadians(Double.valueOf(publishTaskInfo.getDriverLatitude()));
|
|
|
+ double lng1 = Math.toRadians(Double.valueOf(publishTaskInfo.getDriverLongitude()));
|
|
|
+ // 纬度之差
|
|
|
+ double a = lat1 - lat2;
|
|
|
+ // 经度之差
|
|
|
+ double b = lng1 - lng2;
|
|
|
+ // 计算两点距离的公式
|
|
|
+ double s = 2 * Math.asin(Math.sqrt(Math.pow(Math.sin(a / 2), 2) +
|
|
|
+ Math.cos(lat1) * Math.cos(lat2) * Math.pow(Math.sin(b / 2), 2)));
|
|
|
+
|
|
|
+ // 弧长乘地球半径, 返回单位: 千米
|
|
|
+ s = s * EARTH_RADIUS;
|
|
|
+ publishTaskInfo1.setCargoDistance(Math.floor(s));
|
|
|
+ }
|
|
|
+ //根据装货城市求货距
|
|
|
+ else if (!StringUtils.isEmpty(publishTaskInfo.getLoadingPlaceCity())) {
|
|
|
+ //根据装货城市获取经纬度
|
|
|
+ String str = EntCoordUtil.getCoordinate(publishTaskInfo.getLoadingPlaceCity());
|
|
|
+ String str1 = str.substring(0, str.indexOf(","));//经度
|
|
|
+ String str2 = str.substring(str1.length() + 1, str.length());//纬度
|
|
|
+
|
|
|
+ //装货地经纬度
|
|
|
+ double lng1 = Math.toRadians(Double.valueOf(str1));
|
|
|
+ double lat1 = Math.toRadians(Double.valueOf(str2));
|
|
|
+ // 纬度之差
|
|
|
+ double a = lat1 - lat2;
|
|
|
+ // 经度之差
|
|
|
+ double b = lng1 - lng2;
|
|
|
+ // 计算两点距离的公式
|
|
|
+ double s = 2 * Math.asin(Math.sqrt(Math.pow(Math.sin(a / 2), 2) +
|
|
|
+ Math.cos(lat1) * Math.cos(lat2) * Math.pow(Math.sin(b / 2), 2)));
|
|
|
+ // 弧长乘地球半径, 返回单位: 千米
|
|
|
+ s = s * EARTH_RADIUS;
|
|
|
+ publishTaskInfo1.setCargoDistance(Math.floor(s));
|
|
|
+ }
|
|
|
+ //根据省会城市求货距
|
|
|
+ else {
|
|
|
+ //根据省名查询省会城市
|
|
|
+ ProvinceCityInfo provinceCityInfo = provinceCityInfoService.selectOne(new EntityWrapper<ProvinceCityInfo>()
|
|
|
+ .like("province", publishTaskInfo.getLoadingPlace()));
|
|
|
+ //根据省会城市获取经纬度
|
|
|
+ String str = EntCoordUtil.getCoordinate(provinceCityInfo.getCity());
|
|
|
+ String str1 = str.substring(0, str.indexOf(","));//经度
|
|
|
+ String str2 = str.substring(str1.length() + 1, str.length());//纬度
|
|
|
+
|
|
|
+ //装货地经纬度
|
|
|
+ double lng1 = Math.toRadians(Double.valueOf(str1));
|
|
|
+ double lat1 = Math.toRadians(Double.valueOf(str2));
|
|
|
+ // 纬度之差
|
|
|
+ double a = lat1 - lat2;
|
|
|
+ // 经度之差
|
|
|
+ double b = lng1 - lng2;
|
|
|
+ // 计算两点距离的公式
|
|
|
+ double s = 2 * Math.asin(Math.sqrt(Math.pow(Math.sin(a / 2), 2) +
|
|
|
+ Math.cos(lat1) * Math.cos(lat2) * Math.pow(Math.sin(b / 2), 2)));
|
|
|
+ // 弧长乘地球半径, 返回单位: 千米
|
|
|
+ s = s * EARTH_RADIUS;
|
|
|
+ publishTaskInfo1.setCargoDistance(Math.floor(s));
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ publishTaskInfoList.addAll(dataList);
|
|
|
}
|
|
|
//按时间排序货源列表
|
|
|
else if ("2".equals(publishTaskInfo.getSearchKeyWord())) {
|
|
|
List<PublishTaskInfo> dataList = baseMapper.getListByTimeCondition(pageView);
|
|
|
- page.setRecords(dataList == null ? Lists.newArrayList() : dataList);
|
|
|
- }
|
|
|
- //按距离排序货源列表
|
|
|
- else {
|
|
|
- List<PublishTaskInfo> dataList = baseMapper.getListsByDistanceCondition(pageView);
|
|
|
- if ("3".equals(publishTaskInfo.getSearchKeyWord())) {
|
|
|
- if (!CollectionUtils.isEmpty(dataList)) {
|
|
|
- //查询发货地经纬度
|
|
|
- for (int i = 0; i < dataList.size(); i++) {
|
|
|
- PublishTaskInfo publishTaskInfo1 = dataList.get(i);
|
|
|
- //发货地经纬度
|
|
|
- double lat2 = Math.toRadians(Double.valueOf(publishTaskInfo1.getSendLatitude()));
|
|
|
- double lng2 = Math.toRadians(Double.valueOf(publishTaskInfo1.getSendLongitude()));
|
|
|
- //司机经纬度
|
|
|
+ if (!CollectionUtils.isEmpty(dataList)) {
|
|
|
+ //查询发货地经纬度
|
|
|
+ for (int i = 0; i < dataList.size(); i++) {
|
|
|
+ PublishTaskInfo publishTaskInfo1 = dataList.get(i);
|
|
|
+ //发货地经纬度
|
|
|
+ double lat2 = Math.toRadians(Double.valueOf(publishTaskInfo1.getSendLatitude()));
|
|
|
+ double lng2 = Math.toRadians(Double.valueOf(publishTaskInfo1.getSendLongitude()));
|
|
|
+ //根据司机经纬度求货距
|
|
|
+ if(!StringUtils.isEmpty(publishTaskInfo.getDriverLatitude()) && !StringUtils.isEmpty(publishTaskInfo.getDriverLongitude())){
|
|
|
double lat1 = Math.toRadians(Double.valueOf(publishTaskInfo.getDriverLatitude()));
|
|
|
double lng1 = Math.toRadians(Double.valueOf(publishTaskInfo.getDriverLongitude()));
|
|
|
// 纬度之差
|
|
@@ -179,18 +265,213 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
|
|
|
// 经度之差
|
|
|
double b = lng1 - lng2;
|
|
|
// 计算两点距离的公式
|
|
|
+ double s = 2 * Math.asin(Math.sqrt(Math.pow(Math.sin(a / 2), 2) +
|
|
|
+ Math.cos(lat1) * Math.cos(lat2) * Math.pow(Math.sin(b / 2), 2)));
|
|
|
+
|
|
|
+ // 弧长乘地球半径, 返回单位: 千米
|
|
|
+ s = s * EARTH_RADIUS;
|
|
|
+ publishTaskInfo1.setCargoDistance(Math.floor(s));
|
|
|
+ }
|
|
|
+ //根据装货城市求货距
|
|
|
+ else if (!StringUtils.isEmpty(publishTaskInfo.getLoadingPlaceCity())) {
|
|
|
+ //根据装货城市获取经纬度
|
|
|
+ String str = EntCoordUtil.getCoordinate(publishTaskInfo.getLoadingPlaceCity());
|
|
|
+ String str1 = str.substring(0, str.indexOf(","));//经度
|
|
|
+ String str2 = str.substring(str1.length() + 1, str.length());//纬度
|
|
|
+
|
|
|
+ //装货地经纬度
|
|
|
+ double lng1 = Math.toRadians(Double.valueOf(str1));
|
|
|
+ double lat1 = Math.toRadians(Double.valueOf(str2));
|
|
|
+ // 纬度之差
|
|
|
+ double a = lat1 - lat2;
|
|
|
+ // 经度之差
|
|
|
+ double b = lng1 - lng2;
|
|
|
+ // 计算两点距离的公式
|
|
|
+ double s = 2 * Math.asin(Math.sqrt(Math.pow(Math.sin(a / 2), 2) +
|
|
|
+ Math.cos(lat1) * Math.cos(lat2) * Math.pow(Math.sin(b / 2), 2)));
|
|
|
+ // 弧长乘地球半径, 返回单位: 千米
|
|
|
+ s = s * EARTH_RADIUS;
|
|
|
+ publishTaskInfo1.setCargoDistance(Math.floor(s));
|
|
|
+ }
|
|
|
+ //根据省会城市求货距
|
|
|
+ else {
|
|
|
+ //根据省名查询省会城市
|
|
|
+ ProvinceCityInfo provinceCityInfo = provinceCityInfoService.selectOne(new EntityWrapper<ProvinceCityInfo>()
|
|
|
+ .like("province", publishTaskInfo.getLoadingPlace()));
|
|
|
+ //根据省会城市获取经纬度
|
|
|
+ String str = EntCoordUtil.getCoordinate(provinceCityInfo.getCity());
|
|
|
+ String str1 = str.substring(0, str.indexOf(","));//经度
|
|
|
+ String str2 = str.substring(str1.length() + 1, str.length());//纬度
|
|
|
+
|
|
|
+ //装货地经纬度
|
|
|
+ double lng1 = Math.toRadians(Double.valueOf(str1));
|
|
|
+ double lat1 = Math.toRadians(Double.valueOf(str2));
|
|
|
+ // 纬度之差
|
|
|
+ double a = lat1 - lat2;
|
|
|
+ // 经度之差
|
|
|
+ double b = lng1 - lng2;
|
|
|
+ // 计算两点距离的公式
|
|
|
double s = 2 * Math.asin(Math.sqrt(Math.pow(Math.sin(a / 2), 2) +
|
|
|
Math.cos(lat1) * Math.cos(lat2) * Math.pow(Math.sin(b / 2), 2)));
|
|
|
// 弧长乘地球半径, 返回单位: 千米
|
|
|
s = s * EARTH_RADIUS;
|
|
|
publishTaskInfo1.setCargoDistance(Math.floor(s));
|
|
|
}
|
|
|
+ }
|
|
|
+ }
|
|
|
+ publishTaskInfoList.addAll(dataList);
|
|
|
+ }
|
|
|
+ //按距离排序货源列表
|
|
|
+ else {
|
|
|
+ List<PublishTaskInfo> dataList = baseMapper.getListsByDistanceCondition(pageView);
|
|
|
+ if ("3".equals(publishTaskInfo.getSearchKeyWord())) {
|
|
|
+ if (!CollectionUtils.isEmpty(dataList)) {
|
|
|
+ //查询发货地经纬度
|
|
|
+ for (int i = 0; i < dataList.size(); i++) {
|
|
|
+ PublishTaskInfo publishTaskInfo1 = dataList.get(i);
|
|
|
+ //发货地经纬度
|
|
|
+ double lat2 = Math.toRadians(Double.valueOf(publishTaskInfo1.getSendLatitude()));
|
|
|
+ double lng2 = Math.toRadians(Double.valueOf(publishTaskInfo1.getSendLongitude()));
|
|
|
+ //根据司机经纬度求货距
|
|
|
+ if(!StringUtils.isEmpty(publishTaskInfo.getDriverLatitude()) && !StringUtils.isEmpty(publishTaskInfo.getDriverLongitude())){
|
|
|
+ double lat1 = Math.toRadians(Double.valueOf(publishTaskInfo.getDriverLatitude()));
|
|
|
+ double lng1 = Math.toRadians(Double.valueOf(publishTaskInfo.getDriverLongitude()));
|
|
|
+ // 纬度之差
|
|
|
+ double a = lat1 - lat2;
|
|
|
+ // 经度之差
|
|
|
+ double b = lng1 - lng2;
|
|
|
+ // 计算两点距离的公式
|
|
|
+ double s = 2 * Math.asin(Math.sqrt(Math.pow(Math.sin(a / 2), 2) +
|
|
|
+ Math.cos(lat1) * Math.cos(lat2) * Math.pow(Math.sin(b / 2), 2)));
|
|
|
+
|
|
|
+ // 弧长乘地球半径, 返回单位: 千米
|
|
|
+ s = s * EARTH_RADIUS;
|
|
|
+ publishTaskInfo1.setCargoDistance(Math.floor(s));
|
|
|
+ }
|
|
|
+ //根据装货城市求货距
|
|
|
+ else if (!StringUtils.isEmpty(publishTaskInfo.getLoadingPlaceCity())) {
|
|
|
+ //根据装货城市获取经纬度
|
|
|
+ String str = EntCoordUtil.getCoordinate(publishTaskInfo.getLoadingPlaceCity());
|
|
|
+ String str1 = str.substring(0, str.indexOf(","));//经度
|
|
|
+ String str2 = str.substring(str1.length() + 1, str.length());//纬度
|
|
|
+
|
|
|
+ //装货地经纬度
|
|
|
+ double lng1 = Math.toRadians(Double.valueOf(str1));
|
|
|
+ double lat1 = Math.toRadians(Double.valueOf(str2));
|
|
|
+ // 纬度之差
|
|
|
+ double a = lat1 - lat2;
|
|
|
+ // 经度之差
|
|
|
+ double b = lng1 - lng2;
|
|
|
+ // 计算两点距离的公式
|
|
|
+ double s = 2 * Math.asin(Math.sqrt(Math.pow(Math.sin(a / 2), 2) +
|
|
|
+ Math.cos(lat1) * Math.cos(lat2) * Math.pow(Math.sin(b / 2), 2)));
|
|
|
+ // 弧长乘地球半径, 返回单位: 千米
|
|
|
+ s = s * EARTH_RADIUS;
|
|
|
+ publishTaskInfo1.setCargoDistance(Math.floor(s));
|
|
|
+ }
|
|
|
+ //根据省会城市求货距
|
|
|
+ else {
|
|
|
+ //根据省名查询省会城市
|
|
|
+ ProvinceCityInfo provinceCityInfo = provinceCityInfoService.selectOne(new EntityWrapper<ProvinceCityInfo>()
|
|
|
+ .like("province", publishTaskInfo.getLoadingPlace()));
|
|
|
+ //根据省会城市获取经纬度
|
|
|
+ String str = EntCoordUtil.getCoordinate(provinceCityInfo.getCity());
|
|
|
+ String str1 = str.substring(0, str.indexOf(","));//经度
|
|
|
+ String str2 = str.substring(str1.length() + 1, str.length());//纬度
|
|
|
+
|
|
|
+ //装货地经纬度
|
|
|
+ double lng1 = Math.toRadians(Double.valueOf(str1));
|
|
|
+ double lat1 = Math.toRadians(Double.valueOf(str2));
|
|
|
+ // 纬度之差
|
|
|
+ double a = lat1 - lat2;
|
|
|
+ // 经度之差
|
|
|
+ double b = lng1 - lng2;
|
|
|
+ // 计算两点距离的公式
|
|
|
+ double s = 2 * Math.asin(Math.sqrt(Math.pow(Math.sin(a / 2), 2) +
|
|
|
+ Math.cos(lat1) * Math.cos(lat2) * Math.pow(Math.sin(b / 2), 2)));
|
|
|
+ // 弧长乘地球半径, 返回单位: 千米
|
|
|
+ s = s * EARTH_RADIUS;
|
|
|
+ publishTaskInfo1.setCargoDistance(Math.floor(s));
|
|
|
+ }
|
|
|
+ }
|
|
|
dataList.sort(Comparator.comparing(PublishTaskInfo::getCargoDistance));
|
|
|
}
|
|
|
- page.setRecords(dataList == null ? Lists.newArrayList() : dataList);
|
|
|
+ publishTaskInfoList.addAll(dataList);
|
|
|
}
|
|
|
}
|
|
|
- page.setTotal(dataCount == null ? 0 : dataCount);
|
|
|
+ //周边信息列表
|
|
|
+ List<PublishTaskInfo> dataList1 = baseMapper.getAllListsByCondition(pageView);
|
|
|
+ if (!CollectionUtils.isEmpty(dataList1)) {
|
|
|
+ if (!StringUtils.isEmpty(publishTaskInfo.getLoadingPlaceCity())) {
|
|
|
+ //查询发货地经纬度
|
|
|
+ for (int i = 0; i < dataList1.size(); i++) {
|
|
|
+ PublishTaskInfo publishTaskInfo1 = dataList1.get(i);
|
|
|
+ //发货地经纬度
|
|
|
+ double lng2 = Math.toRadians(Double.valueOf(publishTaskInfo1.getSendLongitude()));
|
|
|
+ double lat2 = Math.toRadians(Double.valueOf(publishTaskInfo1.getSendLatitude()));
|
|
|
+ //根据装货城市获取经纬度
|
|
|
+ String str = EntCoordUtil.getCoordinate(publishTaskInfo.getLoadingPlaceCity());
|
|
|
+ String str1 = str.substring(0, str.indexOf(","));//经度
|
|
|
+ String str2 = str.substring(str1.length() + 1, str.length());//纬度
|
|
|
+
|
|
|
+ //装货地经纬度
|
|
|
+ double lng1 = Math.toRadians(Double.valueOf(str1));
|
|
|
+ double lat1 = Math.toRadians(Double.valueOf(str2));
|
|
|
+ // 纬度之差
|
|
|
+ double a = lat1 - lat2;
|
|
|
+ // 经度之差
|
|
|
+ double b = lng1 - lng2;
|
|
|
+ // 计算两点距离的公式
|
|
|
+ double s = 2 * Math.asin(Math.sqrt(Math.pow(Math.sin(a / 2), 2) +
|
|
|
+ Math.cos(lat1) * Math.cos(lat2) * Math.pow(Math.sin(b / 2), 2)));
|
|
|
+ // 弧长乘地球半径, 返回单位: 千米
|
|
|
+ s = s * EARTH_RADIUS;
|
|
|
+ if (s <= 300) {
|
|
|
+ //货距小于300公里,放入周边信息列表
|
|
|
+ publishTaskInfo1.setCargoDistance(Math.floor(s));
|
|
|
+ publishTaskInfo1.setPeripheralInfo("1");
|
|
|
+ publishTaskInfoList.add(publishTaskInfo1);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ //查询发货地经纬度
|
|
|
+ for (int i = 0; i < dataList1.size(); i++) {
|
|
|
+ PublishTaskInfo publishTaskInfo1 = dataList1.get(i);
|
|
|
+ //发货地经纬度
|
|
|
+ double lng2 = Math.toRadians(Double.valueOf(publishTaskInfo1.getSendLongitude()));
|
|
|
+ double lat2 = Math.toRadians(Double.valueOf(publishTaskInfo1.getSendLatitude()));
|
|
|
+ //根据省名查询省会城市
|
|
|
+ ProvinceCityInfo provinceCityInfo = provinceCityInfoService.selectOne(new EntityWrapper<ProvinceCityInfo>()
|
|
|
+ .like("province", publishTaskInfo.getLoadingPlace()));
|
|
|
+ //根据省会城市获取经纬度
|
|
|
+ String str = EntCoordUtil.getCoordinate(provinceCityInfo.getCity());
|
|
|
+ String str1 = str.substring(0, str.indexOf(","));//经度
|
|
|
+ String str2 = str.substring(str1.length() + 1, str.length());//纬度
|
|
|
+
|
|
|
+ //装货地经纬度
|
|
|
+ double lng1 = Math.toRadians(Double.valueOf(str1));
|
|
|
+ double lat1 = Math.toRadians(Double.valueOf(str2));
|
|
|
+ // 纬度之差
|
|
|
+ double a = lat1 - lat2;
|
|
|
+ // 经度之差
|
|
|
+ double b = lng1 - lng2;
|
|
|
+ // 计算两点距离的公式
|
|
|
+ double s = 2 * Math.asin(Math.sqrt(Math.pow(Math.sin(a / 2), 2) +
|
|
|
+ Math.cos(lat1) * Math.cos(lat2) * Math.pow(Math.sin(b / 2), 2)));
|
|
|
+ // 弧长乘地球半径, 返回单位: 千米
|
|
|
+ s = s * EARTH_RADIUS;
|
|
|
+ if (s <= 300) {
|
|
|
+ //货距小于300公里,放入周边信息列表
|
|
|
+ publishTaskInfo1.setCargoDistance(Math.floor(s));
|
|
|
+ publishTaskInfo1.setPeripheralInfo("1");
|
|
|
+ publishTaskInfoList.add(publishTaskInfo1);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ Page<PublishTaskInfo> page = new Page<>();
|
|
|
+ page.setRecords(publishTaskInfoList == null ? Lists.newArrayList() : publishTaskInfoList);
|
|
|
+ page.setTotal(publishTaskInfoList.size() == 0 ? 0 : publishTaskInfoList.size());
|
|
|
page.setCurrent(publishTaskInfo.getCurrentPage());
|
|
|
page.setSize(publishTaskInfo.getPageSize());
|
|
|
return page;
|
|
@@ -507,6 +788,10 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
|
|
|
orderInfo.setUnloadArea(publishTaskInfo.getUnloadArea());
|
|
|
orderInfo.setUnloadCity(publishTaskInfo.getUnloadCity());
|
|
|
orderInfo.setUnloadPrivate(publishTaskInfo.getUnloadPrivate());
|
|
|
+ orderInfo.setSendLongitude(publishTaskInfo.getSendLongitude());
|
|
|
+ orderInfo.setSendLatitude(publishTaskInfo.getSendLatitude());
|
|
|
+ orderInfo.setUnsendLongitude(publishTaskInfo.getUnsendLongitude());
|
|
|
+ orderInfo.setUnsendLatitude(publishTaskInfo.getUnsendLatitude());
|
|
|
orderInfo.setGoodsName(publishTaskInfo.getGoodsName());
|
|
|
orderInfo.setDistance(publishTaskInfo.getDistance());
|
|
|
orderInfo.setFreight(publishTaskInfo.getFreightPrice());
|
|
@@ -566,8 +851,8 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
|
|
|
if (publishTaskInfo1 != null) {
|
|
|
//通过
|
|
|
if ("1".equals(publishTaskInfo.getFlag())) {
|
|
|
- publishTaskInfo1.setStatusKey(StatusEnum.IDENTITY_COMPLETED.getFlag());
|
|
|
- publishTaskInfo1.setStatus(StatusEnum.IDENTITY_COMPLETED.getName());
|
|
|
+ publishTaskInfo1.setStatusKey(StatusEnum.TASK_REJECT.getFlag());
|
|
|
+ publishTaskInfo1.setStatus(StatusEnum.TASK_REJECT.getName());
|
|
|
// geTuiUtils.pushByCid("审核通知", "您的司机认证申请已审核通过", commonUser.getId());
|
|
|
// UnimallMessage messageDO = new UnimallMessage();
|
|
|
// messageDO.setAdminId(commonUser.getId());
|
|
@@ -583,8 +868,8 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
|
|
|
}
|
|
|
// 驳回
|
|
|
else if ("2".equals(publishTaskInfo.getFlag())) {
|
|
|
- publishTaskInfo1.setStatusKey(StatusEnum.IDENTITY_FAILED.getFlag());
|
|
|
- publishTaskInfo1.setStatus(StatusEnum.IDENTITY_FAILED.getName());
|
|
|
+ publishTaskInfo1.setStatusKey(StatusEnum.TASK_FAILED.getFlag());
|
|
|
+ publishTaskInfo1.setStatus(StatusEnum.TASK_FAILED.getName());
|
|
|
// geTuiUtils.pushByCid("驳回通知", "您的司机认证申请已被驳回", commonUser.getId());
|
|
|
// UnimallMessage messageDO = new UnimallMessage();
|
|
|
// messageDO.setAdminId(commonUser.getId());
|