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;
			@@ -187,13 +189,13 @@


			Page<Order> data = orderClient.queryPage(orderQueryRequest).getData();
			List<MasterWorker> list = masterWorkerService.lambdaQuery()
			.eq(MasterWorker::getIsDelete, 0).list();
			if (null != data) {
			for (Order record : data.getRecords()) {
			// 回收服务信息
			Integer serverId = record.getServerId();
			MasterWorker masterWorker = masterWorkerService.lambdaQuery()
			.eq(MasterWorker::getId, serverId)
			.eq(MasterWorker::getIsDelete, 0).one();
			MasterWorker masterWorker = list.stream().filter(e -> e.getId().equals(serverId)).findFirst().orElse(null);
			if (null != masterWorker) {
			record.setServerName(masterWorker.getRealName());
			record.setServerPhone(masterWorker.getPhone());
			@@ -419,12 +421,7 @@
			@RequiresPermissions("order_reassignment")
			@ApiOperation(value = "订单列表-订单派单/改派", tags = {"后台-订单管理"})
			@PostMapping(value = "/reassignment")
			@ApiImplicitParams({
			@ApiImplicitParam(value = "操作类型(1:订单派单；2:订单改派)", name = "type", dataType = "Integer", required = true),
			@ApiImplicitParam(value = "订单id", name = "orderId", dataType = "Integer", required = true),
			@ApiImplicitParam(value = "服务人员id", name = "workerId", dataType = "Integer", required = true),
			@ApiImplicitParam(value = "改派原因", name = "applyReason", dataType = "String")
			})

			@Transactional(rollbackFor = Exception.class)
			public R<String> reassignment(@RequestBody OrderReasinDto orderReasinDto) {
			// String[] split = orderIds.split(",");
			@@ -439,13 +436,25 @@
			// 订单派单
			boolean result = true;
			if (Constants.TWO.equals(orderId.getType())) {
			orderClient.updateArrivalTime(order.getId(),orderReasinDto.getArriveTime());

			if (order.getState().equals(Constants.SIX) \|\| order.getState().equals(Constants.THREE)) {
			orderClient.updateState(order.getId(), Constants.ONE);

			//如果是待改派,将上门时间设置为最新的，并且更新再投原因
			if (order.getState().equals(Constants.SIX)){
			dispatchClient.changeReason(order.getId(), "");
			}

			}
			// 订单状态为待完工时，需要更改状态待上门且清空师傅到达预约点时间
			if (order.getState().equals(Constants.TWO)) {
			orderClient.updateStateAndArrivalTime(orderId.getOrderId(), Constants.ONE);
			}




			// 生成改派信息
			// ChangeDispatch changeDispatch = new ChangeDispatch();
			// changeDispatch.setWorkerId(item.getServerId());
			@@ -461,6 +470,9 @@
			// changeDispatch.setUserName(item.getReservationName());
			// changeDispatch.setIsDelete(Constants.ZERO);
			// result = dispatchClient.saveRecord(changeDispatch).getData();
			}else {
			orderClient.updateArrivalTime(order.getId(),orderReasinDto.getArriveTime());

			}
			ChannelHandlerContext context = NettyChannelMap.getData(String.valueOf(orderReasinDto.getWorkerId()));
			if (null != context) {
			@@ -760,7 +772,6 @@
			List<FrozenBuckleImportDTO> list = new ArrayList<>();
			FrozenBuckleImportDTO bean = new FrozenBuckleImportDTO();
			list.add(bean);

			// 这里URLEncoder.encode可以防止中文乱码
			String fileName = URLEncoder.encode("订单导入模板", "UTF-8");
			response.setContentType("application/vnd.ms-excel");
			@@ -814,7 +825,7 @@
			// 设置sheet,默认读取第一个
			.sheet()
			// 设置标题(字段列表)所在行数
			.headRowNumber(2)
			.headRowNumber(1)
			.doRead();
			System.err.println(successArrayList);

			@@ -830,8 +841,25 @@
			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("上门时间格式错误");
			}

			if(!StringUtils.hasLength(address)){
			return R.fail("详细地址不能为空");
			}
			// 解析地址经纬度
			CityInfoVO cityInfoVO = GaoDeMapUtil.getAddressInfo(province + city + area + address).getDatas();
			CityInfoVO cityInfoVO = GaoDeMapUtil.getAddressInfo((province==null?"":province)
			+ (city==null?"":city)
			+ (area==null?"":area)
			+ address).getDatas();
			if(cityInfoVO==null\|\|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";
			@@ -840,11 +868,15 @@
			order.setAreaCode(areaCode);
			order.setLongitude(cityInfoVO.getLongitude());
			order.setLatitude(cityInfoVO.getLatitude());

			if (!StringUtils.hasLength(city)){
			order.setCity(cityInfoVO.getCity());
			}
			// 站点信息
			Site site = sites.stream().filter(e -> e.getSiteName().equals(frozenBuckleImportDTO.getSiteName())).findFirst().orElse(null);
			if(Objects.nonNull(site)){
			order.setSiteId(site.getId());
			}else {
			return R.fail("站点信息不存在");
			}
			// 师傅信息
			if (StringUtils.hasLength(order.getServerName())) {
			@@ -852,6 +884,8 @@
			if(Objects.nonNull(masterWorker)){
			order.setServerId(masterWorker.getId());
			order.setServerPhone(masterWorker.getPhone());
			}else {
			return R.fail("师傅信息不存在");
			}
			order.setAcceptTime(new Date());
			// 待上门
			@@ -869,6 +903,8 @@
			if(Objects.nonNull(recoveryServe)){
			order.setServeId(recoveryServe.getId());
			order.setServePrice(recoveryServe.getDefaultPrice());
			}else {
			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) {