2024年6月28日10:48:48

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/controller/ExportDeliveryController.java

@@ -115,6 +115,7 @@ public class ExportDeliveryController extends BladeController {
 		lambdaQueryWrapper.like(Func.isNotEmpty(delivery.getArrivalTel()),Delivery::getArrivalTel,delivery.getArrivalTel());//收货电话
 		lambdaQueryWrapper.like(Func.isNotEmpty(delivery.getDeliveryRemarks()),Delivery::getDeliveryRemarks,delivery.getDeliveryRemarks());//备注
 		lambdaQueryWrapper.like(Func.isNotEmpty(delivery.getBillLadingNo()),Delivery::getBillLadingNo,delivery.getBillLadingNo());//提单号
+		lambdaQueryWrapper.like(Func.isNotEmpty(delivery.getJobNumber()),Delivery::getJobNumber,delivery.getJobNumber());//工号
 		lambdaQueryWrapper.eq(Func.isNotEmpty(delivery.getCreateUser()),Delivery::getCreateUser,delivery.getCreateUser());//制单人
 		lambdaQueryWrapper.eq(Func.isNotEmpty(delivery.getStorageId()),Delivery::getStorageId,delivery.getStorageId());//仓库
 		lambdaQueryWrapper.eq(Func.isNotEmpty(delivery.getPortOfLoad()),Delivery::getPortOfLoad,delivery.getPortOfLoad());//起运港
@@ -126,7 +127,7 @@ public class ExportDeliveryController extends BladeController {
 		}else if ("3".equals(delivery.getTabType())) {
 			lambdaQueryWrapper.apply("(documentary_status is null or documentary_status = '')");
 		}
-		lambdaQueryWrapper.orderByDesc(Delivery::getId);
+		lambdaQueryWrapper.orderByDesc(Delivery::getJobNumber);
 		IPage<Delivery> pages = deliveryService.page(Condition.getPage(query), lambdaQueryWrapper);
 		if (CollectionUtils.isNotEmpty(pages.getRecords())){
 			pages.getRecords().forEach(item ->{

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/feign/DeliveryClient.java

@@ -302,7 +302,7 @@ public class DeliveryClient implements IDeliveryClient {
 			.eq(Delivery::getTradeType, tradeType)
 			.eq(Delivery::getSrcId, srcId);
 		List<Delivery> deliveryList = deliveryService.list(lambdaQueryWrapper);
-		if (ObjectUtils.isNull(deliveryList) && deliveryList.size() > 0) {
+		if (ObjectUtils.isNull(deliveryList) && !deliveryList.isEmpty()) {
 			throw new RuntimeException("未找到单据信息");
 		} else {
 			for (Delivery delivery : deliveryList) {

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/export/ExportOrderController.java

@@ -152,35 +152,37 @@ public class ExportOrderController extends BladeController {
 			lambdaQueryWrapper.eq(Order::getOrderStatus, "已完成");
 		} else if ("2".equals(order.getTabType())) {
 //			lambdaQueryWrapper.apply("(documentary_status is null or documentary_status != '寄单'  ) and order_status != '已取消' and order_status != '录入'");
-			lambdaQueryWrapper.apply("order_status != '已取消' and order_status != '录入'");
+			lambdaQueryWrapper.apply("order_status != '已取消' and order_status != '录入' and order_status != '已完成'");
 		} else if ("3".equals(order.getTabType())) {
 			lambdaQueryWrapper.eq(Order::getOrderStatus, "已取消");
-		}else if ("4".equals(order.getTabType())) {
+		} else if ("4".equals(order.getTabType())) {
 			lambdaQueryWrapper.eq(Order::getOrderStatus, "录入");
+		} else {
+
 		}
 		lambdaQueryWrapper.orderByDesc(Order::getId);
 		IPage<Order> page = orderService.page(Condition.getPage(query), lambdaQueryWrapper);
 		if (CollectionUtils.isNotEmpty(page.getRecords())) {
 
-			String corpIds = "";//客户
-			String belongToCorpIds = "";//所属公司
-			String createUserIds = "";//制单人
+			StringBuilder corpIds = new StringBuilder();//客户
+			StringBuilder belongToCorpIds = new StringBuilder();//所属公司
+			StringBuilder createUserIds = new StringBuilder();//制单人
 			for (Order orders : page.getRecords()) {
 				if (ObjectUtil.isNotEmpty(orders.getCorpId())) {
-					belongToCorpIds = belongToCorpIds + orders.getBelongToCorpId() + ",";
+					belongToCorpIds.append(orders.getBelongToCorpId()).append(",");
 				}
 				if (ObjectUtil.isNotEmpty(orders.getCreateUser())) {
-					createUserIds = createUserIds + orders.getCreateUser() + ",";
+					createUserIds.append(orders.getCreateUser()).append(",");
 				}
 				if (ObjectUtil.isNotEmpty(orders.getCorpId())) {
-					corpIds = corpIds + orders.getCorpId() + ",";
+					corpIds.append(orders.getCorpId()).append(",");
 				}
 			}
-			List<CorpsDesc> belongToCorpList = corpsDescClient.selectByCorpIds(belongToCorpIds);
-			List<User> createUserList = userClient.selectUserIds(createUserIds);
-			List<CorpsDesc> corpList = corpsDescClient.selectByCorpIds(corpIds);
+			List<CorpsDesc> belongToCorpList = corpsDescClient.selectByCorpIds(belongToCorpIds.toString());
+			List<User> createUserList = userClient.selectUserIds(createUserIds.toString());
+			List<CorpsDesc> corpList = corpsDescClient.selectByCorpIds(corpIds.toString());
 
-			page.getRecords().stream().forEach(item -> {
+			page.getRecords().forEach(item -> {
 				if (item.getCorpId() != null) {
 					if (ObjectUtil.isNotEmpty(corpList)) {
 						CorpsDesc corpsDesc = corpList.stream().filter(d -> d.getId().equals(item.getCorpId())).findFirst().orElse(null);
@@ -324,9 +326,6 @@ public class ExportOrderController extends BladeController {
 
 	/**
 	 * 出口销售单生成发货单
-	 *
-	 * @param order
-	 * @return
 	 */
 	@PostMapping("/deliverGoods")
 	@ApiOperationSupport(order = 6)
@@ -351,7 +350,6 @@ public class ExportOrderController extends BladeController {
 	 * @param corpId         客户id
 	 * @param orderStartDate 时间开始时间
 	 * @param orderEndDate   时间结束时间
-	 * @return
 	 */
 	@GetMapping("/orderItemsList")
 	@ApiOperationSupport(order = 10)
@@ -371,9 +369,6 @@ public class ExportOrderController extends BladeController {
 
 	/**
 	 * 出口销售单生成采购单
-	 *
-	 * @param order
-	 * @return
 	 */
 	@PostMapping("/createMarket")
 	@ApiOperationSupport(order = 9)
@@ -418,20 +413,20 @@ public class ExportOrderController extends BladeController {
 		lambdaQueryWrapper.like(Func.isNotEmpty(order.getOrderRemark()), Order::getOrderRemark, order.getOrderRemark());//备注
 		lambdaQueryWrapper.orderByDesc(Order::getId);
 		IPage<Order> page = orderService.page(Condition.getPage(query), lambdaQueryWrapper);
-		String corpIds = "";
+		StringBuilder corpIds = new StringBuilder();
 		for (Order orderOne : page.getRecords()) {
 			if (ObjectUtil.isNotEmpty(orderOne.getCorpId())) {
-				corpIds = corpIds + orderOne.getCorpId() + ",";
+				corpIds.append(orderOne.getCorpId()).append(",");
 			}
 		}
-		List<CorpsDesc> corpsDescList = corpsDescClient.selectByCorpIds(corpIds);
+		List<CorpsDesc> corpsDescList = corpsDescClient.selectByCorpIds(corpIds.toString());
 		if (CollectionUtils.isNotEmpty(page.getRecords())) {
-			page.getRecords().stream().forEach(item -> {
+			page.getRecords().forEach(item -> {
 				//客户
 				if (item.getCorpId() != null) {
 					if (ObjectUtil.isNotEmpty(corpsDescList)) {
 						CorpsDesc corpsDesc = corpsDescList.stream().filter(e -> e.getId().equals(item.getCorpId())).findFirst().orElse(null);
-						if (ObjectUtils.isNotNull(corpsDesc)) {
+						if (corpsDesc !=null) {
 							item.setCorpsName(corpsDesc.getCname());
 
 						}
@@ -537,7 +532,7 @@ public class ExportOrderController extends BladeController {
 		lambdaQueryWrapper.orderByDesc(Order::getId);
 		IPage<Order> page = orderService.page(Condition.getPage(query), lambdaQueryWrapper);
 		if (CollectionUtils.isNotEmpty(page.getRecords())) {
-			page.getRecords().stream().forEach(item -> {
+			page.getRecords().forEach(item -> {
 				if (item.getCorpId() != null) {
 					R<CorpsDesc> corpMessage = corpsDescClient.getCorpMessage(item.getCorpId());//客户
 					if (corpMessage.isSuccess() && corpMessage.getData() != null) {
@@ -642,7 +637,7 @@ public class ExportOrderController extends BladeController {
 		lambdaQueryWrapper.orderByDesc(Order::getId);
 		IPage<Order> page = orderService.page(Condition.getPage(query), lambdaQueryWrapper);
 		if (CollectionUtils.isNotEmpty(page.getRecords())) {
-			page.getRecords().stream().forEach(item -> {
+			page.getRecords().forEach(item -> {
 				if (item.getCorpId() != null) {
 					R<CorpsDesc> corpMessage = corpsDescClient.getCorpMessage(item.getCorpId());//客户
 					if (corpMessage.isSuccess() && corpMessage.getData() != null) {
@@ -858,9 +853,6 @@ public class ExportOrderController extends BladeController {
 
 	/**
 	 * app销售人员提成列表和检索条件查询
-	 *
-	 * @param detailsVo
-	 * @return
 	 */
 	@GetMapping("/salesCommissionList")
 	@ApiOperation(value = "销售人员提成", notes = "销售人员提成")
@@ -872,10 +864,6 @@ public class ExportOrderController extends BladeController {
 
 	/**
 	 * 统计分析 销售人员提成列表和检索条件查询
-	 *
-	 * @param detailsVo
-	 * @param query
-	 * @return
 	 */
 	@GetMapping("/salesCommission")
 	@ApiOperation(value = "销售人员提成", notes = "销售人员提成")
@@ -887,9 +875,6 @@ public class ExportOrderController extends BladeController {
 
 	/**
 	 * 统计分析 销售人员提成列表导出
-	 *
-	 * @param detailsVo
-	 * @return
 	 */
 	@GetMapping("/salesCommissionExport")
 	@ApiOperation(value = "销售人员提成导出", notes = "销售人员提成导出")
@@ -901,10 +886,6 @@ public class ExportOrderController extends BladeController {
 
 	/**
 	 * 统计分析 包装费对账列表和检索条件查询
-	 *
-	 * @param detailsVo
-	 * @param query
-	 * @return
 	 */
 	@GetMapping("/selPackingFee")
 	@ApiOperation(value = "包装费对账", notes = "传入detailsVo")
@@ -916,9 +897,6 @@ public class ExportOrderController extends BladeController {
 
 	/**
 	 * 统计分析 包装费用列表导出
-	 *
-	 * @param detailsVo
-	 * @return
 	 */
 	@GetMapping("/selPackingFeeExport")
 	@ApiOperation(value = "包装费用对账导出", notes = "包装费用对账导出")
@@ -930,9 +908,6 @@ public class ExportOrderController extends BladeController {
 
 	/**
 	 * 统计分析 品牌采购对账
-	 *
-	 * @param detailsVo
-	 * @return
 	 */
 	@GetMapping("/purchaseReconciliation")
 	@ApiOperation(value = "品牌采购对账", notes = "品牌采购对账")
@@ -944,9 +919,6 @@ public class ExportOrderController extends BladeController {
 
 	/**
 	 * 统计分析 品牌采购对账列表导出
-	 *
-	 * @param detailsVo
-	 * @return
 	 */
 	@GetMapping("/selPurchaseExport")
 	@ApiOperation(value = "品牌采购对账导出", notes = "品牌采购对账导出")
@@ -958,9 +930,6 @@ public class ExportOrderController extends BladeController {
 
 	/**
 	 * 统计分析 销售利润
-	 *
-	 * @param
-	 * @return
 	 */
 	@GetMapping("/selSalesProfit")
 	@ApiOperation(value = "统计分析 销售利润", notes = "传入detailsVo")
@@ -972,9 +941,6 @@ public class ExportOrderController extends BladeController {
 
 	/**
 	 * 统计分析 销售利润列表导出
-	 *
-	 * @param detailsVo
-	 * @return
 	 */
 	@GetMapping("/selSalesProfitExport")
 	@ApiOperation(value = "销售利润导出", notes = "销售利润导出")
@@ -1398,106 +1364,112 @@ public class ExportOrderController extends BladeController {
 			}
 		}
 		lambdaQueryWrapper.eq(ObjectUtils.isNotNull(orderItems.getBillNo()), OrderItems::getBillNo, orderItems.getBillNo());//销售单号
-		if (ObjectUtils.isNotNull(orderItems.getBusinesDateList()) && orderItems.getBusinesDateList().size() > 0) {
+		if (ObjectUtils.isNotNull(orderItems.getBusinesDateList()) && !orderItems.getBusinesDateList().isEmpty()) {
 			lambdaQueryWrapper.ge(OrderItems::getBusinesDate, orderItems.getBusinesDateList().get(0));
 			lambdaQueryWrapper.le(OrderItems::getBusinesDate, orderItems.getBusinesDateList().get(1));
 		}
-		if (ObjectUtils.isNotNull(orderItems.getPlannedDeliveryDateList()) && orderItems.getPlannedDeliveryDateList().size() > 0) {
+		if (ObjectUtils.isNotNull(orderItems.getPlannedDeliveryDateList()) && !orderItems.getPlannedDeliveryDateList().isEmpty()) {
 			lambdaQueryWrapper.eq(OrderItems::getPlannedDeliveryDate, orderItems.getPlannedDeliveryDateList().get(0));//计划交货日期起
 			lambdaQueryWrapper.eq(OrderItems::getPlannedDeliveryDate, orderItems.getPlannedDeliveryDateList().get(1));//计划交货日期止
 		}
 		lambdaQueryWrapper.eq(ObjectUtils.isNotNull(orderItems.getCorpId()), OrderItems::getCorpId, orderItems.getCorpId());//供应商
-		//0代表不显示全部
-//		lambdaQueryWrapper.and(i -> i.ne(OrderItems::getFudaPurchaseStatus, "").isNotNull(OrderItems::getFudaPurchaseStatus));
 		if (ObjectUtils.isNotEmpty(orderItems.getShowAll()) && orderItems.getShowAll() == 0) {
-			//采购状态
-//			lambdaQueryWrapper.eq(OrderItems::getFudaPurchaseStatus, "待采购");
-			//销售数量大于采购数量
 			lambdaQueryWrapper.apply("order_quantity > purchase_quantity");
 		} else {
-			//采购状态
-//			lambdaQueryWrapper.ne(OrderItems::getFudaPurchaseStatus, "待采购");
 			//销售数量大于采购数量
 			lambdaQueryWrapper.ne(OrderItems::getPurchaseQuantity, new BigDecimal("0.00"));
 		}
 		lambdaQueryWrapper.orderByAsc(OrderItems::getSort);
 		List<OrderItems> pages = orderItemsService.list(lambdaQueryWrapper);
 		List<OrderItems> orderItemsList = new ArrayList<>();
-		for (OrderItems orderItems_ : pages) {
-			if (ObjectUtils.isNotNull(orderItems_.getCorpId())) {
-				CorpsDesc corpsDesc = corpsDescClient.getCorpId(orderItems_.getCorpId());
-				if (ObjectUtils.isNotNull(corpsDesc)) {
-					orderItems_.setCorpName(corpsDesc.getCname());
-				}
+		if (!pages.isEmpty()){
+			StringBuilder corpIds = new StringBuilder();
+			StringBuilder goodsIds = new StringBuilder();
+			for (OrderItems orderItems_ : pages) {
+				corpIds.append(orderItems_.getCorpId()).append(",");
+				goodsIds.append(orderItems_.getItemId()).append(",");
 			}
-			if (ObjectUtils.isNotNull(orderItems_.getItemId())) {
-				GoodsDesc goodsDesc = goodsDescClient.getGoodsDesc(orderItems_.getItemId(), AuthUtil.getTenantId());
-				if (ObjectUtils.isNotNull(goodsDesc)) {
-					orderItems_.setCname(goodsDesc.getCname());
-					orderItems_.setCode(goodsDesc.getCode());
+			List<CorpsDesc> corpsDescList = corpsDescClient.selectByCorpIds(corpIds.toString());
+			List<GoodsDesc> goodsDescList = goodsDescClient.selectItemsIdGoods(goodsIds.toString());
+			for (OrderItems orderItems_ : pages) {
+				if (ObjectUtils.isNotNull(orderItems_.getCorpId()) && !corpsDescList.isEmpty()) {
+					CorpsDesc corpsDesc = corpsDescList.stream().filter(e-> e.getId().equals(orderItems_.getCorpId())).findFirst().orElse(null);
+					if (corpsDesc != null) {
+						orderItems_.setCorpName(corpsDesc.getCname());
+					}
+				}
+				if (ObjectUtils.isNotNull(orderItems_.getItemId()) && !goodsDescList.isEmpty()) {
+					GoodsDesc goodsDesc = goodsDescList.stream().filter(e-> e.getId().equals(orderItems_.getItemId())).findFirst().orElse(null);
+					if (goodsDesc != null) {
+						orderItems_.setCname(goodsDesc.getCname());
+						orderItems_.setCode(goodsDesc.getCode());
+					}
+				}
+				if (ObjectUtils.isNotNull(orderItems_.getPurchaseQuantity())) {
+					orderItems_.setActualQuantity(orderItems_.getOrderQuantity().subtract(orderItems_.getPurchaseQuantity()));
+				} else {
+					orderItems_.setActualQuantity(orderItems_.getOrderQuantity());
+				}
+				if (ObjectUtils.isNotNull(orderItems_.getPurchasePrice())) {
+					orderItems_.setPrice(orderItems_.getPurchasePrice());
+					orderItems_.setAmount(orderItems_.getPurchasePrice().multiply(orderItems_.getActualQuantity()));
+				} else {
+					orderItems_.setPrice(orderItems_.getPrice());
+					orderItems_.setAmount(orderItems_.getPrice().multiply(orderItems_.getActualQuantity()));
 				}
 			}
-			if (ObjectUtils.isNotNull(orderItems_.getPurchaseQuantity())) {
-				orderItems_.setActualQuantity(orderItems_.getOrderQuantity().subtract(orderItems_.getPurchaseQuantity()));
-			} else {
-				orderItems_.setActualQuantity(orderItems_.getOrderQuantity());
-			}
-			if (ObjectUtils.isNotNull(orderItems_.getPurchasePrice())) {
-				orderItems_.setPrice(orderItems_.getPurchasePrice());
-				orderItems_.setAmount(orderItems_.getPurchasePrice().multiply(orderItems_.getActualQuantity()));
-			} else {
-				orderItems_.setPrice(orderItems_.getPrice());
-				orderItems_.setAmount(orderItems_.getPrice().multiply(orderItems_.getActualQuantity()));
-			}
-			orderItemsList.add(orderItems_);
-		}
-		LambdaQueryWrapper<OrderParts> orderPartsLambdaQueryWrapper = new LambdaQueryWrapper<>();
-		orderPartsLambdaQueryWrapper.eq(OrderParts::getIsDeleted, 0)
-			.eq(OrderParts::getTenantId, AuthUtil.getTenantId())
-			.eq(OrderParts::getSrcPid, orderItems.getPid());
-		//0代表不显示全部
-		if (ObjectUtils.isNotEmpty(orderItems.getShowAll()) && orderItems.getShowAll() == 0) {
-			orderPartsLambdaQueryWrapper.apply("good_number > purchases_number");
-		} else {
-			orderPartsLambdaQueryWrapper.ne(OrderParts::getPurchasesNumber, new BigDecimal("0.00"));
-		}
-		List<OrderParts> orderPartsList = orderPartsService.list(orderPartsLambdaQueryWrapper);
-		List<OrderItems> orderItemsList1 = orderItemsService.list(new LambdaQueryWrapper<OrderItems>()
-			.eq(OrderItems::getIsDeleted, 0)
-			.eq(OrderItems::getPid, orderItems.getPid()));
-		for (OrderParts orderParts : orderPartsList) {
-			OrderItems orderItems1 = new OrderItems();
-			orderItems1.setDetailType("PJ");
-			orderItems1.setId(orderParts.getId());
-			orderItems1.setPid(orderParts.getSrcPid());
-			orderItems1.setSrcItemId(orderParts.getId());
-			if (orderItemsList1.size() > 0) {
-				orderItems1.setBillNo(orderItemsList1.get(0).getBillNo());
-				orderItems1.setBusinesDate(orderItemsList1.get(0).getBusinesDate());
-				orderItems1.setPlannedDeliveryDate(orderItemsList1.get(0).getPlannedDeliveryDate());
-				orderItems1.setCarry(orderItemsList1.get(0).getCarry());
-			}
-			if (ObjectUtils.isNotNull(orderParts.getPurchasesNumber())) {
-				orderItems1.setActualQuantity(orderParts.getGoodNumber().subtract(orderParts.getPurchasesNumber()));
+			LambdaQueryWrapper<OrderParts> orderPartsLambdaQueryWrapper = new LambdaQueryWrapper<>();
+			orderPartsLambdaQueryWrapper.eq(OrderParts::getIsDeleted, 0)
+				.eq(OrderParts::getTenantId, AuthUtil.getTenantId())
+				.eq(OrderParts::getSrcPid, orderItems.getPid());
+			//0代表不显示全部
+			if (ObjectUtils.isNotEmpty(orderItems.getShowAll()) && orderItems.getShowAll() == 0) {
+				orderPartsLambdaQueryWrapper.apply("good_number > purchases_number");
 			} else {
-				orderItems1.setActualQuantity(orderParts.getGoodNumber());
+				orderPartsLambdaQueryWrapper.ne(OrderParts::getPurchasesNumber, new BigDecimal("0.00"));
 			}
-			if (ObjectUtils.isNotNull(orderParts.getPrice())) {
-				orderItems1.setPrice(orderParts.getPrice());
-				orderItems1.setAmount(orderParts.getPrice().multiply(orderItems1.getActualQuantity()));
-			} else {
-				orderItems1.setPrice(orderParts.getPrice());
-				orderItems1.setAmount(orderParts.getPrice().multiply(orderItems1.getActualQuantity()));
+			List<OrderParts> orderPartsList = orderPartsService.list(orderPartsLambdaQueryWrapper);
+			if (!orderPartsList.isEmpty()){
+				for (OrderItems items : pages) {
+					orderItemsList.add(items);
+					List<OrderParts> partsList = orderPartsList.stream().filter(e -> e.getPid().equals(items.getId())).collect(Collectors.toList());
+					if (partsList.isEmpty()){
+						continue;
+					}
+					for (OrderParts orderParts : partsList) {
+						OrderItems orderItems1 = new OrderItems();
+						orderItems1.setDetailType("PJ");
+						orderItems1.setId(orderParts.getId());
+						orderItems1.setPid(orderParts.getSrcPid());
+						orderItems1.setSrcItemId(orderParts.getId());
+						orderItems1.setBillNo(items.getBillNo());
+						orderItems1.setBusinesDate(items.getBusinesDate());
+						orderItems1.setPlannedDeliveryDate(items.getPlannedDeliveryDate());
+						orderItems1.setCarry(items.getCarry());
+						if (ObjectUtils.isNotNull(orderParts.getPurchasesNumber())) {
+							orderItems1.setActualQuantity(orderParts.getGoodNumber().subtract(orderParts.getPurchasesNumber()));
+						} else {
+							orderItems1.setActualQuantity(orderParts.getGoodNumber());
+						}
+						if (ObjectUtils.isNotNull(orderParts.getPrice())) {
+							orderItems1.setPrice(orderParts.getPrice());
+							orderItems1.setAmount(orderParts.getPrice().multiply(orderItems1.getActualQuantity()));
+						} else {
+							orderItems1.setPrice(orderParts.getPrice());
+							orderItems1.setAmount(orderParts.getPrice().multiply(orderItems1.getActualQuantity()));
+						}
+						orderItems1.setItemId(orderParts.getGoodId());
+						orderItems1.setCname(orderParts.getGoodName());
+						orderItems1.setPurchaseQuantity(orderParts.getPurchasesNumber());
+						orderItems1.setOrderQuantity(orderParts.getGoodNumber());
+						orderItems1.setPriceCategory(orderParts.getGoodTypeName());
+						orderItems1.setPurchaseQuantity(orderParts.getPurchasesNumber());
+						orderItems1.setEname(orderParts.getEname());
+						orderItems1.setPartsCost(orderParts.getPartsCost());
+						orderItemsList.add(orderItems1);
+					}
+				}
 			}
-			orderItems1.setItemId(orderParts.getGoodId());
-			orderItems1.setCname(orderParts.getGoodName());
-			orderItems1.setPurchaseQuantity(orderParts.getPurchasesNumber());
-			orderItems1.setOrderQuantity(orderParts.getGoodNumber());
-			orderItems1.setPriceCategory(orderParts.getGoodTypeName());
-			orderItems1.setPurchaseQuantity(orderParts.getPurchasesNumber());
-			orderItems1.setEname(orderParts.getEname());
-			orderItems1.setPartsCost(orderParts.getPartsCost());
-			orderItemsList.add(orderItems1);
 		}
 		return R.data(orderItemsList);
 	}
@@ -1515,11 +1487,11 @@ public class ExportOrderController extends BladeController {
 		lambdaQueryWrapper.eq(OrderItems::getBillType, OrderTypeEnum.SALES.getType());//订单类型
 		lambdaQueryWrapper.eq(ObjectUtils.isNotNull(orderItems.getPid()), OrderItems::getPid, orderItems.getPid());//主表id
 		lambdaQueryWrapper.eq(ObjectUtils.isNotNull(orderItems.getBillNo()), OrderItems::getBillNo, orderItems.getBillNo());//销售单号
-		if (ObjectUtils.isNotNull(orderItems.getBusinesDateList()) && orderItems.getBusinesDateList().size() > 0) {
+		if (ObjectUtils.isNotNull(orderItems.getBusinesDateList()) && !orderItems.getBusinesDateList().isEmpty()) {
 			lambdaQueryWrapper.ge(OrderItems::getBusinesDate, orderItems.getBusinesDateList().get(0));
 			lambdaQueryWrapper.le(OrderItems::getBusinesDate, orderItems.getBusinesDateList().get(1));
 		}
-		if (ObjectUtils.isNotNull(orderItems.getPlannedDeliveryDateList()) && orderItems.getPlannedDeliveryDateList().size() > 0) {
+		if (ObjectUtils.isNotNull(orderItems.getPlannedDeliveryDateList()) && !orderItems.getPlannedDeliveryDateList().isEmpty()) {
 			lambdaQueryWrapper.eq(OrderItems::getPlannedDeliveryDate, orderItems.getPlannedDeliveryDateList().get(0));//计划交货日期起
 			lambdaQueryWrapper.eq(OrderItems::getPlannedDeliveryDate, orderItems.getPlannedDeliveryDateList().get(1));//计划交货日期止
 		}
@@ -1532,67 +1504,94 @@ public class ExportOrderController extends BladeController {
 		lambdaQueryWrapper.orderByAsc(OrderItems::getSort);
 		List<OrderItems> pages = orderItemsService.list(lambdaQueryWrapper);
 		List<OrderItems> orderItemsList = new ArrayList<>();
-		for (OrderItems orderItems_ : pages) {
-			if (ObjectUtils.isNotNull(orderItems_.getCorpId())) {
-				CorpsDesc corpsDesc = corpsDescClient.getCorpId(orderItems_.getCorpId());
-				if (ObjectUtils.isNotNull(corpsDesc)) {
-					orderItems_.setCorpName(corpsDesc.getCname());
-				}
+		if (!pages.isEmpty()){
+			StringBuilder corpIds = new StringBuilder();
+			StringBuilder goodsIds = new StringBuilder();
+			for (OrderItems orderItems_ : pages) {
+				corpIds.append(orderItems_.getCorpId()).append(",");
+				goodsIds.append(orderItems_.getItemId()).append(",");
 			}
-			if (ObjectUtils.isNotNull(orderItems_.getItemId())) {
-				GoodsDesc goodsDesc = goodsDescClient.getGoodsDesc(orderItems_.getItemId(), AuthUtil.getTenantId());
-				if (ObjectUtils.isNotNull(goodsDesc)) {
-					orderItems_.setCname(goodsDesc.getCname());
-					orderItems_.setCode(goodsDesc.getCode());
+			List<CorpsDesc> corpsDescList = corpsDescClient.selectByCorpIds(corpIds.toString());
+			List<GoodsDesc> goodsDescList = goodsDescClient.selectItemsIdGoods(goodsIds.toString());
+			for (OrderItems orderItems_ : pages) {
+				if (ObjectUtils.isNotNull(orderItems_.getCorpId()) && !corpsDescList.isEmpty()) {
+					CorpsDesc corpsDesc = corpsDescList.stream().filter(e-> e.getId().equals(orderItems_.getCorpId())).findFirst().orElse(null);
+					if (corpsDesc != null) {
+						orderItems_.setCorpName(corpsDesc.getCname());
+					}
+				}
+				if (ObjectUtils.isNotNull(orderItems_.getItemId()) && !goodsDescList.isEmpty()) {
+					GoodsDesc goodsDesc = goodsDescList.stream().filter(e-> e.getId().equals(orderItems_.getItemId())).findFirst().orElse(null);
+					if (goodsDesc != null) {
+						orderItems_.setCname(goodsDesc.getCname());
+						orderItems_.setCode(goodsDesc.getCode());
+					}
+				}
+				if (ObjectUtils.isNotNull(orderItems_.getPurchaseQuantity())) {
+					orderItems_.setActualQuantity(orderItems_.getOrderQuantity().subtract(orderItems_.getPurchaseQuantity()));
+				} else {
+					orderItems_.setActualQuantity(orderItems_.getOrderQuantity());
+				}
+				if (ObjectUtils.isNotNull(orderItems_.getPurchasePrice())) {
+					orderItems_.setPrice(orderItems_.getPurchasePrice());
+					orderItems_.setAmount(orderItems_.getPurchasePrice().multiply(orderItems_.getActualQuantity()));
+				} else {
+					orderItems_.setPrice(orderItems_.getPrice());
+					orderItems_.setAmount(orderItems_.getPrice().multiply(orderItems_.getActualQuantity()));
 				}
 			}
-			if (ObjectUtils.isNotNull(orderItems_.getPurchaseQuantity())) {
-				orderItems_.setActualQuantity(orderItems_.getOrderQuantity().subtract(orderItems_.getPurchaseQuantity()));
-			} else {
-				orderItems_.setActualQuantity(orderItems_.getOrderQuantity());
-			}
-			if (ObjectUtils.isNotNull(orderItems_.getPurchasePrice())) {
-				orderItems_.setPrice(orderItems_.getPurchasePrice());
-				orderItems_.setAmount(orderItems_.getPurchasePrice().multiply(orderItems_.getActualQuantity()));
+			LambdaQueryWrapper<OrderParts> orderPartsLambdaQueryWrapper = new LambdaQueryWrapper<>();
+			orderPartsLambdaQueryWrapper.eq(OrderParts::getIsDeleted, 0)
+				.eq(OrderParts::getTenantId, AuthUtil.getTenantId())
+				.eq(OrderParts::getSrcPid, orderItems.getPid());
+			//0代表不显示全部
+			if (ObjectUtils.isNotEmpty(orderItems.getShowAll()) && orderItems.getShowAll() == 0) {
+				orderPartsLambdaQueryWrapper.apply("good_number > purchases_number");
 			} else {
-				orderItems_.setPrice(orderItems_.getPrice());
-				orderItems_.setAmount(orderItems_.getPrice().multiply(orderItems_.getActualQuantity()));
+				orderPartsLambdaQueryWrapper.ne(OrderParts::getPurchasesNumber, new BigDecimal("0.00"));
 			}
-			orderItemsList.add(orderItems_);
-		}
-		LambdaQueryWrapper<OrderParts> orderPartsLambdaQueryWrapper = new LambdaQueryWrapper<>();
-		orderPartsLambdaQueryWrapper.eq(OrderParts::getIsDeleted, 0)
-			.eq(OrderParts::getTenantId, AuthUtil.getTenantId())
-			.eq(OrderParts::getPid, orderItems.getId());
-		//0代表不显示全部
-		if (ObjectUtils.isNotEmpty(orderItems.getShowAll()) && orderItems.getShowAll() == 0) {
-			orderPartsLambdaQueryWrapper.apply("good_number > purchases_number");
-		} else {
-			orderPartsLambdaQueryWrapper.ne(OrderParts::getPurchasesNumber, new BigDecimal("0.00"));
-		}
-		List<OrderParts> orderPartsList = orderPartsService.list(orderPartsLambdaQueryWrapper);
-		List<OrderItems> orderItemsList1 = orderItemsService.list(new LambdaQueryWrapper<OrderItems>()
-			.eq(OrderItems::getIsDeleted, 0)
-			.eq(OrderItems::getPid, orderItems.getPid()));
-		for (OrderParts orderParts : orderPartsList) {
-			OrderItems orderItems1 = new OrderItems();
-			orderItems1.setId(orderParts.getId());
-			if (orderItemsList1.size() > 0) {
-				orderItems1.setBillNo(orderItemsList1.get(0).getBillNo());
-				orderItems1.setBusinesDate(orderItemsList1.get(0).getBusinesDate());
-				orderItems1.setPlannedDeliveryDate(orderItemsList1.get(0).getPlannedDeliveryDate());
-				orderItems1.setCarry(orderItemsList1.get(0).getCarry());
+			List<OrderParts> orderPartsList = orderPartsService.list(orderPartsLambdaQueryWrapper);
+			if (!orderPartsList.isEmpty()){
+				for (OrderItems items : pages) {
+					orderItemsList.add(items);
+					List<OrderParts> partsList = orderPartsList.stream().filter(e -> e.getPid().equals(items.getId())).collect(Collectors.toList());
+					if (partsList.isEmpty()){
+						continue;
+					}
+					for (OrderParts orderParts : partsList) {
+						OrderItems orderItems1 = new OrderItems();
+						orderItems1.setDetailType("PJ");
+						orderItems1.setId(orderParts.getId());
+						orderItems1.setPid(orderParts.getSrcPid());
+						orderItems1.setSrcItemId(orderParts.getId());
+						orderItems1.setBillNo(items.getBillNo());
+						orderItems1.setBusinesDate(items.getBusinesDate());
+						orderItems1.setPlannedDeliveryDate(items.getPlannedDeliveryDate());
+						orderItems1.setCarry(items.getCarry());
+						if (ObjectUtils.isNotNull(orderParts.getPurchasesNumber())) {
+							orderItems1.setActualQuantity(orderParts.getGoodNumber().subtract(orderParts.getPurchasesNumber()));
+						} else {
+							orderItems1.setActualQuantity(orderParts.getGoodNumber());
+						}
+						if (ObjectUtils.isNotNull(orderParts.getPrice())) {
+							orderItems1.setPrice(orderParts.getPrice());
+							orderItems1.setAmount(orderParts.getPrice().multiply(orderItems1.getActualQuantity()));
+						} else {
+							orderItems1.setPrice(orderParts.getPrice());
+							orderItems1.setAmount(orderParts.getPrice().multiply(orderItems1.getActualQuantity()));
+						}
+						orderItems1.setItemId(orderParts.getGoodId());
+						orderItems1.setCname(orderParts.getGoodName());
+						orderItems1.setPurchaseQuantity(orderParts.getPurchasesNumber());
+						orderItems1.setOrderQuantity(orderParts.getGoodNumber());
+						orderItems1.setPriceCategory(orderParts.getGoodTypeName());
+						orderItems1.setPurchaseQuantity(orderParts.getPurchasesNumber());
+						orderItems1.setEname(orderParts.getEname());
+						orderItems1.setPartsCost(orderParts.getPartsCost());
+						orderItemsList.add(orderItems1);
+					}
+				}
 			}
-			orderItems1.setItemId(orderParts.getGoodId());
-			orderItems1.setCname(orderParts.getGoodName());
-			orderItems1.setPrice(orderParts.getPrice());
-			orderItems1.setPurchaseQuantity(orderParts.getPurchasesNumber());
-			orderItems1.setOrderQuantity(orderParts.getGoodNumber());
-			orderItems1.setAmount(orderParts.getAmout());
-			orderItems1.setPriceCategory(orderParts.getGoodTypeName());
-			orderItems1.setEname(orderParts.getEname());
-			orderItems1.setPartsCost(orderParts.getPartsCost());
-			orderItemsList.add(orderItems1);
 		}
 		List<ProcurementTasksExcel> excelList = BeanUtil.copy(orderItemsList, ProcurementTasksExcel.class);
 		ExcelUtil.export(response, "采购任务", "采购任务", excelList, ProcurementTasksExcel.class);
@@ -1601,9 +1600,6 @@ public class ExportOrderController extends BladeController {
 
 	/**
 	 * 生成发货单(新)
-	 *
-	 * @param order
-	 * @return
 	 */
 	@PostMapping("/generateShipment")
 	@ApiOperationSupport(order = 6)
@@ -1631,9 +1627,6 @@ public class ExportOrderController extends BladeController {
 
 	/**
 	 * 采购状态修改
-	 *
-	 * @param order
-	 * @return
 	 */
 	@PostMapping("/purchaseStatusUpdate")
 	@ApiOperationSupport(order = 6)
@@ -1648,9 +1641,6 @@ public class ExportOrderController extends BladeController {
 
 	/**
 	 * 撤销排产
-	 *
-	 * @param order
-	 * @return
 	 */
 	@PostMapping("/cancelPurchaseStatus")
 	@ApiOperationSupport(order = 6)
@@ -1665,9 +1655,6 @@ public class ExportOrderController extends BladeController {
 
 	/**
 	 * 单据数量统计
-	 *
-	 * @param order
-	 * @return
 	 */
 	@GetMapping("/documentQuantityStatistics")
 	@ApiOperationSupport(order = 6)
@@ -1678,9 +1665,6 @@ public class ExportOrderController extends BladeController {
 
 	/**
 	 * 单据数量统计
-	 *
-	 * @param order
-	 * @return
 	 */
 	@GetMapping("/salesList")
 	@ApiOperationSupport(order = 6)

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/impl/OrderServiceImpl.java

@@ -759,7 +759,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		if (ObjectUtils.isNotNull(order.getCorpId())) {
 			CorpsDesc corpsDesc = corpsDescClient.getCorpId(order.getCorpId());
 			if (ObjectUtils.isNotNull(corpsDesc)) {
-				if (ObjectUtils.isNotNull(corpsDesc.getCorpsAddrList()) && corpsDesc.getCorpsAddrList().size() > 0) {
+				if (ObjectUtils.isNotNull(corpsDesc.getCorpsAddrList()) && !corpsDesc.getCorpsAddrList().isEmpty()) {
 					order.setArrivalAddress(corpsDesc.getCorpsAddrList().get(0).getDetailedAddress());
 				}
 			}
@@ -806,7 +806,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			R<List<Map<String, Object>>> corpMessage = corpsDescClient.getCorpsMessage(orderMessage.getCorpId().toString());
 			if (corpMessage.isSuccess() && corpMessage.getData() != null) {
 				orderMessage.setCorpName(corpMessage.getData());
-				if (corpMessage.getData().size() > 0) {
+				if (!corpMessage.getData().isEmpty()) {
 					orderMessage.setCorpsName(corpMessage.getData().get(0).get("cname").toString());
 				}
 			}
@@ -904,7 +904,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			List<StorageDesc> storageDescList = storageClient.selectStorageDescAll();
 			for (OrderItems orderItems : orderItemsList) {
 				if (ObjectUtils.isNotNull(orderItems.getStorageId())) {
-					if (ObjectUtils.isNotNull(storageDescList) && storageDescList.size() > 0) {
+					if (ObjectUtils.isNotNull(storageDescList) && !storageDescList.isEmpty()) {
 						String name = storageDescList.stream().filter(e -> orderItems.getStorageId().equals(e.getId())).findFirst().orElse(new StorageDesc()).getCname();
 						orderItems.setStorageName(name);
 					}
@@ -917,7 +917,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		}
 		if (ObjectUtils.isNull(orderMessage.getStorageId())) {
 			List<StorageType> storageTypeList = storageClient.selectStorageTypeAll();
-			if (ObjectUtils.isNotNull(storageTypeList) && storageTypeList.size() > 0) {
+			if (ObjectUtils.isNotNull(storageTypeList) && !storageTypeList.isEmpty()) {
 				orderMessage.setStorageId(storageTypeList.get(0).getId());
 				orderMessage.setStorageName(storageTypeList.get(0).getCname());
 			}
@@ -2703,7 +2703,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			R<List<Map<String, Object>>> corpMessage = corpsDescClient.getCorpsMessage(orderMessage.getCorpId().toString());
 			if (corpMessage.isSuccess() && corpMessage.getData() != null) {
 				orderMessage.setCorpName(corpMessage.getData());
-				if (corpMessage.getData().size() > 0) {
+				if (!corpMessage.getData().isEmpty()) {
 					orderMessage.setCorpsName(corpMessage.getData().get(0).get("cname").toString());
 				}
 			}
@@ -2868,7 +2868,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		if (ObjectUtils.isNotNull(order.getCorpId())) {
 			CorpsDesc corpsDesc = corpsDescClient.getCorpId(order.getCorpId());
 			if (ObjectUtils.isNotNull(corpsDesc)) {
-				if (ObjectUtils.isNotNull(corpsDesc.getCorpsAddrList()) && corpsDesc.getCorpsAddrList().size() > 0) {
+				if (ObjectUtils.isNotNull(corpsDesc.getCorpsAddrList()) && !corpsDesc.getCorpsAddrList().isEmpty()) {
 					order.setArrivalAddress(corpsDesc.getCorpsAddrList().get(0).getDetailedAddress());
 				}
 			}
@@ -3096,7 +3096,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		if (ObjectUtils.isNotNull(order.getCorpId())) {
 			CorpsDesc corpsDesc = corpsDescClient.getCorpId(order.getCorpId());
 			if (ObjectUtils.isNotNull(corpsDesc)) {
-				if (ObjectUtils.isNotNull(corpsDesc.getCorpsAddrList()) && corpsDesc.getCorpsAddrList().size() > 0) {
+				if (ObjectUtils.isNotNull(corpsDesc.getCorpsAddrList()) && !corpsDesc.getCorpsAddrList().isEmpty()) {
 					order.setArrivalAddress(corpsDesc.getCorpsAddrList().get(0).getDetailedAddress());
 				}
 			}
@@ -3136,7 +3136,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				if (corpsDesc.getBalanceAmount().compareTo(order.getMemberAmout()) < 0) {
 					throw new RuntimeException("会员余额不足，支付失败");
 				}
-				if (ObjectUtils.isNotNull(corpsDesc.getCorpsAddrList()) && corpsDesc.getCorpsAddrList().size() > 0) {
+				if (ObjectUtils.isNotNull(corpsDesc.getCorpsAddrList()) && !corpsDesc.getCorpsAddrList().isEmpty()) {
 					order.setArrivalAddress(corpsDesc.getCorpsAddrList().get(0).getDetailedAddress());
 				}
 			}
@@ -3205,7 +3205,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			order.setMemberBalance(ObjectUtils.isNotNull(order.getMemberAmout()) ? order.getMemberAmout() : new BigDecimal("0.00"));
 			if (ObjectUtils.isNotNull(order.getCurrentAmount()) && !order.getCurrentAmount().equals(new BigDecimal(0))) {
 				List<Settlement> settlementList = new ArrayList<>();
-				if (ObjectUtils.isNotNull(order.getSettlementList()) && order.getSettlementList().size() > 0) {
+				if (ObjectUtils.isNotNull(order.getSettlementList()) && !order.getSettlementList().isEmpty()) {
 					settlementList = order.getSettlementList();
 				}
 				Settlement settlement = new Settlement();
@@ -3226,7 +3226,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			} else {
 				List<Settlement> settlementList = new ArrayList<>();
 				if (ObjectUtils.isNotNull(order.getMemberAmout()) && !order.getMemberAmout().equals(new BigDecimal(0))) {
-					if (ObjectUtils.isNotNull(order.getSettlementList()) && order.getSettlementList().size() > 0) {
+					if (ObjectUtils.isNotNull(order.getSettlementList()) && !order.getSettlementList().isEmpty()) {
 						settlementList = order.getSettlementList();
 					}
 					Settlement settlement = new Settlement();
@@ -3244,7 +3244,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 					settlementList.add(settlement);
 				} else {
 					List<Settlement> settlementList1 = financeClient.selectListBySrcId(order.getId(), null);
-					if (settlementList1.size() > 0) {
+					if (!settlementList1.isEmpty()) {
 						settlementList.addAll(settlementList1);
 					}
 				}
@@ -3366,7 +3366,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 					if (ObjectUtils.isNotNull(order.getCorpId())) {
 						CorpsDesc corpsDesc = corpsDescClient.getCorpId(order.getCorpId());
 						if (ObjectUtils.isNotNull(corpsDesc)) {
-							if (ObjectUtils.isNotNull(corpsDesc.getCorpsAddrList()) && corpsDesc.getCorpsAddrList().size() > 0) {
+							if (ObjectUtils.isNotNull(corpsDesc.getCorpsAddrList()) && !corpsDesc.getCorpsAddrList().isEmpty()) {
 								order.setArrivalAddress(corpsDesc.getCorpsAddrList().get(0).getDetailedAddress());
 							}
 						}
@@ -3530,7 +3530,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 					if (ObjectUtils.isNotNull(order.getCorpId())) {
 						CorpsDesc corpsDesc = corpsDescClient.getCorpId(order.getCorpId());
 						if (ObjectUtils.isNotNull(corpsDesc)) {
-							if (ObjectUtils.isNotNull(corpsDesc.getCorpsAddrList()) && corpsDesc.getCorpsAddrList().size() > 0) {
+							if (ObjectUtils.isNotNull(corpsDesc.getCorpsAddrList()) && !corpsDesc.getCorpsAddrList().isEmpty()) {
 								order.setArrivalAddress(corpsDesc.getCorpsAddrList().get(0).getDetailedAddress());
 							}
 						}
@@ -3739,7 +3739,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				if (ObjectUtils.isNotNull(order.getCorpId())) {
 					CorpsDesc corpsDesc = corpsDescClient.getCorpId(order.getCorpId());
 					if (ObjectUtils.isNotNull(corpsDesc)) {
-						if (ObjectUtils.isNotNull(corpsDesc.getCorpsAddrList()) && corpsDesc.getCorpsAddrList().size() > 0) {
+						if (ObjectUtils.isNotNull(corpsDesc.getCorpsAddrList()) && !corpsDesc.getCorpsAddrList().isEmpty()) {
 							order.setArrivalAddress(corpsDesc.getCorpsAddrList().get(0).getDetailedAddress());
 						}
 						if (corpsDesc.getBalanceAmount().compareTo(order.getMemberAmout()) < 0) {
@@ -4030,7 +4030,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 					if (ObjectUtils.isNotNull(order.getCorpId())) {
 						CorpsDesc corpsDesc = corpsDescClient.getCorpId(order.getCorpId());
 						if (ObjectUtils.isNotNull(corpsDesc)) {
-							if (ObjectUtils.isNotNull(corpsDesc.getCorpsAddrList()) && corpsDesc.getCorpsAddrList().size() > 0) {
+							if (ObjectUtils.isNotNull(corpsDesc.getCorpsAddrList()) && !corpsDesc.getCorpsAddrList().isEmpty()) {
 								order.setArrivalAddress(corpsDesc.getCorpsAddrList().get(0).getDetailedAddress());
 							}
 						}
@@ -4197,7 +4197,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 					if (ObjectUtils.isNotNull(order.getCorpId())) {
 						CorpsDesc corpsDesc = corpsDescClient.getCorpId(order.getCorpId());
 						if (ObjectUtils.isNotNull(corpsDesc)) {
-							if (ObjectUtils.isNotNull(corpsDesc.getCorpsAddrList()) && corpsDesc.getCorpsAddrList().size() > 0) {
+							if (ObjectUtils.isNotNull(corpsDesc.getCorpsAddrList()) && !corpsDesc.getCorpsAddrList().isEmpty()) {
 								order.setArrivalAddress(corpsDesc.getCorpsAddrList().get(0).getDetailedAddress());
 							}
 						}
@@ -4398,7 +4398,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 					if (ObjectUtils.isNotNull(order.getCorpId())) {
 						CorpsDesc corpsDesc = corpsDescClient.getCorpId(order.getCorpId());
 						if (ObjectUtils.isNotNull(corpsDesc)) {
-							if (ObjectUtils.isNotNull(corpsDesc.getCorpsAddrList()) && corpsDesc.getCorpsAddrList().size() > 0) {
+							if (ObjectUtils.isNotNull(corpsDesc.getCorpsAddrList()) && !corpsDesc.getCorpsAddrList().isEmpty()) {
 								order.setArrivalAddress(corpsDesc.getCorpsAddrList().get(0).getDetailedAddress());
 							}
 						}
@@ -4620,7 +4620,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 					if (ObjectUtils.isNotNull(order.getCorpId())) {
 						CorpsDesc corpsDesc = corpsDescClient.getCorpId(order.getCorpId());
 						if (ObjectUtils.isNotNull(corpsDesc)) {
-							if (ObjectUtils.isNotNull(corpsDesc.getCorpsAddrList()) && corpsDesc.getCorpsAddrList().size() > 0) {
+							if (ObjectUtils.isNotNull(corpsDesc.getCorpsAddrList()) && !corpsDesc.getCorpsAddrList().isEmpty()) {
 								order.setArrivalAddress(corpsDesc.getCorpsAddrList().get(0).getDetailedAddress());
 							}
 							if (corpsDesc.getBalanceAmount().compareTo(order.getMemberAmout()) < 0) {
@@ -4811,7 +4811,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 						e.printStackTrace();
 					}
 				}
-				if (data.size() > 0) {
+				if (!data.isEmpty()) {
 					WxMpTemplateDto wxMpTemplateDto = new WxMpTemplateDto();
 					wxMpTemplateDto.setOpenid(openIds.substring(0, openIds.length() - 1));
 					wxMpTemplateDto.setTenantId(AuthUtil.getTenantId());
@@ -4893,7 +4893,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		if (ObjectUtils.isNotNull(newOrder.getCorpId())) {
 			CorpsDesc corpsDesc = corpsDescClient.getCorpId(newOrder.getCorpId());
 			if (ObjectUtils.isNotNull(corpsDesc)) {
-				if (ObjectUtils.isNotNull(corpsDesc.getCorpsAddrList()) && corpsDesc.getCorpsAddrList().size() > 0) {
+				if (ObjectUtils.isNotNull(corpsDesc.getCorpsAddrList()) && !corpsDesc.getCorpsAddrList().isEmpty()) {
 					newOrder.setArrivalAddress(corpsDesc.getCorpsAddrList().get(0).getDetailedAddress());
 				}
 			}
@@ -5022,7 +5022,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				map.put("corpName", corpsDesc.getCname() == null ? "无" : corpsDesc.getCname());
 				map.put("pointsBalance", corpsDesc.getPointsBalance() == null ? "0.00" : corpsDesc.getPointsBalance());
 				map.put("balanceAmount", corpsDesc.getBalanceAmount() == null ? "0.00" : corpsDesc.getBalanceAmount());
-				if (corpsDesc.getCorpsAddrList().size() > 0) {
+				if (!corpsDesc.getCorpsAddrList().isEmpty()) {
 					map.put("address", corpsDesc.getCorpsAddrList().get(0).getDetailedAddress() == null ? "无" : corpsDesc.getCorpsAddrList().get(0).getDetailedAddress());
 				} else {
 					map.put("address", "无");
@@ -5103,7 +5103,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		if (ObjectUtils.isNotNull(orderNew.getCorpId())) {
 			CorpsDesc corpsDesc = corpsDescClient.getCorpId(orderNew.getCorpId());
 			if (ObjectUtils.isNotNull(corpsDesc)) {
-				if (ObjectUtils.isNotNull(corpsDesc.getCorpsAddrList()) && corpsDesc.getCorpsAddrList().size() > 0) {
+				if (ObjectUtils.isNotNull(corpsDesc.getCorpsAddrList()) && !corpsDesc.getCorpsAddrList().isEmpty()) {
 					orderNew.setArrivalAddress(corpsDesc.getCorpsAddrList().get(0).getDetailedAddress());
 				}
 			}
@@ -5178,7 +5178,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				if (ObjectUtils.isNotNull(orderNew.getCorpId())) {
 					CorpsDesc corpsDesc = corpsDescClient.getCorpId(orderNew.getCorpId());
 					if (ObjectUtils.isNotNull(corpsDesc)) {
-						if (ObjectUtils.isNotNull(corpsDesc.getCorpsAddrList()) && corpsDesc.getCorpsAddrList().size() > 0) {
+						if (ObjectUtils.isNotNull(corpsDesc.getCorpsAddrList()) && !corpsDesc.getCorpsAddrList().isEmpty()) {
 							orderNew.setArrivalAddress(corpsDesc.getCorpsAddrList().get(0).getDetailedAddress());
 						}
 						if (corpsDesc.getBalanceAmount().compareTo(order.getMemberBalance()) < 0) {
@@ -5238,7 +5238,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				if (ObjectUtils.isNotNull(orderNew.getCorpId())) {
 					CorpsDesc corpsDesc = corpsDescClient.getCorpId(orderNew.getCorpId());
 					if (ObjectUtils.isNotNull(corpsDesc)) {
-						if (ObjectUtils.isNotNull(corpsDesc.getCorpsAddrList()) && corpsDesc.getCorpsAddrList().size() > 0) {
+						if (ObjectUtils.isNotNull(corpsDesc.getCorpsAddrList()) && !corpsDesc.getCorpsAddrList().isEmpty()) {
 							orderNew.setArrivalAddress(corpsDesc.getCorpsAddrList().get(0).getDetailedAddress());
 						}
 					}
@@ -5632,7 +5632,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				if (ObjectUtils.isNotNull(orderItems.getPartsCapValue())) {
 					JSONArray objects = JSONArray.parseArray(orderItems.getPartsCapValue());
 					List<OrderParts> categoryConstantInfos = objects.toJavaList(OrderParts.class);
-					if (ObjectUtils.isNotNull(categoryConstantInfos) && categoryConstantInfos.size() > 0) {
+					if (ObjectUtils.isNotNull(categoryConstantInfos) && !categoryConstantInfos.isEmpty()) {
 						sum = sum.add(categoryConstantInfos.stream().map(OrderParts::getGoodNumber).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
 					}
 					saveOrderParts(categoryConstantInfos, orderItems.getId(), "3", order.getId(), orderItems.getOrderQuantity());
@@ -5641,7 +5641,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				if (ObjectUtils.isNotNull(orderItems.getPartsValveValue())) {
 					JSONArray objects = JSONArray.parseArray(orderItems.getPartsValveValue());
 					List<OrderParts> categoryConstantInfos = objects.toJavaList(OrderParts.class);
-					if (ObjectUtils.isNotNull(categoryConstantInfos) && categoryConstantInfos.size() > 0) {
+					if (ObjectUtils.isNotNull(categoryConstantInfos) && !categoryConstantInfos.isEmpty()) {
 						sum = sum.add(categoryConstantInfos.stream().map(OrderParts::getGoodNumber).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
 					}
 					saveOrderParts(categoryConstantInfos, orderItems.getId(), "4", order.getId(), orderItems.getOrderQuantity());
@@ -5775,7 +5775,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 						} else {
 							orderItems_.setActualQuantity(orderItems_.getOrderQuantity());
 						}*/
-						if (ObjectUtils.isNotNull(priceBankList) && priceBankList.size() > 0) {
+						if (ObjectUtils.isNotNull(priceBankList) && !priceBankList.isEmpty()) {
 							if (ObjectUtils.isNotNull(priceBankList.get(0).getPrice()) && !priceBankList.get(0).getPrice().equals(new BigDecimal("0.00"))) {
 								orderItems_.setPrice(priceBankList.get(0).getPrice());
 								orderItems_.setAmount(orderItems_.getActualQuantity().multiply(priceBankList.get(0).getPrice()));
@@ -5825,7 +5825,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 							orderItems_.setActualQuantity(orderItems_.getOrderQuantity());
 						}*/
 						orderItems_.setActualQuantity(items.getActualQuantity());
-						if (ObjectUtils.isNotNull(priceBankList) && priceBankList.size() > 0) {
+						if (ObjectUtils.isNotNull(priceBankList) && !priceBankList.isEmpty()) {
 							if (ObjectUtils.isNotNull(priceBankList.get(0).getPrice()) && !priceBankList.get(0).getPrice().equals(new BigDecimal("0.00"))) {
 								orderItems_.setPrice(priceBankList.get(0).getPrice());
 								orderItems_.setAmount(orderItems_.getActualQuantity().multiply(priceBankList.get(0).getPrice()));
@@ -5887,7 +5887,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 							orderItems_.setActualQuantity(items.getOrderQuantity());
 						}*/
 						orderItems_.setActualQuantity(items.getActualQuantity());
-						if (ObjectUtils.isNotNull(priceBankList) && priceBankList.size() > 0) {
+						if (ObjectUtils.isNotNull(priceBankList) && !priceBankList.isEmpty()) {
 							if (ObjectUtils.isNotNull(priceBankList.get(0).getPrice()) && !priceBankList.get(0).getPrice().equals(new BigDecimal("0.00"))) {
 								orderItems_.setPrice(priceBankList.get(0).getPrice());
 								orderItems_.setAmount(items.getActualQuantity().multiply(priceBankList.get(0).getPrice()));
@@ -5941,7 +5941,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 							orderItems_.setActualQuantity(items.getOrderQuantity());
 						}*/
 						orderItems_.setActualQuantity(items.getActualQuantity());
-						if (ObjectUtils.isNotNull(priceBankList) && priceBankList.size() > 0) {
+						if (ObjectUtils.isNotNull(priceBankList) && !priceBankList.isEmpty()) {
 							if (ObjectUtils.isNotNull(priceBankList.get(0).getPrice()) && !priceBankList.get(0).getPrice().equals(new BigDecimal("0.00"))) {
 								orderItems_.setPrice(priceBankList.get(0).getPrice());
 								orderItems_.setAmount(items.getActualQuantity().multiply(priceBankList.get(0).getPrice()));
@@ -5961,7 +5961,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
 		}
 
-		if (ObjectUtils.isNotNull(orderListAll) && orderListAll.size() > 0) {
+		if (ObjectUtils.isNotNull(orderListAll) && !orderListAll.isEmpty()) {
 			StringBuilder srcIds = new StringBuilder();
 			for (Long e : orderListAll.stream().map(Order::getId).distinct().collect(Collectors.toList())) {
 				srcIds.append(e).append(",");
@@ -6014,8 +6014,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			.eq(OrderItems::getTenantId, AuthUtil.getTenantId())
 			.eq(OrderItems::getPid, detail.getId());
 		List<OrderItems> orderItemsList = orderItemsMapper.selectList(lambdaQueryWrapper);
-
-		if (ObjectUtils.isNotNull(orderItemsList) && orderItemsList.size() > 0) {
+		boolean status = false;
+		if (ObjectUtils.isNotNull(orderItemsList) && !orderItemsList.isEmpty()) {
 			List<Long> pidList = new ArrayList<>();
 			List<OrderParts> srcItemsList = new ArrayList<>();
 			List<OrderItems> srcOrderItemsList = new ArrayList<>();
@@ -6055,10 +6055,10 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 					pidList.add(orderItems.getSrcId());
 				}
 			}
-			if (srcItemsList.size() > 0) {
+			if (!srcItemsList.isEmpty()) {
 				orderPartsService.updateBatchById(srcItemsList);
 			}
-			if (srcOrderItemsList.size() > 0) {
+			if (!srcOrderItemsList.isEmpty()) {
 				orderItemsService.updateBatchById(srcOrderItemsList);
 			}
 			List<Long> pids = pidList.stream().distinct().collect(Collectors.toList());
@@ -6096,6 +6096,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 							.eq(Order::getBillType, "CG"));
 						long count = orderList1.stream().filter(e -> "货备齐".equals(e.getOrderStatus())).count();
 						if ((orderList1.size() - count) == 1) {
+							status = true;
 							order1.setProductionScheduling("货备齐");
 							order1.setOrderStatus("货备齐");
 							order1.setProductionSchedulingDate(new Date());
@@ -6105,7 +6106,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 					orderList.add(order1);
 				}
 			}
-			if (orderList.size() > 0) {
+			if (!orderList.isEmpty()) {
 				this.updateBatchById(orderList);
 			}
 		}
@@ -6141,15 +6142,15 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				} else if (3 == order.getPurchaseStatusType()) {
 					deliveryClient.updateBySrcId(selectOrder.getId(), "FH", selectOrder.getTradeType());
 				}
-				if (true) {
+				if (status) {
 					sendMessage.setUrl("/exportTrade/invoice/index");
 					sendMessage.setToUserId(selectOrder.getDocumenterId());
 					sendMessage.setToUserName(selectOrder.getDocumenterName());
-					if (1 == order.getPurchaseStatusType()) {
+					/*if (1 == order.getPurchaseStatusType()) {
 						sendMessage.setMessageBody("您的销售订单" + selectOrder.getOrderNo() + "正在排产中,请查看");
 					} else if (2 == order.getPurchaseStatusType()) {
 						sendMessage.setMessageBody("您的销售订单" + selectOrder.getOrderNo() + "已预计货好,请查看");
-					} else if (3 == order.getPurchaseStatusType()) {
+					} else*/ if (3 == order.getPurchaseStatusType()) {
 						sendMessage.setMessageBody("您的销售订单" + selectOrder.getOrderNo() + "已采购完成,请查看");
 					}
 					R save = messageClient.save(sendMessage);
@@ -6189,7 +6190,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			.eq(OrderItems::getPid, detail.getId());
 		List<OrderItems> orderItemsList = orderItemsMapper.selectList(lambdaQueryWrapper);
 
-		if (ObjectUtils.isNotNull(orderItemsList) && orderItemsList.size() > 0) {
+		if (ObjectUtils.isNotNull(orderItemsList) && !orderItemsList.isEmpty()) {
 			List<Long> pidList = new ArrayList<>();
 			List<OrderParts> srcItemsList = new ArrayList<>();
 			List<OrderItems> srcOrderItemsList = new ArrayList<>();
@@ -6223,10 +6224,10 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				}
 				pidList.add(orderItems.getSrcId());
 			}
-			if (srcItemsList.size() > 0) {
+			if (!srcItemsList.isEmpty()) {
 				orderPartsService.updateBatchById(srcItemsList);
 			}
-			if (srcOrderItemsList.size() > 0) {
+			if (!srcOrderItemsList.isEmpty()) {
 				orderItemsService.updateBatchById(srcOrderItemsList);
 			}
 			List<Long> pids = pidList.stream().distinct().collect(Collectors.toList());
@@ -6248,7 +6249,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 					orderList.add(order1);
 				}
 			}
-			if (orderList.size() > 0) {
+			if (!orderList.isEmpty()) {
 				this.updateBatchById(orderList);
 			}
 		}
@@ -6273,7 +6274,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				sendMessage.setCreateTime(new Date());
 				sendMessage.setPageLabel(selectOrder.getPageLabel());
 				sendMessage.setPageStatus(selectOrder.getPageStatus());
-				if (true) {
 					sendMessage.setUrl("/exportTrade/salesContract/index");
 					sendMessage.setToUserId(selectOrder.getCreateUser());
 					sendMessage.setToUserName(selectOrder.getCreateUserName());
@@ -6287,8 +6287,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 					if (!save.isSuccess()) {
 						throw new SecurityException("发送消息失败");
 					}
-				}
-				if (true) {
+				/*if (true) {
 					sendMessage.setUrl("/exportTrade/invoice/index");
 					sendMessage.setToUserId(selectOrder.getDocumenterId());
 					sendMessage.setToUserName(selectOrder.getDocumenterName());
@@ -6299,12 +6298,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 					if (!save.isSuccess()) {
 						throw new SecurityException("发送消息失败");
 					}
-				}
+				}*/
 //				baseMapper.updateById(selectOrder);
 				orderList.add(selectOrder);
 			}
 		}
-		if (orderList.size() > 0) {
+		if (!orderList.isEmpty()) {
 			this.updateBatchById(orderList);
 		}
 		return R.data(detail);
@@ -6320,7 +6319,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			.ge(Order::getBusinesDate, order.getDateList().get(0))
 			.le(Order::getBusinesDate, order.getDateList().get(1))
 		);
-		if (ObjectUtils.isNotNull(orderList) && orderList.size() > 0) {
+		if (ObjectUtils.isNotNull(orderList) && !orderList.isEmpty()) {
 			List<Long> userIdList = orderList.stream().map(Order::getCreateUser).distinct().collect(Collectors.toList());
 			for (Long userId : userIdList) {
 				R<User> res = userClient.userInfoById(userId);
@@ -6419,7 +6418,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				if (corpsDesc.getBalanceAmount().compareTo(order.getMemberAmout()) < 0) {
 					throw new RuntimeException("会员余额不足，支付失败");
 				}
-				if (ObjectUtils.isNotNull(corpsDesc.getCorpsAddrList()) && corpsDesc.getCorpsAddrList().size() > 0) {
+				if (ObjectUtils.isNotNull(corpsDesc.getCorpsAddrList()) && !corpsDesc.getCorpsAddrList().isEmpty()) {
 					order.setArrivalAddress(corpsDesc.getCorpsAddrList().get(0).getDetailedAddress());
 				}
 			}
@@ -6630,7 +6629,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 						e.printStackTrace();
 					}
 				}
-				if (data.size() > 0) {
+				if (!data.isEmpty()) {
 					WxMpTemplateDto wxMpTemplateDto = new WxMpTemplateDto();
 					wxMpTemplateDto.setOpenid(openIds.substring(0, openIds.length() - 1));
 					wxMpTemplateDto.setTenantId(AuthUtil.getTenantId());
@@ -6690,7 +6689,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		if (ObjectUtils.isNotNull(order.getCorpId())) {
 			corpsDesc = corpsDescClient.getCorpId(order.getCorpId());
 			if (ObjectUtils.isNotNull(corpsDesc)) {
-				if (ObjectUtils.isNotNull(corpsDesc.getCorpsAddrList()) && corpsDesc.getCorpsAddrList().size() > 0) {
+				if (ObjectUtils.isNotNull(corpsDesc.getCorpsAddrList()) && !corpsDesc.getCorpsAddrList().isEmpty()) {
 					order.setArrivalAddress(corpsDesc.getCorpsAddrList().get(0).getDetailedAddress());
 				}
 			}
@@ -6781,7 +6780,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 					throw new RuntimeException("未找到库存信息");
 				}
 			}
-			if (list.size() > 0) {
+			if (!list.isEmpty()) {
 				R ress = stockGoodsClient.updateStockListYCP(BeanUtil.copy(list, StockGoods.class));
 				if (!ress.isSuccess()) {
 					throw new RuntimeException(ress.getMsg());
@@ -6867,7 +6866,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		List<Map<String, Object>> mapList = new ArrayList<>();
 		//查询字典所有状态
 		R<List<DictBiz>> res = dictBizClient.getList("order_status_pjjl");
-		if (res.isSuccess() && res.getData().size() > 0) {
+		if (res.isSuccess() && !res.getData().isEmpty()) {
 			Long corpId = null;
 			if (AuthUtil.getUserRole().equals("客户")) {
 				CorpsAttn corpsAttn = corpsAttnClient.getUser(AuthUtil.getUserId(), AuthUtil.getTenantId());
@@ -6942,10 +6941,10 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		return mapList;
 	}
 
-	@Override
 	/**
 	 * 确认发货，收货
 	 */
+	@Override
 	@Transactional(rollbackFor = Exception.class)
 	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
 	public R delivery(Order order) {
@@ -7199,7 +7198,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		if (ObjectUtils.isNotNull(order.getCorpId())) {
 			CorpsDesc corpsDesc = corpsDescClient.getCorpId(order.getCorpId());
 			if (ObjectUtils.isNotNull(corpsDesc)) {
-				if (ObjectUtils.isNotNull(corpsDesc.getCorpsAddrList()) && corpsDesc.getCorpsAddrList().size() > 0) {
+				if (ObjectUtils.isNotNull(corpsDesc.getCorpsAddrList()) && !corpsDesc.getCorpsAddrList().isEmpty()) {
 					order.setArrivalAddress(corpsDesc.getCorpsAddrList().get(0).getDetailedAddress());
 					order.setTel(corpsDesc.getTel());
 					if (ObjectUtils.isNull(order.getCorpTel())) {
@@ -7320,7 +7319,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			}
 			if (ObjectUtils.isNotNull(goodsId)) {
 				List<GoodsDesc> goodsDescList = goodsDescClient.selectItemsIdGoods(goodsId.substring(0, goodsId.length() - 1));
-				if (ObjectUtils.isNotNull(goodsDescList) && goodsDescList.size() > 0) {
+				if (ObjectUtils.isNotNull(goodsDescList) && !goodsDescList.isEmpty()) {
 					order.setGoodsList(goodsDescList.stream().map(GoodsDesc::getCname).distinct().collect(Collectors.joining()));
 				}
 			}
@@ -7447,7 +7446,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		if (ObjectUtils.isNotNull(order.getCorpId())) {
 			CorpsDesc corpsDesc = corpsDescClient.getCorpId(order.getCorpId());
 			if (ObjectUtils.isNotNull(corpsDesc)) {
-				if (ObjectUtils.isNotNull(corpsDesc.getCorpsAddrList()) && corpsDesc.getCorpsAddrList().size() > 0) {
+				if (ObjectUtils.isNotNull(corpsDesc.getCorpsAddrList()) && !corpsDesc.getCorpsAddrList().isEmpty()) {
 					order.setArrivalAddress(corpsDesc.getCorpsAddrList().get(0).getDetailedAddress());
 				}
 			}
@@ -7555,7 +7554,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			}
 			if (ObjectUtils.isNotNull(goodsId)) {
 				List<GoodsDesc> goodsDescList = goodsDescClient.selectItemsIdGoods(goodsId.substring(0, goodsId.length() - 1));
-				if (ObjectUtils.isNotNull(goodsDescList) && goodsDescList.size() > 0) {
+				if (ObjectUtils.isNotNull(goodsDescList) && !goodsDescList.isEmpty()) {
 					order.setGoodsList(goodsDescList.stream().map(GoodsDesc::getCname).distinct().collect(Collectors.joining()));
 				}
 			}
@@ -7664,7 +7663,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				if (corpsDesc.getBalanceAmount().compareTo(order.getMemberAmout()) < 0) {
 					throw new RuntimeException("会员余额不足，支付失败");
 				}
-				if (ObjectUtils.isNotNull(corpsDesc.getCorpsAddrList()) && corpsDesc.getCorpsAddrList().size() > 0) {
+				if (ObjectUtils.isNotNull(corpsDesc.getCorpsAddrList()) && !corpsDesc.getCorpsAddrList().isEmpty()) {
 					order.setArrivalAddress(corpsDesc.getCorpsAddrList().get(0).getDetailedAddress());
 				}
 			}
@@ -7804,13 +7803,13 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 					stockGoodsList.add(stockGoods);
 				}
 			}
-			if (list.size() > 0) {
+			if (!list.isEmpty()) {
 				R ress = stockGoodsClient.updateStockListYCP(BeanUtil.copy(list, StockGoods.class));
 				if (!ress.isSuccess()) {
 					throw new RuntimeException(ress.getMsg());
 				}
 			}
-			if (stockGoodsList.size() > 0) {
+			if (!stockGoodsList.isEmpty()) {
 				stockGoodsClient.saveStockListYCP(stockGoodsList);
 			}
 			List<OrderItems> orderItemsList = orderItemsService.saveOrderItemsMessage(order.getOrderItemsList(), date, order.getId());
@@ -7919,7 +7918,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 									e.printStackTrace();
 								}
 							}
-							if (data.size() > 0) {
+							if (!data.isEmpty()) {
 								WxMpTemplateDto wxMpTemplateDto = new WxMpTemplateDto();
 								wxMpTemplateDto.setOpenid(openIds.substring(0, openIds.length() - 1));
 								wxMpTemplateDto.setTenantId(AuthUtil.getTenantId());