java/JiaDianHuiShou.git

			@@ -21,6 +21,7 @@
			import com.ruoyi.common.core.constant.Constants;
			import com.ruoyi.common.core.domain.BaseEntity;
			import com.ruoyi.common.core.domain.R;
			import com.ruoyi.common.core.exception.ServiceException;
			import com.ruoyi.common.core.utils.DateUtils;
			import com.ruoyi.common.core.utils.GaoDeMapUtil;
			import com.ruoyi.common.core.utils.SnowflakeIdWorker;
			@@ -52,6 +53,7 @@
			import java.net.URLEncoder;
			import java.nio.file.Files;
			import java.nio.file.Paths;
			import java.text.SimpleDateFormat;
			import java.time.LocalDateTime;
			import java.util.*;
			import java.util.stream.Collectors;
			@@ -839,8 +841,19 @@
			String area = frozenBuckleImportDTO.getArea();
			String address = frozenBuckleImportDTO.getReservationAddress();

			String time = frozenBuckleImportDTO.getTime();
			SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
			try{
			format.parse(time);
			}catch (Exception e){
			throw new ServiceException("上门时间格式错误");
			}

			// 解析地址经纬度
			CityInfoVO cityInfoVO = GaoDeMapUtil.getAddressInfo(province + city + area + address).getDatas();
			if(Objects.isNull(cityInfoVO.getLongitude()) \|\| Objects.isNull(cityInfoVO.getLatitude())){
			return R.fail("地址输入不正确");
			}
			String areaCode = cityInfoVO.getCode();
			String provinceCode = areaCode.substring(0, 2) + "0000";
			String cityCode = areaCode.substring(0, 4) + "00";
			@@ -883,7 +896,7 @@
			order.setServeId(recoveryServe.getId());
			order.setServePrice(recoveryServe.getDefaultPrice());
			}else {
			return R.fail("回收服务不存在");
			return R.fail("服务信息不存在");
			}
			RecoveryServePrice one = recoveryServePriceService.lambdaQuery().eq(RecoveryServePrice::getCity, order.getCityCode()).eq(RecoveryServePrice::getRecoveryServeId, order.getServeId()).eq(BaseEntity::getIsDelete, 0).one();
			if (one==null) {

			@@ -38,7 +38,7 @@
			@ExcelProperty(value = "*详细地址")
			@HeadFontStyle(fontName = "黑体", fontHeightInPoints = 11,color = 10)
			private String reservationAddress;
			@ExcelProperty(value = "*上门时间(2024-02-28 16:00)")
			@ExcelProperty(value = "*上门时间(2024-02-28)")
			@HeadFontStyle(fontName = "黑体", fontHeightInPoints = 11,color = 10)
			private String time;
			@ExcelProperty(value = "服务人员")

	ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java	15 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/importExcel/FrozenBuckleImportDTO.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史