2025年2月8日17:16:08

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/excel/ProductLaunchImportCodeExcel.java

@@ -27,12 +27,6 @@ public class ProductLaunchImportCodeExcel implements Serializable {
 	private String code;
 
 	/**
-	 * 所属公司名称
-	 */
-	@ExcelProperty(value = "*公司")
-	private String salesCompanyName;
-
-	/**
 	 * 售价1
 	 */
 	@ExcelProperty(value = "*售价1")
@@ -58,12 +52,4 @@ public class ProductLaunchImportCodeExcel implements Serializable {
 	 */
 	@ExcelProperty(value = "库存")
 	private BigDecimal inventory;
-
-	/**
-	 * 共享公司
-	 */
-	@ExcelProperty(value = "共享公司(英文逗号拼接)")
-	private String sharedCompany;
-
-
 }

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/excel/ProductLaunchImportExcel.java

@@ -28,12 +28,6 @@ public class ProductLaunchImportExcel implements Serializable {
 	private String cname;
 
 	/**
-	 * 所属公司名称
-	 */
-	@ExcelProperty(value = "*公司")
-	private String salesCompanyName;
-
-	/**
 	 * 售价1
 	 */
 	@ExcelProperty(value = "*售价1")
@@ -60,11 +54,4 @@ public class ProductLaunchImportExcel implements Serializable {
 	@ExcelProperty(value = "库存")
 	private BigDecimal inventory;
 
-	/**
-	 * 共享公司
-	 */
-	@ExcelProperty(value = "共享公司(英文逗号拼接)")
-	private String sharedCompany;
-
-
 }

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/goods/controller/GoodsDescController.java

@@ -620,15 +620,18 @@ public class GoodsDescController extends BladeController {
 				item.setPrice(pjProductLaunch.getInventoryCostPrice());
 			}
 			String typeId = item.getGoodsTypeId();
-			String[] split = typeId.split(",");
-			List<String> stringList = Arrays.asList(split);
-			LambdaQueryWrapper<PjGoodsType> goodsTypeLambdaQueryWrapper = new LambdaQueryWrapper<>();
-			goodsTypeLambdaQueryWrapper.in(PjGoodsType::getId, stringList);
-			List<PjGoodsType> types = goodsDescType.list(goodsTypeLambdaQueryWrapper);
-			if (CollectionUtils.isNotEmpty(types)) {
-				List<String> typeStr = types.stream().map(PjGoodsType::getCname).collect(Collectors.toList());
-				item.setGoodsTypeName(typeStr.toString().replace("[", "").replace("]", ""));
+			if (ObjectUtils.isNotNull(typeId)){
+				String[] split = typeId.split(",");
+				List<String> stringList = Arrays.asList(split);
+				LambdaQueryWrapper<PjGoodsType> goodsTypeLambdaQueryWrapper = new LambdaQueryWrapper<>();
+				goodsTypeLambdaQueryWrapper.in(PjGoodsType::getId, stringList);
+				List<PjGoodsType> types = goodsDescType.list(goodsTypeLambdaQueryWrapper);
+				if (CollectionUtils.isNotEmpty(types)) {
+					List<String> typeStr = types.stream().map(PjGoodsType::getCname).collect(Collectors.toList());
+					item.setGoodsTypeName(typeStr.toString().replace("[", "").replace("]", ""));
+				}
 			}
+
 		}
 		return R.data(list);
 	}

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/order/controller/OrderController.java

@@ -114,7 +114,7 @@ public class OrderController extends BladeController {
 				PjOrder::getGoodsTotalShipAmount, PjOrder::getOutGoodsTotalShipNum, PjOrder::getOutGoodsTotalShipAmount,
 				PjOrder::getGoodsTotalShipNum, PjOrder::getSalesAmount, PjOrder::getRefno, PjOrder::getPrimaryGoodsTotalNum,
 				PjOrder::getPrimaryFundingAmount, PjOrder::getUseAdvanceChargeAmount, PjOrder::getProduceAdvanceChargeAmount,
-				PjOrder::getDeliveryBusinesDate, PjOrder::getSalesCompanyId)
+				PjOrder::getDeliveryBusinesDate, PjOrder::getSalesCompanyId, PjOrder::getBillType)
 			.eq(PjOrder::getTenantId, AuthUtil.getTenantId())
 			.eq(PjOrder::getIsDeleted, 0)
 			.eq(PjOrder::getBsType, order.getBsType())
