Merge branch 'dev' into pre-production

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java

@@ -1985,6 +1985,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 		List<AftersalesCustomerMallEntity> aftersalesCustomerMallList = aftersalesCustomerMallMapper.getByWarehouseCode(myCurrentWarehouse.getId().toString());
 		if (aftersalesCustomerMallList.isEmpty()){
 			log.info("没有客服信息！！！");
+			return;
 		}
 		AftersalesCustomerMallEntity finalChoice = null; //最终 确定的AftersalesCustomerMallEntity
 		for (AftersalesCustomerMallEntity aftersalesCustomerMallEntity : aftersalesCustomerMallList) {
@@ -1993,7 +1994,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 				break;
 			}
 		}
-		// 如果存在条件为1的项，则使用创建时间最早的作为选择
+		// 如果存在条件为1的项，则使用创建时 间最早的作为选择
 
 				if (finalChoice == null) {
 					AftersalesCustomerMallEntity lastCustomerMall = aftersalesCustomerMallList.get(0);

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionParcelListController.java

@@ -252,4 +252,12 @@ public class DistributionParcelListController extends BladeController  {
 		ExcelUtil.export(response, "包件明细数据" + DateUtil.time(), "包件明细表", list, DistributionParcelListExcel.class);
 	}
 
+	@GetMapping("/searchNode")
+	@ApiOperationSupport(order = 9)
+	@ApiOperation(value = "导出包件明细数据", notes = "传入paramMap")
+	public R searchNode(@ApiIgnore @RequestParam String packageCode) {
+		R r = distributionParcelListService.searchNode(packageCode);
+		return r;
+	}
+
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelListService.java

@@ -186,4 +186,11 @@ public interface IDistributionParcelListService extends BaseService<Distribution
 	 * @return
 	 */
 	Integer restorePakcageByIds(List<Long> packageIds);
+
+	/**
+	 * 查询包件节点
+	 * @param packageCode
+	 * @return
+	 */
+	R searchNode(String packageCode);
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java

@@ -931,4 +931,14 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 		return baseMapper.restorePakcageByIds(packageIds);
 	}
 
+	/**
+	 * @param packageCode
+	 * @return
+	 */
+	@Override
+	public R searchNode(String packageCode) {
+
+		return null;
+	}
+
 }