修改接口名字

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelListClient.java

@@ -138,6 +138,6 @@ public interface IDistributionParcelListClient {
 	@GetMapping(API_PREFIX+"/updateEntityByOpenOrder")
 	void updateEntityByOpenOrder(@RequestParam Long advanceId, @RequestParam Long warehouseId, @RequestParam Long waybillId);
 
-	@GetMapping(API_PREFIX+"/findByWaybillId")
-	List<DistributionParcelListEntity> findByWaybillId(@RequestParam String waybillId);
+	@GetMapping(API_PREFIX+"/findByWaybillNumber")
+	List<DistributionParcelListEntity> findByWaybillNumber(@RequestParam String waybillNumber);
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java

@@ -291,7 +291,7 @@ public class DistributionParcelListClient implements IDistributionParcelListClie
 	}
 
 	@Override
-	public List<DistributionParcelListEntity> findByWaybillId(String waybillId) {
-		return distributionParcelListService.findByWaybillId(waybillId);
+	public List<DistributionParcelListEntity> findByWaybillNumber(String waybillNumber) {
+		return distributionParcelListService.findByWaybillNumber(waybillNumber);
 	}
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.java

@@ -170,5 +170,5 @@ public interface DistributionParcelListMapper extends BaseMapper<DistributionPar
 
     List<Map<String, Integer>> selectAllErrorReservationOrder();
 
-	List<DistributionParcelListEntity> findByWaybillId(@Param("waybillNumber") String waybillNumber);
+	List<DistributionParcelListEntity> findByWaybillNumber(@Param("waybillNumber") String waybillNumber);
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml

@@ -1079,7 +1079,7 @@
         t GROUP BY reservation_id
     </select>
 
-    <select id="findByWaybillId" resultType="com.logpm.distribution.entity.DistributionParcelListEntity">
+    <select id="findByWaybillNumber" resultType="com.logpm.distribution.entity.DistributionParcelListEntity">
         SELECT ldpl.* FROM logpm_distribution_parcel_list ldpl
         WHERE ldpl.waybill_number = #{waybillNumber}
     </select>

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

@@ -178,6 +178,6 @@ public interface IDistributionParcelListService extends BaseService<Distribution
 	/**
 	 * 根据运单号找
 	 */
-	List<DistributionParcelListEntity> findByWaybillId(String waybillId);
+	List<DistributionParcelListEntity> findByWaybillNumber(String waybillId);
 
 }

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

@@ -922,8 +922,8 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 		return distributionStockArticleEntity;
 	}
 	@Override
-	public List<DistributionParcelListEntity> findByWaybillId(String waybillId) {
-		return baseMapper.findByWaybillId(waybillId);
+	public List<DistributionParcelListEntity> findByWaybillNumber(String waybillNumber) {
+		return baseMapper.findByWaybillNumber(waybillNumber);
 	}
 
 }

blade-service/logpm-distribution/src/test/java/com/logpm/distribution/TestService.java

@@ -148,5 +148,14 @@ public class TestService {
 		DistributionStockArticleEntity detail = distributionStockArticleService.getOne(Condition.getQueryWrapper(distributionStockArticle));
 		System.out.println(detail.getBrand());
 	}
+
+
+
+	@Test
+	public void test198(){
+		List<DistributionParcelListEntity> byWaybillId = distributionParcelListService.findByWaybillNumber("00420231014031");
+		System.out.println(byWaybillId);
+	}
+
 }
 

blade-service/logpm-patch/src/main/java/com/logpm/patch/controller/SyncServiceTypeController.java

@@ -27,8 +27,8 @@ public class SyncServiceTypeController {
 	private final ISyncServiceTypeService syncServiceTypeService;
 	@ResponseBody
 	@PostMapping("/change")
-	public R change(@RequestParam String id, @RequestParam String warehouseName, @RequestParam String mallName) {
-		syncServiceTypeService.syncServiceType(id, warehouseName, mallName);
+	public R change(@RequestParam String waybillNumber, @RequestParam String warehouseName, @RequestParam String mallName) {
+		syncServiceTypeService.syncServiceType(waybillNumber, warehouseName, mallName);
 		return R.success("修改成功");
 	}
 }

blade-service/logpm-patch/src/main/java/com/logpm/patch/service/ISyncServiceTypeService.java

@@ -9,6 +9,6 @@ import org.springframework.web.bind.annotation.RequestParam;
 
 public interface ISyncServiceTypeService {
 
-     void syncServiceType( String id,  String warehouseName,  String shopName) ;
+     void syncServiceType( String waybillNumber,  String warehouseName,  String shopName) ;
 
     }

blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncServiceTypeServiceImpl.java

@@ -26,26 +26,26 @@ public class SyncServiceTypeServiceImpl implements ISyncServiceTypeService {
 	private final SyncServiceTypeMapper syncServiceTypeMapper;
 
 	@Override
-	public void syncServiceType(String id, String warehouseName, String mallName) {
+	public void syncServiceType(String waybillNumber, String warehouseName, String mallName) {
 
 		//运单号查出包件码
 
-		List<DistributionParcelListEntity> parcelList = distributionParcelListClient.findByWaybillId(id);
+		List<DistributionParcelListEntity> parcelList = distributionParcelListClient.findByWaybillNumber(waybillNumber);
 		if (parcelList==null || parcelList.size()==0){
 			throw new ServiceException("运单号不存在");
 		}
 		//根据包件码查询出订单号
 		for (DistributionParcelListEntity distributionParcelList : parcelList) {
 			Long stockArticleId = distributionParcelList.getStockArticleId();
-			if (Objects.nonNull(warehouseName)&& Objects.nonNull(mallName)){
+			if (Objects.nonNull(warehouseName)&& Objects.nonNull(mallName)&& !warehouseName.isEmpty() && !mallName.isEmpty()){
 				// 用warehouseName 和 mallName 来操作
 
 			}else
 			//判断那个是仓库名称和商店名称谁是null
-			if (Objects.nonNull(mallName) ){
+			if (Objects.nonNull(mallName) && !mallName.isEmpty()){
 				//用订单和商店名称来操作  //修改商场名称 id  code  服务类型  收货单位
 				syncServiceTypeMapper.syncServiceTypeByMallName(stockArticleId,mallName);
-			}else if(Objects.nonNull(warehouseName) ){
+			}else if(Objects.nonNull(warehouseName) && !warehouseName.isEmpty() ){
 				//用订单号和仓库名称来操作
 				syncServiceTypeMapper.syncServiceTypeByWarehouseName(stockArticleId,warehouseName);
 			}else {