@@ -462,6 +462,15 @@ public class OrderController extends BladeController {
 	@RepeatSubmit
 	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
 		List<Long> idList = Func.toLongList(ids);
+		List<PjOrder> orderList = orderService.list(new LambdaQueryWrapper<PjOrder>()
+			.eq(PjOrder::getTenantId, AuthUtil.getTenantId())
+			.eq(PjOrder::getIsDeleted, 0)
+			.in(PjOrder::getId, idList));
+		for (PjOrder item : orderList) {
+			if (1 == item.getBillType()) {
+				throw new RuntimeException("订单号：" + item.getOrdNo() + "为共享订单，删除失败");
+			}
+		}
 		List<PjShip> shipList = shipService.list(new LambdaQueryWrapper<PjShip>()
 			.in(PjShip::getOrdId, idList)
 			.eq(PjShip::getTenantId, AuthUtil.getTenantId())
@@ -666,7 +675,7 @@ public class OrderController extends BladeController {
 							}
 						}
 					}
-				}else{
+				} else {
 					if (!orderShareList.isEmpty()) {
 						PjOrder itemShare = orderShareList.stream().filter(i -> e.getSrcOrdNo().equals(i.getSrcOrdNo())).findFirst().orElse(null);
 						if (itemShare != null) {

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/order/service/impl/OrderServiceImpl.java

@@ -2288,7 +2288,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 		details.setOldTrxId("");
 		details.setPaymentAmountTl(new BigDecimal("0.00"));
 		details.setBusinesDate(null);
-		if ("XS".equals(detail.getBsType())) {
+		if ("XS".equals(detail.getBsType()) || "GX".equals(detail.getBsType())) {
 			details.setBsType("TKXS");
 		} else {
 			details.setBsType("TKCG");
@@ -4104,7 +4104,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 			shareSalesItems.setGrossProfit(item.getSubTotalMoney().subtract(item.getCostprie()));
 			shareSalesItems.setSharedCompanyId(Long.parseLong(order.getSharedCompanyId()));
 			shareSalesItems.setSharedCompanyName(order.getSharedCompanyName());
-			shareSalesItems.setSharedStatus("已派发");
+			shareSalesItems.setSharedStatus("已发货");
 			shareSalesItemsList.add(shareSalesItems);
 			item.setSendNum(item.getSendNum().add(item.getOutGoodsTotalShipNum()));
 			item.setGoodsTotalShipAmount(item.getOutGoodsTotalShipNum().multiply(item.getPrice()));
@@ -4134,7 +4134,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 			pjOrder.setGoodsTotalShipNum(sendNum);
 			pjOrder.setGoodsTotalShipAmount(goodsTotalShipAmount);
 			if (goodsNum.compareTo(sendNum) == 0) {
-				pjOrder.setStatus("已派发");
+				pjOrder.setStatus("已发货");
+				pjOrder.setXcxStatus("已发货");
+				pjOrder.setOriginalStatus("已发货");
 			} else {
 				pjOrder.setStatus("部分派发");
 			}
@@ -4367,9 +4369,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 		if (order == null) {
 			throw new RuntimeException("未查到单据信息");
 		}
-		if ("已发货".equals(order.getStatus())) {
-			throw new RuntimeException("单据已发货，撤销失败");
-		}
 		List<ShareSalesItems> shareSalesItemsList = shareSalesItemsService.list(new LambdaQueryWrapper<ShareSalesItems>()
 			.eq(ShareSalesItems::getTenantId, AuthUtil.getTenantId())
 			.eq(ShareSalesItems::getIsDeleted, 0)
@@ -4494,9 +4493,13 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 			order.setGoodsTotalShipAmount(goodsTotalShipAmount);
 			if (sendNum.compareTo(new BigDecimal("0.00")) == 0) {
 				order.setStatus("待确认");
+				order.setXcxStatus("待发货");
+				order.setOriginalStatus("");
 			} else {
 				if (goodsNum.compareTo(sendNum) == 0) {
-					order.setStatus("已派发");
+					order.setStatus("待确认");
+					order.setXcxStatus("待发货");
+					order.setOriginalStatus("");
 				} else {
 					order.setStatus("部分派发");
 				}
@@ -6091,7 +6094,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 			auditProecessDTO.setBillTime(declare.getCreateTime());//业务日期
 			auditProecessDTO.setCorpId(declare.getCustomerId());
 			if ("1".equals(status) && !pjOrderShareList.isEmpty()) {
-				pjOrderListNew.addAll(pjOrderShareList);
+				List<Long> ids = pjOrderListNew.stream().map(PjOrder::getId).collect(Collectors.toList());
+				for (PjOrder item : pjOrderShareList){
+					if (!ids.contains(item.getId())){
+						pjOrderListNew.add(item);
+					}
+				}
 				auditProecessDTO.setOrderQuantity(pjOrderListNew.stream().map(PjOrder::getGoodsTotalNum).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
 				auditProecessDTO.setAmount(pjOrderListNew.stream().map(PjOrder::getTotalMoney).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
 				auditProecessDTO.setGrossProfit(pjOrderListNew.stream().map(PjOrder::getGrossProfit).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
@@ -6124,7 +6132,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 		if (!pjOrderListNew.isEmpty()) {
 			this.updateBatchById(pjOrderListNew);
 		}
-//		baseMapper.updateById(declare);
 		return declare;
 	}
 
@@ -6222,8 +6229,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 			corpsDescMapper.updateById(corpsDesc);
 			if (!"TKXS".equals(order.getBsType())) {
 				if (OrderTypeEnum.SHIPED.getType().equals(order.getOriginalStatus())
-					|| OrderTypeEnum.RECEIVEDGOODS.getType().equals(order.getOriginalStatus())
-					|| "部分派发".equals(order.getOriginalStatus()) || "已派发".equals(order.getOriginalStatus())) {//已发货
+					|| OrderTypeEnum.RECEIVEDGOODS.getType().equals(order.getOriginalStatus())) {//已发货
 					if ("已取消".equals(order.getStatus())) {
 						throw new SecurityException("订单已审批通过请勿重复审批");
 					}
@@ -6269,26 +6275,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 						for (PjOrderItems e : list) {
 							e.setReturnsNumber(e.getGoodsNum());
 							e.setReturnsAmount(e.getTotalAmount());
-							/*if (ObjectUtils.isNull(e.getSendNum()) || e.getSendNum().compareTo(new BigDecimal("0.00")) == 0) {
-								continue;
-							} else {
-								//根据销售明细创建入库工单明细
-								PjShipItems shipItems = new PjShipItems();
-								BeanUtil.copyProperties(e, shipItems);
-								shipItems.setId(null);
-								shipItems.setPid(pjShip.getId());
-								shipItems.setSrcItemId(e.getId());
-								shipItems.setCreateTime(new Date());
-								shipItems.setCreateUser(AuthUtil.getUserId());
-								shipItems.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
-								shipItems.setSendNum(e.getSendNum());
-								shipItems.setTenantId(AuthUtil.getTenantId());
-								if (ObjectUtils.isNotNull(shipItems.getCostprie()) && new BigDecimal("0.00").compareTo(shipItems.getCostprie()) != 0) {
-									shipItems.setPrice(shipItems.getCostprie().divide(e.getGoodsNum(), MathContext.DECIMAL32));
-								}
-								shipItemsService.save(shipItems);
-								shipItemsList.add(shipItems);
-							}*/
 						}
 						for (PjOrderItems e : orderItemsList) {
 							//根据销售明细创建入库工单明细

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/productLaunch/service/impl/ProductLaunchServiceImpl.java

@@ -248,8 +248,6 @@ public class ProductLaunchServiceImpl extends ServiceImpl<ProductLaunchMapper, P
 			throw new SecurityException("导入数据不能为空");
 		}
 		List<PjProductLaunch> pjProductLaunchList = new ArrayList<>();
-		List<PjProductLaunch> launchList = new ArrayList<>();
-		List<PjProductLaunch> pjProductLaunchList1 = new ArrayList<>();
 		List<String> goodsNames = data.stream().map(ProductLaunchImportExcel::getCname).collect(Collectors.toList());
 		LambdaQueryWrapper<PjGoodsDesc> goodsDescLambdaQueryWrapper = new LambdaQueryWrapper<PjGoodsDesc>()
 			.eq(PjGoodsDesc::getIsDeleted, 0)
@@ -331,8 +329,8 @@ public class ProductLaunchServiceImpl extends ServiceImpl<ProductLaunchMapper, P
 				throw new RuntimeException("商品" + e.getCname() + "名称错误或商品不存在");
 			}
 			//获得所属公司
-			if (StringUtil.isNotBlank(e.getSalesCompanyName())) {
-				Dept dept = deptList.stream().filter(item -> item.getFullName().equals(productLaunch.getSalesCompanyName()))
+			if (StringUtil.isNotBlank(AuthUtil.getDeptId())) {
+				Dept dept = deptList.stream().filter(item -> item.getId().equals(Long.parseLong(AuthUtil.getDeptId())))
 					.findFirst().orElse(null);
 				if (dept != null) {
 					productLaunch.setSalesCompanyId(dept.getId());
@@ -356,90 +354,15 @@ public class ProductLaunchServiceImpl extends ServiceImpl<ProductLaunchMapper, P
 				productLaunch.setCreateUser(AuthUtil.getUserId());
 				productLaunch.setTenantId(AuthUtil.getTenantId());
 				productLaunch.setUpAndDownShelves(1);
-//				baseMapper.insert(productLaunch);
 			} else {
 				productLaunch.setId(one.getId());
 				productLaunch.setUpdateUser(AuthUtil.getUserId());
 				productLaunch.setUpdateTime(new Date());
 				productLaunch.setSharedCompany(one.getSharedCompany());
 				productLaunch.setVersion(one.getVersion());
-//				baseMapper.updateById(productLaunch);
-			}
-			//获得共享公司
-			if (!"1".equals(whetherIntegral)) {
-				if (StringUtil.isNotBlank(e.getSharedCompany())) {
-					List<Dept> dept = deptList.stream().filter(item -> productLaunch.getSharedCompany().contains(item.getId() + "")).collect(Collectors.toList());
-					productLaunch.setSharedCompany("");
-					for (Dept item : dept) {
-						productLaunch.setSharedCompany(productLaunch.getSharedCompany() + "," + item.getId());
-						PjProductLaunch launch = new PjProductLaunch();
-						BeanUtils.copyProperties(productLaunch, launch);
-						PjProductLaunch selOne = productLaunchList.stream().filter(i -> i.getBillType().equals(1) &&
-							i.getGoodsId().equals(productLaunch.getGoodsId()) && i.getSalesCompanyId().equals(item.getId()) &&
-							i.getSourceCompanyId().equals(productLaunch.getSalesCompanyId())).findFirst().orElse(null);
-						if (ObjectUtil.isEmpty(selOne)) {
-							launch.setId(null);
-							launch.setBillType(1);
-							launch.setWhetherShare(0);
-							launch.setUpAndDownShelves(0);
-							launch.setCreateUser(AuthUtil.getUserId());
-							launch.setCreateTime(new Date());
-							launch.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
-							launch.setSourceId(productLaunch.getId());
-							launch.setSourceCompanyId(productLaunch.getSalesCompanyId());
-							launch.setSourceCompanyName(productLaunch.getSalesCompanyName());
-							launch.setTenantId(AuthUtil.getTenantId());
-							launch.setSharedCompany(null);
-							launch.setSalesCompanyId(item.getId());
-							launch.setSalesCompanyName(item.getFullName());
-							launch.setVersion(0);
-//						baseMapper.insert(launch);
-							launchList.add(launch);
-						} else {
-							selOne.setInventory(productLaunch.getInventory());
-							selOne.setPriceOne(productLaunch.getPriceOne());
-							selOne.setPriceTwo(productLaunch.getPriceTwo());
-							selOne.setPriceThree(productLaunch.getPriceThree());
-							selOne.setPriceFour(productLaunch.getPriceFour());
-							selOne.setBrandItem(productLaunch.getBrandItem());
-							selOne.setPlaceProduction(productLaunch.getPlaceProduction());
-							selOne.setExplosionProof(productLaunch.getExplosionProof());
-							selOne.setOriginalFactory(productLaunch.getOriginalFactory());
-							selOne.setSelfRecovery(productLaunch.getSelfRecovery());
-							selOne.setUpdateTime(new Date());
-							selOne.setUpdateUser(AuthUtil.getUserId());
-							selOne.setWhetherShare(0);
-							selOne.setUpAndDownShelves(0);
-							selOne.setSharedCompany(null);
-							selOne.setVersion(selOne.getVersion());
-//						baseMapper.updateById(selOne);
-							launchList.add(selOne);
-						}
-					}
-					if (ObjectUtils.isNotNull(productLaunch.getSharedCompany()) && productLaunch.getSharedCompany().length() > 1) {
-						productLaunch.setSharedCompany(productLaunch.getSharedCompany().substring(1));
-					}
-					List<PjProductLaunch> list = productLaunchList.stream().filter(item -> item.getBillType().equals(1) &&
-							item.getGoodsId().equals(productLaunch.getGoodsId()) && item.getSourceCompanyId().equals(productLaunch.getSalesCompanyId()))
-						.collect(Collectors.toList());
-					if (ObjectUtil.isNotEmpty(list)) {
-						list.forEach(i -> {
-							i.setWhetherShare(1);
-							i.setPriceOne(productLaunch.getPriceOne());
-							i.setPriceTwo(productLaunch.getPriceTwo());
-							i.setPriceThree(productLaunch.getPriceThree());
-							i.setPriceFour(productLaunch.getPriceFour());
-							i.setVersion(i.getVersion());
-							pjProductLaunchList1.add(i);
-//						baseMapper.updateById(i);
-						});
-					}
-				}
 			}
 			pjProductLaunchList.add(productLaunch);
 		}
-		this.saveOrUpdateBatch(launchList);
-		this.updateBatchById(pjProductLaunchList1);
 		this.saveOrUpdateBatch(pjProductLaunchList);
 		List<PjProductLaunchFiles> filesList = new ArrayList<>();
 		for (PjProductLaunch item : pjProductLaunchList) {
@@ -981,8 +904,6 @@ public class ProductLaunchServiceImpl extends ServiceImpl<ProductLaunchMapper, P
 			throw new SecurityException("导入数据不能为空");
 		}
 		List<PjProductLaunch> pjProductLaunchList = new ArrayList<>();
-		List<PjProductLaunch> launchList = new ArrayList<>();
-		List<PjProductLaunch> pjProductLaunchList1 = new ArrayList<>();
 		List<String> goodsNames = data.stream().map(ProductLaunchImportCodeExcel::getCode).collect(Collectors.toList());
 		LambdaQueryWrapper<PjGoodsDesc> goodsDescLambdaQueryWrapper = new LambdaQueryWrapper<PjGoodsDesc>()
 			.eq(PjGoodsDesc::getIsDeleted, 0)
@@ -1066,8 +987,8 @@ public class ProductLaunchServiceImpl extends ServiceImpl<ProductLaunchMapper, P
 			}
 
 			//获得所属公司
-			if (StringUtil.isNotBlank(e.getSalesCompanyName())) {
-				Dept dept = deptList.stream().filter(item -> item.getFullName().equals(productLaunch.getSalesCompanyName()))
+			if (StringUtil.isNotBlank(AuthUtil.getDeptId())) {
+				Dept dept = deptList.stream().filter(item -> item.getId().equals(Long.parseLong(AuthUtil.getDeptId())))
 					.findFirst().orElse(null);
 				if (dept != null) {
 					productLaunch.setSalesCompanyId(dept.getId());
@@ -1091,90 +1012,15 @@ public class ProductLaunchServiceImpl extends ServiceImpl<ProductLaunchMapper, P
 				productLaunch.setCreateUser(AuthUtil.getUserId());
 				productLaunch.setTenantId(AuthUtil.getTenantId());
 				productLaunch.setUpAndDownShelves(1);
-//				baseMapper.insert(productLaunch);
 			} else {
 				productLaunch.setId(one.getId());
 				productLaunch.setUpdateUser(AuthUtil.getUserId());
 				productLaunch.setUpdateTime(new Date());
 				productLaunch.setSharedCompany(one.getSharedCompany());
 				productLaunch.setVersion(one.getVersion());
-//				baseMapper.updateById(productLaunch);
-			}
-			//获得共享公司
-			if (!"1".equals(whetherIntegral)) {
-				if (StringUtil.isNotBlank(e.getSharedCompany())) {
-					List<Dept> dept = deptList.stream().filter(item -> productLaunch.getSharedCompany().contains(item.getId() + "")).collect(Collectors.toList());
-					productLaunch.setSharedCompany("");
-					for (Dept item : dept) {
-						productLaunch.setSharedCompany(productLaunch.getSharedCompany() + "," + item.getId());
-						PjProductLaunch launch = new PjProductLaunch();
-						BeanUtils.copyProperties(productLaunch, launch);
-						PjProductLaunch selOne = productLaunchList.stream().filter(i -> i.getBillType().equals(1) &&
-							i.getGoodsId().equals(productLaunch.getGoodsId()) && i.getSalesCompanyId().equals(item.getId()) &&
-							i.getSourceCompanyId().equals(productLaunch.getSalesCompanyId())).findFirst().orElse(null);
-						if (ObjectUtil.isEmpty(selOne)) {
-							launch.setId(null);
-							launch.setBillType(1);
-							launch.setWhetherShare(0);
-							launch.setUpAndDownShelves(0);
-							launch.setCreateUser(AuthUtil.getUserId());
-							launch.setCreateTime(new Date());
-							launch.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
-							launch.setSourceId(productLaunch.getId());
-							launch.setSourceCompanyId(productLaunch.getSalesCompanyId());
-							launch.setSourceCompanyName(productLaunch.getSalesCompanyName());
-							launch.setTenantId(AuthUtil.getTenantId());
-							launch.setSharedCompany(null);
-							launch.setSalesCompanyId(item.getId());
-							launch.setSalesCompanyName(item.getFullName());
-							launch.setVersion(0);
-//						baseMapper.insert(launch);
-							launchList.add(launch);
-						} else {
-							selOne.setInventory(productLaunch.getInventory());
-							selOne.setPriceOne(productLaunch.getPriceOne());
-							selOne.setPriceTwo(productLaunch.getPriceTwo());
-							selOne.setPriceThree(productLaunch.getPriceThree());
-							selOne.setPriceFour(productLaunch.getPriceFour());
-							selOne.setBrandItem(productLaunch.getBrandItem());
-							selOne.setPlaceProduction(productLaunch.getPlaceProduction());
-							selOne.setExplosionProof(productLaunch.getExplosionProof());
-							selOne.setOriginalFactory(productLaunch.getOriginalFactory());
-							selOne.setSelfRecovery(productLaunch.getSelfRecovery());
-							selOne.setUpdateTime(new Date());
-							selOne.setUpdateUser(AuthUtil.getUserId());
-							selOne.setWhetherShare(0);
-							selOne.setUpAndDownShelves(0);
-							selOne.setSharedCompany(null);
-							selOne.setVersion(selOne.getVersion());
-//						baseMapper.updateById(selOne);
-							launchList.add(selOne);
-						}
-					}
-					if (ObjectUtils.isNotNull(productLaunch.getSharedCompany()) && productLaunch.getSharedCompany().length() > 1) {
-						productLaunch.setSharedCompany(productLaunch.getSharedCompany().substring(1, productLaunch.getSharedCompany().length()));
-					}
-					List<PjProductLaunch> list = productLaunchList.stream().filter(item -> item.getBillType().equals(1) &&
-							item.getGoodsId().equals(productLaunch.getGoodsId()) && item.getSourceCompanyId().equals(productLaunch.getSalesCompanyId()))
-						.collect(Collectors.toList());
-					if (ObjectUtil.isNotEmpty(list)) {
-						list.forEach(i -> {
-							i.setWhetherShare(1);
-							i.setPriceOne(productLaunch.getPriceOne());
-							i.setPriceTwo(productLaunch.getPriceTwo());
-							i.setPriceThree(productLaunch.getPriceThree());
-							i.setPriceFour(productLaunch.getPriceFour());
-							i.setVersion(i.getVersion());
-							pjProductLaunchList1.add(i);
-//						baseMapper.updateById(i);
-						});
-					}
-				}
 			}
 			pjProductLaunchList.add(productLaunch);
 		}
-		this.saveOrUpdateBatch(launchList);
-		this.updateBatchById(pjProductLaunchList1);
 		this.saveOrUpdateBatch(pjProductLaunchList);
 		List<PjProductLaunchFiles> filesList = new ArrayList<>();
 		for (PjProductLaunch item : pjProductLaunchList) {

blade-service/blade-sales-part/src/main/resources/log/logback-dev.xml

@@ -58,56 +58,56 @@
     </if>
 
     <!-- 日志输出级别 -->
-    <root level="ERROR">
+    <root level="info">
         <appender-ref ref="STDOUT"/>
         <appender-ref ref="${STDOUT_APPENDER}"/>
     </root>
 
-    <logger name="net.sf.ehcache" level="ERROR"/>
-    <logger name="druid.sql" level="ERROR"/>
+    <logger name="net.sf.ehcache" level="info"/>
+    <logger name="druid.sql" level="info"/>
 
 
     <!-- MyBatis log configure -->
-    <logger name="com.apache.ibatis" level="ERROR"/>
-    <logger name="org.mybatis.spring" level="ERROR"/>
-    <logger name="java.sql.Connection" level="ERROR"/>
-    <logger name="java.sql.Statement" level="ERROR"/>
-    <logger name="java.sql.PreparedStatement" level="ERROR"/>
+    <logger name="com.apache.ibatis" level="info"/>
+    <logger name="org.mybatis.spring" level="info"/>
+    <logger name="java.sql.Connection" level="info"/>
+    <logger name="java.sql.Statement" level="info"/>
+    <logger name="java.sql.PreparedStatement" level="info"/>
 
     <!-- 减少部分debug日志 -->
-    <logger name="druid.sql" level="ERROR"/>
-    <logger name="org.apache.shiro" level="ERROR"/>
-    <logger name="org.mybatis.spring" level="ERROR"/>
-    <logger name="org.springframework" level="ERROR"/>
-    <logger name="org.springframework.context" level="ERROR"/>
-    <logger name="org.springframework.beans" level="ERROR"/>
-    <logger name="com.baomidou.mybatisplus" level="ERROR"/>
-    <logger name="org.apache.ibatis.io" level="ERROR"/>
-    <logger name="org.apache.velocity" level="ERROR"/>
-    <logger name="org.eclipse.jetty" level="ERROR"/>
-    <logger name="io.undertow" level="ERROR"/>
-    <logger name="org.xnio.nio" level="ERROR"/>
-    <logger name="org.thymeleaf" level="ERROR"/>
-    <logger name="springfox.documentation" level="ERROR"/>
-    <logger name="org.hibernate.validator" level="ERROR"/>
-    <logger name="com.netflix.loadbalancer" level="ERROR"/>
-    <logger name="com.netflix.hystrix" level="ERROR"/>
-    <logger name="com.netflix.zuul" level="ERROR"/>
-    <logger name="de.codecentric" level="ERROR"/>
-    <!-- cache ERROR -->
-    <logger name="net.sf.ehcache" level="ERROR"/>
-    <logger name="org.springframework.cache" level="ERROR"/>
+    <logger name="druid.sql" level="info"/>
+    <logger name="org.apache.shiro" level="info"/>
+    <logger name="org.mybatis.spring" level="info"/>
+    <logger name="org.springframework" level="info"/>
+    <logger name="org.springframework.context" level="info"/>
+    <logger name="org.springframework.beans" level="info"/>
+    <logger name="com.baomidou.mybatisplus" level="info"/>
+    <logger name="org.apache.ibatis.io" level="info"/>
+    <logger name="org.apache.velocity" level="info"/>
+    <logger name="org.eclipse.jetty" level="info"/>
+    <logger name="io.undertow" level="info"/>
+    <logger name="org.xnio.nio" level="info"/>
+    <logger name="org.thymeleaf" level="info"/>
+    <logger name="springfox.documentation" level="info"/>
+    <logger name="org.hibernate.validator" level="info"/>
+    <logger name="com.netflix.loadbalancer" level="info"/>
+    <logger name="com.netflix.hystrix" level="info"/>
+    <logger name="com.netflix.zuul" level="info"/>
+    <logger name="de.codecentric" level="info"/>
+    <!-- cache info -->
+    <logger name="net.sf.ehcache" level="info"/>
+    <logger name="org.springframework.cache" level="info"/>
     <!-- cloud -->
-    <logger name="org.apache.http" level="ERROR"/>
-    <logger name="com.netflix.discovery" level="ERROR"/>
-    <logger name="com.netflix.eureka" level="ERROR"/>
+    <logger name="org.apache.http" level="info"/>
+    <logger name="com.netflix.discovery" level="info"/>
+    <logger name="com.netflix.eureka" level="info"/>
     <!-- 业务日志 -->
-    <Logger name="org.springblade" level="ERROR"/>
-    <Logger name="org.springblade.core.tenant" level="ERROR"/>
-    <Logger name="org.springblade.core.version" level="ERROR"/>
+    <Logger name="org.springblade" level="info"/>
+    <Logger name="org.springblade.core.tenant" level="info"/>
+    <Logger name="org.springblade.core.version" level="info"/>
 
     <!-- 减少nacos日志 -->
-    <logger name="com.alibaba.nacos" level="ERROR"/>
+    <logger name="com.alibaba.nacos" level="info"/>
 
 
 </configuration>