2025年2月10日17:00:04

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

@@ -31,21 +31,6 @@ public class ShareTheNextDayDataExcel implements Serializable {
 	@ExcelProperty(value = "名称")
 	private String goodsName;
 	/**
-	 * 规格型号
-	 */
-	@ExcelProperty(value = "规格型号")
-	private String specificationAndModel;
-	/**
-	 * 品牌名称
-	 */
-	@ExcelProperty(value = "品牌名称")
-	private String brandName;
-	/**
-	 * 花纹
-	 */
-	@ExcelProperty(value = "花纹")
-	private String brandItem;
-	/**
 	 * 共享成本
 	 */
 	@ExcelProperty(value = "共享成本")
@@ -75,6 +60,22 @@ public class ShareTheNextDayDataExcel implements Serializable {
 	 */
 	@ExcelProperty(value = "来源共享公司名称")
 	private String srcSalesCompanyName;
+	/**
+	 * 规格型号
+	 */
+	@ExcelProperty(value = "规格型号")
+	private String specificationAndModel;
+	/**
+	 * 品牌名称
+	 */
+	@ExcelProperty(value = "品牌名称")
+	private String brandName;
+	/**
+	 * 花纹
+	 */
+	@ExcelProperty(value = "花纹")
+	private String brandItem;
+
 
 	/**
 	 * 来源共享公司主键

blade-service/blade-pay/src/main/java/org/springblade/pay/tonglianPayment/service/impl/PaymentServiceImpl.java

@@ -523,10 +523,16 @@ public class PaymentServiceImpl implements IPaymentService {
 										sendMessage.setTenantId(parametersDetails.getTenantId());
 										sendMessage.setCreateUser(null);
 										sendMessage.setCreateTime(new Date());
-										sendMessage.setUrl("/tirePartsMall/salesManagement/saleOrder/index");
 										sendMessage.setPageLabel("销售订单");
-										sendMessage.setPageStatus("this.$store.getters.domSaleStatus");
-										sendMessage.setMessageBody("您有新的外部销售订单请及时处理！单号：" + selectOrder.getOrdNo() + "时间：" + formatted);
+										if("GX".equals(selectOrder.getBsType())){
+											sendMessage.setUrl("/tirePartsMall/basicData/sharedSales/index");
+											sendMessage.setPageStatus("this.$store.getters.domSaleStatus");
+											sendMessage.setMessageBody("您有新的共享销售订单请及时处理！单号：" + selectOrder.getOrdNo() + "时间：" + formatted);
+										}else{
+											sendMessage.setUrl("/tirePartsMall/salesManagement/saleOrder/index");
+											sendMessage.setPageStatus("this.$store.getters.domSaleStatus");
+											sendMessage.setMessageBody("您有新的外部销售订单请及时处理！单号：" + selectOrder.getOrdNo() + "时间：" + formatted);
+										}
 										R save = messageClient.save(sendMessage);
 										System.out.println("发送结果:" + save);
 										if (!save.isSuccess()) {
@@ -546,10 +552,16 @@ public class PaymentServiceImpl implements IPaymentService {
 								sendMessage.setTenantId(parametersDetails.getTenantId());
 								sendMessage.setCreateUser(null);
 								sendMessage.setCreateTime(new Date());
-								sendMessage.setUrl("/tirePartsMall/salesManagement/saleOrder/index");
 								sendMessage.setPageLabel("销售订单");
-								sendMessage.setPageStatus("this.$store.getters.domSaleStatus");
-								sendMessage.setMessageBody("您有新的外部销售订单请及时处理！单号：" + selectOrder.getOrdNo() + "时间：" + formatted);
+								if("GX".equals(selectOrder.getBsType())){
+									sendMessage.setUrl("/tirePartsMall/basicData/sharedSales/index");
+									sendMessage.setPageStatus("this.$store.getters.domSaleStatus");
+									sendMessage.setMessageBody("您有新的共享销售订单请及时处理！单号：" + selectOrder.getOrdNo() + "时间：" + formatted);
+								}else{
+									sendMessage.setUrl("/tirePartsMall/salesManagement/saleOrder/index");
+									sendMessage.setPageStatus("this.$store.getters.domSaleStatus");
+									sendMessage.setMessageBody("您有新的外部销售订单请及时处理！单号：" + selectOrder.getOrdNo() + "时间：" + formatted);
+								}
 								R save = messageClient.save(sendMessage);
 								System.out.println("发送结果:" + save);
 								if (!save.isSuccess()) {

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/corps/fegin/PJCorprClient.java

@@ -118,7 +118,7 @@ public class PJCorprClient implements IPJCorpClient {
 						for (PjOrderItems e : list) {
 							if (!pjGoodsDescList.isEmpty()) {
 								PjGoodsDesc goodsDesc = pjGoodsDescList.stream().filter(item -> item.getId().equals(e.getGoodsId())).findFirst().orElse(null);
-								if (goodsDesc != null) {
+								if (goodsDesc != null && new BigDecimal("0.00").compareTo(goodsDesc.getIntegral()) != 0) {
 									goodsIds.add(goodsDesc.getId());
 									integral= integral.add(goodsDesc.getIntegral().multiply(e.getGoodsNum()));
 									//客户门店积分
@@ -127,27 +127,29 @@ public class PJCorprClient implements IPJCorpClient {
 							}
 						}
 						System.out.println("=========积分处理完成数据==========");
-						corpsDescMapper.updateByIdPointsBalance(corpsDesc);
-						PjIntegralDetail integralDetail = new PjIntegralDetail();
-						integralDetail.setCreateTime(new Date());
-						integralDetail.setCreateUserName(order.getCreateUserName());
-						integralDetail.setCreateUser(order.getCreateUser());
-						integralDetail.setTenantId(tenantId);
-						integralDetail.setType("购买获取");
-						integralDetail.setSrcId(order.getId());
-						integralDetail.setSrcNo(order.getOrdNo());
-						integralDetail.setCorpId(order.getCustomerId());
-						integralDetail.setCorpName(order.getCustomerName());
-						integralDetail.setIntegral(integral);
-						integralDetail.setGoodsName(order.getGoodsNameJoin());
-						StringBuilder goodsId = new StringBuilder();
-						for (Long item : goodsIds) {
-							goodsId.append(item).append(",");
-						}
-						if (goodsId.length() > 0) {
-							integralDetail.setGoodsId(goodsId.substring(0, goodsId.length() - 1));
+						if (new BigDecimal("0.00").compareTo(integral) != 0){
+							corpsDescMapper.updateByIdPointsBalance(corpsDesc);
+							PjIntegralDetail integralDetail = new PjIntegralDetail();
+							integralDetail.setCreateTime(new Date());
+							integralDetail.setCreateUserName(order.getCreateUserName());
+							integralDetail.setCreateUser(order.getCreateUser());
+							integralDetail.setTenantId(tenantId);
+							integralDetail.setType("购买获取");
+							integralDetail.setSrcId(order.getId());
+							integralDetail.setSrcNo(order.getOrdNo());
+							integralDetail.setCorpId(order.getCustomerId());
+							integralDetail.setCorpName(order.getCustomerName());
+							integralDetail.setIntegral(integral);
+							integralDetail.setGoodsName(order.getGoodsNameJoin());
+							StringBuilder goodsId = new StringBuilder();
+							for (Long item : goodsIds) {
+								goodsId.append(item).append(",");
+							}
+							if (goodsId.length() > 0) {
+								integralDetail.setGoodsId(goodsId.substring(0, goodsId.length() - 1));
+							}
+							integralDetailList.add(integralDetail);
 						}
-						integralDetailList.add(integralDetail);
 					} else {
 						System.out.println("=========循环未找到明细数据==========");
 					}
@@ -222,7 +224,7 @@ public class PJCorprClient implements IPJCorpClient {
 						for (PjOrderItems e : list) {
 							if (!pjGoodsDescList.isEmpty()) {
 								PjGoodsDesc goodsDesc = pjGoodsDescList.stream().filter(item -> item.getId().equals(e.getGoodsId())).findFirst().orElse(null);
-								if (goodsDesc != null) {
+								if (goodsDesc != null&& new BigDecimal("0.00").compareTo(goodsDesc.getIntegral()) != 0) {
 									integral= integral.add(goodsDesc.getIntegral().multiply(e.getGoodsNum()));
 									goodsIds.add(goodsDesc.getId());
 									//客户门店积分
@@ -231,27 +233,29 @@ public class PJCorprClient implements IPJCorpClient {
 							}
 						}
 						System.out.println("=========积分处理完成数据==========");
-						corpsDescMapper.updateByIdPointsBalance(corpsDesc);
-						PjIntegralDetail integralDetail = new PjIntegralDetail();
-						integralDetail.setCreateTime(new Date());
-						integralDetail.setCreateUserName(order.getCreateUserName());
-						integralDetail.setCreateUser(order.getCreateUser());
-						integralDetail.setTenantId(tenantId);
-						integralDetail.setType("积分退回");
-						integralDetail.setSrcId(order.getId());
-						integralDetail.setSrcNo(order.getOrdNo());
-						integralDetail.setCorpId(order.getCustomerId());
-						integralDetail.setCorpName(order.getCustomerName());
-						integralDetail.setIntegral(integral);
-						integralDetail.setGoodsName(order.getGoodsNameJoin());
-						StringBuilder goodsId = new StringBuilder();
-						for (Long item : goodsIds) {
-							goodsId.append(item).append(",");
-						}
-						if (goodsId.length() > 0) {
-							integralDetail.setGoodsId(goodsId.substring(0, goodsId.length() - 1));
+						if (new BigDecimal("0.00").compareTo(integral) != 0){
+							corpsDescMapper.updateByIdPointsBalance(corpsDesc);
+							PjIntegralDetail integralDetail = new PjIntegralDetail();
+							integralDetail.setCreateTime(new Date());
+							integralDetail.setCreateUserName(order.getCreateUserName());
+							integralDetail.setCreateUser(order.getCreateUser());
+							integralDetail.setTenantId(tenantId);
+							integralDetail.setType("积分退回");
+							integralDetail.setSrcId(order.getId());
+							integralDetail.setSrcNo(order.getOrdNo());
+							integralDetail.setCorpId(order.getCustomerId());
+							integralDetail.setCorpName(order.getCustomerName());
+							integralDetail.setIntegral(integral);
+							integralDetail.setGoodsName(order.getGoodsNameJoin());
+							StringBuilder goodsId = new StringBuilder();
+							for (Long item : goodsIds) {
+								goodsId.append(item).append(",");
+							}
+							if (goodsId.length() > 0) {
+								integralDetail.setGoodsId(goodsId.substring(0, goodsId.length() - 1));
+							}
+							integralDetailList.add(integralDetail);
 						}
-						integralDetailList.add(integralDetail);
 					} else {
 						System.out.println("=========循环未找到明细数据==========");
 					}

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::getBillType)
+				PjOrder::getDeliveryBusinesDate, PjOrder::getSalesCompanyId, PjOrder::getBillType,PjOrder::getRemarks)
 			.eq(PjOrder::getTenantId, AuthUtil.getTenantId())
 			.eq(PjOrder::getIsDeleted, 0)
 			.eq(PjOrder::getBsType, order.getBsType())

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

@@ -6170,17 +6170,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 			if (corpsDesc == null) {
 				throw new RuntimeException("未查到客户信息");
 			}
-			PjCorpsDesc reference = null;
-			if (ObjectUtils.isNotNull(corpsDesc.getReferenceId())) {
-				reference = corpsDescMapper.selectById(corpsDesc.getReferenceId());
-			}
-			User user = null;
-			if (ObjectUtils.isNotNull(corpsDesc.getSalesmanId())) {
-				R<User> r = userClient.userInfoById(corpsDesc.getSalesmanId());
-				if (r.isSuccess()) {
-					user = r.getData();
-				}
-			}
 			List<Long> orderList = orderListNew.stream().map(PjOrder::getId).collect(Collectors.toList());
 			//根据主表id获得明细数据
 			List<PjOrderItems> list = orderItemsService.list(new QueryWrapper<PjOrderItems>()
@@ -6193,40 +6182,36 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 				.eq(PjGoodsDesc::getIsDeleted, 0)
 				.eq(PjGoodsDesc::getEnableOrNot, 0)
 				.in(PjGoodsDesc::getId, goodsIds));
+			BigDecimal integral = new BigDecimal("0.00");
 			for (PjOrderItems e : list) {
 				PjGoodsDesc goodsDesc = pjGoodsDescList.stream().filter(item -> item.getId().equals(e.getGoodsId())).findFirst().orElse(null);
-				if (goodsDesc != null) {
-					if ("1".equals(order.getWhetherIntegral())) {
-						if (user != null && ObjectUtils.isNotNull(goodsDesc.getSalesmanIntegral())) {
-							user.setPointsBalance(user.getPointsBalance().add(goodsDesc.getSalesmanIntegral().multiply(e.getGoodsNum())));
-						}
-						//推荐人积分
-						if (reference != null && ObjectUtils.isNotNull(goodsDesc.getReferenceIntegral())) {
-							reference.setPointsBalance(reference.getPointsBalance().add(goodsDesc.getReferenceIntegral().multiply(e.getGoodsNum())));
-						}
-						//客户门店积分
-						corpsDesc.setPointsBalance(corpsDesc.getPointsBalance().add(goodsDesc.getIntegral().multiply(e.getGoodsNum())));
-					} else {
-						//业务员积分
-						if (user != null && ObjectUtils.isNotNull(goodsDesc.getSalesmanIntegral())) {
-							user.setPointsBalance(user.getPointsBalance().subtract(goodsDesc.getSalesmanIntegral().multiply(e.getGoodsNum())));
-						}
-						//推荐人积分
-						if (reference != null && ObjectUtils.isNotNull(goodsDesc.getReferenceIntegral())) {
-							reference.setPointsBalance(reference.getPointsBalance().subtract(goodsDesc.getReferenceIntegral().multiply(e.getGoodsNum())));
-						}
-						//客户门店积分
-						corpsDesc.setPointsBalance(corpsDesc.getPointsBalance().subtract(goodsDesc.getIntegral().multiply(e.getGoodsNum())));
-					}
+				if (goodsDesc != null&& new BigDecimal("0.00").compareTo(goodsDesc.getIntegral()) != 0) {
+					integral= integral.add(goodsDesc.getIntegral().multiply(e.getGoodsNum()));
+					corpsDesc.setPointsBalance(corpsDesc.getPointsBalance().subtract(goodsDesc.getIntegral().multiply(e.getGoodsNum())));
 				}
 			}
-			if (reference != null) {
-				corpsDescMapper.updateById(reference);
-			}
-			if (user != null) {
-				userClient.updateUser(user);
+			if (new BigDecimal("0.00").compareTo(integral) != 0){
+				PjIntegralDetail integralDetail = new PjIntegralDetail();
+				integralDetail.setCreateTime(new Date());
+				integralDetail.setCreateUserName(AuthUtil.getUserName());
+				integralDetail.setCreateUser(AuthUtil.getUserId());
+				integralDetail.setType("积分退回");
+				integralDetail.setSrcId(order.getId());
+				integralDetail.setSrcNo(order.getOrdNo());
+				integralDetail.setCorpId(order.getCustomerId());
+				integralDetail.setCorpName(order.getCustomerName());
+				integralDetail.setIntegral(integral);
+				integralDetail.setGoodsName(order.getGoodsNameJoin());
+				StringBuilder goodsId = new StringBuilder();
+				for (Long item : goodsIds) {
+					goodsId.append(item).append(",");
+				}
+				if (goodsId.length() > 0) {
+					integralDetail.setGoodsId(goodsId.substring(0, goodsId.length() - 1));
+				}
+				integralDetailService.saveOrUpdate(integralDetail);
+				corpsDescMapper.updateById(corpsDesc);
 			}
-			corpsDescMapper.updateById(corpsDesc);
 			if (!"TKXS".equals(order.getBsType())) {
 				if (OrderTypeEnum.SHIPED.getType().equals(order.getOriginalStatus())
 					|| OrderTypeEnum.RECEIVEDGOODS.getType().equals(order.getOriginalStatus())) {//已发货
@@ -6391,8 +6376,10 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 				}
 				orderItemsService.updateBatchById(list);
 			}
-			corpsDesc.setLimitAmount(corpsDesc.getLimitAmount().add(order.getTotalMoney()));
-			corpsDescMapper.updateById(corpsDesc);
+			if ("额度支付".equals(order.getBusinessSource())){
+				corpsDesc.setLimitAmount(corpsDesc.getLimitAmount().add(order.getTotalMoney()));
+				corpsDescMapper.updateById(corpsDesc);
+			}
 			if (ObjectUtils.isNull(order.getOldTrxId())) {
 				if ("TKXS".equals(order.getBsType())) {
 					order.setStatus("待确认");
@@ -6438,25 +6425,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 					} else {
 						throw new RuntimeException("退款失败！服务器错误");
 					}
-					PjIntegralDetail integralDetail = new PjIntegralDetail();
-					integralDetail.setCreateTime(new Date());
-					integralDetail.setCreateUserName(AuthUtil.getUserName());
-					integralDetail.setCreateUser(AuthUtil.getUserId());
-					integralDetail.setType("积分退回");
-					integralDetail.setSrcId(order.getId());
-					integralDetail.setSrcNo(order.getOrdNo());
-					integralDetail.setCorpId(order.getCustomerId());
-					integralDetail.setCorpName(order.getCustomerName());
-					integralDetail.setIntegral(amount);
-					integralDetail.setGoodsName(order.getGoodsNameJoin());
-					StringBuilder goodsId = new StringBuilder();
-					for (Long item : goodsIds) {
-						goodsId.append(item).append(",");
-					}
-					if (goodsId.length() > 0) {
-						integralDetail.setGoodsId(goodsId.substring(0, goodsId.length() - 1));
-					}
-					integralDetailService.saveOrUpdate(integralDetail);
 				}
 			}
 		} else {

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/ship/service/impl/ShipServiceImpl.java

@@ -5056,9 +5056,9 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
 					stockDesc.setBalanceQuantity(item.getSendNum());
 					stockDesc.setBalanceQuantityHave(item.getSendNum());
 					stockDesc.setStoreInventory(item.getSendNum());
-					stockDesc.setInventoryAmount(item.getSendNum().multiply(item.getPrice()));
+					stockDesc.setInventoryAmount(item.getSendNum().multiply(item.getCostpriePrice()));
 					stockDesc.setRebateInventoryAmount(item.getSendNum().multiply(item.getRebatePrice()));
-					stockDesc.setInventoryCostPrice(item.getPrice());
+					stockDesc.setInventoryCostPrice(item.getCostpriePrice());
 					stockDesc.setRebatePrice(item.getRebatePrice());
 					/*if (stockDesc.getBalanceQuantity().compareTo(new BigDecimal("0")) != 0) {
 						stockDesc.setInventoryCostPrice(stockDesc.getInventoryAmount().divide(stockDesc.getBalanceQuantity(), MathContext.DECIMAL32).setScale(2, RoundingMode.HALF_UP));

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/shopping/controller/ShoppingMallDetailController.java

@@ -338,10 +338,55 @@ public class ShoppingMallDetailController extends BladeController {
 					.in("pid", brandIds).eq("is_deleted", 0));
 			}
 			for (ShoppingMallDetail item : mallDetails) {
-				if (!pjProductLaunchFilesList.isEmpty()) {
-					List<PjProductLaunchFiles> list = pjProductLaunchFilesList.stream().filter(e -> e.getPid().equals(item.getId())).collect(Collectors.toList());
-					if (!list.isEmpty()) {
-						item.setFilesList(list);
+				if (ObjectUtils.isNotNull(item.getUrl())){
+					List<PjProductLaunchFiles> filesList = new ArrayList<>();
+					PjProductLaunchFiles files = new PjProductLaunchFiles();
+					files.setUrl(item.getUrl());
+					files.setVersion("0");
+					filesList.add(files);
+					item.setFilesList(filesList);
+				}else{
+					if (!pjProductLaunchFilesList.isEmpty()) {
+						List<PjProductLaunchFiles> list = pjProductLaunchFilesList.stream().filter(e -> e.getPid().equals(item.getId())).collect(Collectors.toList());
+						if (!list.isEmpty()) {
+							item.setFilesList(list);
+						} else {
+							if (ObjectUtils.isNotNull(item.getBrandId())) {
+								if (!brandFigureList.isEmpty()) {
+									List<BrandFigure> brandFigureList1 = brandFigureList.stream()
+										.filter(e -> e.getPid().equals(item.getBrandId()) && e.getFigure().equals(item.getBrandItem()))
+										.collect(Collectors.toList());
+									if (!brandFigureList1.isEmpty()) {
+										item.setFilesList(BeanUtil.copy(brandFigureList1, PjProductLaunchFiles.class));
+									} else {
+										if (!pjBrandFilesList.isEmpty()) {
+											List<PjBrandFiles> pjBarndFilesList1 = pjBrandFilesList.stream()
+												.filter(e -> e.getPid().equals(item.getBrandId()))
+												.collect(Collectors.toList());
+											if (!pjBarndFilesList1.isEmpty()) {
+												item.setFilesList(BeanUtil.copy(pjBarndFilesList1, PjProductLaunchFiles.class));
+											}
+										}
+									}
+								} else {
+									if (!pjBrandFilesList.isEmpty()) {
+										List<PjBrandFiles> pjBarndFilesList1 = pjBrandFilesList.stream()
+											.filter(e -> e.getPid().equals(item.getBrandId()))
+											.collect(Collectors.toList());
+										if (!pjBarndFilesList1.isEmpty()) {
+											item.setFilesList(BeanUtil.copy(pjBarndFilesList1, PjProductLaunchFiles.class));
+										}
+									} else {
+										List<PjProductLaunchFiles> filesList = new ArrayList<>();
+										PjProductLaunchFiles files = new PjProductLaunchFiles();
+										files.setUrl(item.getUrl());
+										files.setVersion("0");
+										filesList.add(files);
+										item.setFilesList(filesList);
+									}
+								}
+							}
+						}
 					} else {
 						if (ObjectUtils.isNotNull(item.getBrandId())) {
 							if (!brandFigureList.isEmpty()) {
@@ -368,7 +413,7 @@ public class ShoppingMallDetailController extends BladeController {
 									if (!pjBarndFilesList1.isEmpty()) {
 										item.setFilesList(BeanUtil.copy(pjBarndFilesList1, PjProductLaunchFiles.class));
 									}
-								} else {
+								}else {
 									List<PjProductLaunchFiles> filesList = new ArrayList<>();
 									PjProductLaunchFiles files = new PjProductLaunchFiles();
 									files.setUrl(item.getUrl());
@@ -379,42 +424,6 @@ public class ShoppingMallDetailController extends BladeController {
 							}
 						}
 					}
-				} else {
-					if (ObjectUtils.isNotNull(item.getBrandId())) {
-						if (!brandFigureList.isEmpty()) {
-							List<BrandFigure> brandFigureList1 = brandFigureList.stream()
-								.filter(e -> e.getPid().equals(item.getBrandId()) && e.getFigure().equals(item.getBrandItem()))
-								.collect(Collectors.toList());
-							if (!brandFigureList1.isEmpty()) {
-								item.setFilesList(BeanUtil.copy(brandFigureList1, PjProductLaunchFiles.class));
-							} else {
-								if (!pjBrandFilesList.isEmpty()) {
-									List<PjBrandFiles> pjBarndFilesList1 = pjBrandFilesList.stream()
-										.filter(e -> e.getPid().equals(item.getBrandId()))
-										.collect(Collectors.toList());
-									if (!pjBarndFilesList1.isEmpty()) {
-										item.setFilesList(BeanUtil.copy(pjBarndFilesList1, PjProductLaunchFiles.class));
-									}
-								}
-							}
-						} else {
-							if (!pjBrandFilesList.isEmpty()) {
-								List<PjBrandFiles> pjBarndFilesList1 = pjBrandFilesList.stream()
-									.filter(e -> e.getPid().equals(item.getBrandId()))
-									.collect(Collectors.toList());
-								if (!pjBarndFilesList1.isEmpty()) {
-									item.setFilesList(BeanUtil.copy(pjBarndFilesList1, PjProductLaunchFiles.class));
-								}
-							}else {
-								List<PjProductLaunchFiles> filesList = new ArrayList<>();
-								PjProductLaunchFiles files = new PjProductLaunchFiles();
-								files.setUrl(item.getUrl());
-								files.setVersion("0");
-								filesList.add(files);
-								item.setFilesList(filesList);
-							}
-						}
-					}
 				}
 			}
 			pages.setRecords(mallDetails);

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/shopping/service/impl/ShoppingMallDetailServiceImpl.java

@@ -96,10 +96,55 @@ public class ShoppingMallDetailServiceImpl extends ServiceImpl<ShoppingMallDetai
 		List<BrandFigure> brandFigureList = brandFigureService.list(new QueryWrapper<BrandFigure>()
 			.in("pid", detail.getBrandId()).eq("is_deleted", 0));
 		//获得附件
-		if (!pjProductLaunchFilesList.isEmpty()) {
-			List<PjProductLaunchFiles> list = pjProductLaunchFilesList.stream().filter(e -> e.getPid().equals(detail.getId())).collect(Collectors.toList());
-			if (!list.isEmpty()) {
-				detail.setFilesList(list);
+		if (ObjectUtils.isNotNull(detail.getUrl())){
+			List<PjProductLaunchFiles> filesList = new ArrayList<>();
+			PjProductLaunchFiles files = new PjProductLaunchFiles();
+			files.setUrl(detail.getUrl());
+			files.setVersion("0");
+			filesList.add(files);
+			detail.setFilesList(filesList);
+		}else{
+			if (!pjProductLaunchFilesList.isEmpty()) {
+				List<PjProductLaunchFiles> list = pjProductLaunchFilesList.stream().filter(e -> e.getPid().equals(detail.getId())).collect(Collectors.toList());
+				if (!list.isEmpty()) {
+					detail.setFilesList(list);
+				} else {
+					if (ObjectUtils.isNotNull(detail.getBrandId())) {
+						if (!brandFigureList.isEmpty()) {
+							List<BrandFigure> brandFigureList1 = brandFigureList.stream()
+								.filter(e -> e.getPid().equals(detail.getBrandId()) && e.getFigure().equals(detail.getBrandItem()))
+								.collect(Collectors.toList());
+							if (!brandFigureList1.isEmpty()) {
+								detail.setFilesList(BeanUtil.copy(brandFigureList1, PjProductLaunchFiles.class));
+							} else {
+								if (!pjBrandFilesList.isEmpty()) {
+									List<PjBrandFiles> pjBarndFilesList1 = pjBrandFilesList.stream()
+										.filter(e -> e.getPid().equals(detail.getBrandId()))
+										.collect(Collectors.toList());
+									if (!pjBarndFilesList1.isEmpty()) {
+										detail.setFilesList(BeanUtil.copy(pjBarndFilesList1, PjProductLaunchFiles.class));
+									}
+								}
+							}
+						} else {
+							if (!pjBrandFilesList.isEmpty()) {
+								List<PjBrandFiles> pjBarndFilesList1 = pjBrandFilesList.stream()
+									.filter(e -> e.getPid().equals(detail.getBrandId()))
+									.collect(Collectors.toList());
+								if (!pjBarndFilesList1.isEmpty()) {
+									detail.setFilesList(BeanUtil.copy(pjBarndFilesList1, PjProductLaunchFiles.class));
+								}
+							}else {
+								List<PjProductLaunchFiles> filesList = new ArrayList<>();
+								PjProductLaunchFiles files = new PjProductLaunchFiles();
+								files.setUrl(detail.getUrl());
+								files.setVersion("0");
+								filesList.add(files);
+								detail.setFilesList(filesList);
+							}
+						}
+					}
+				}
 			} else {
 				if (ObjectUtils.isNotNull(detail.getBrandId())) {
 					if (!brandFigureList.isEmpty()) {
@@ -137,42 +182,6 @@ public class ShoppingMallDetailServiceImpl extends ServiceImpl<ShoppingMallDetai
 					}
 				}
 			}
-		} else {
-			if (ObjectUtils.isNotNull(detail.getBrandId())) {
-				if (!brandFigureList.isEmpty()) {
-					List<BrandFigure> brandFigureList1 = brandFigureList.stream()
-						.filter(e -> e.getPid().equals(detail.getBrandId()) && e.getFigure().equals(detail.getBrandItem()))
-						.collect(Collectors.toList());
-					if (!brandFigureList1.isEmpty()) {
-						detail.setFilesList(BeanUtil.copy(brandFigureList1, PjProductLaunchFiles.class));
-					} else {
-						if (!pjBrandFilesList.isEmpty()) {
-							List<PjBrandFiles> pjBarndFilesList1 = pjBrandFilesList.stream()
-								.filter(e -> e.getPid().equals(detail.getBrandId()))
-								.collect(Collectors.toList());
-							if (!pjBarndFilesList1.isEmpty()) {
-								detail.setFilesList(BeanUtil.copy(pjBarndFilesList1, PjProductLaunchFiles.class));
-							}
-						}
-					}
-				} else {
-					if (!pjBrandFilesList.isEmpty()) {
-						List<PjBrandFiles> pjBarndFilesList1 = pjBrandFilesList.stream()
-							.filter(e -> e.getPid().equals(detail.getBrandId()))
-							.collect(Collectors.toList());
-						if (!pjBarndFilesList1.isEmpty()) {
-							detail.setFilesList(BeanUtil.copy(pjBarndFilesList1, PjProductLaunchFiles.class));
-						}
-					}else {
-						List<PjProductLaunchFiles> filesList = new ArrayList<>();
-						PjProductLaunchFiles files = new PjProductLaunchFiles();
-						files.setUrl(detail.getUrl());
-						files.setVersion("0");
-						filesList.add(files);
-						detail.setFilesList(filesList);
-					}
-				}
-			}
 		}
 		PjCorpsDesc corpsDesc = null;
 		//根据当前登录人获得客户

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/shoppingCart/service/impl/ShoppingCartServiceImpl.java

@@ -161,7 +161,7 @@ public class ShoppingCartServiceImpl extends ServiceImpl<ShoppingCartMapper, PjS
 				TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
 				throw new RuntimeException("生成系统编号失败");
 			}
-			billNo = billNo + AuthUtil.getTenantId();
+			billNo = billNo +"-"+ AuthUtil.getTenantId();
 			Integer i = 1;
 			// 获取系统编号
 			String SrcOrdNo = serialService.getBillNo("XS", "XS", "XS");
@@ -376,7 +376,7 @@ public class ShoppingCartServiceImpl extends ServiceImpl<ShoppingCartMapper, PjS
 				TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
 				throw new RuntimeException("生成系统编号失败");
 			}
-
+			billNo = billNo +"-"+ AuthUtil.getTenantId();
 			Integer i = 1;
 			// 获取系统编号
 			String SrcOrdNo = serialService.getBillNo("XS", "XS", "XS");
@@ -572,7 +572,7 @@ public class ShoppingCartServiceImpl extends ServiceImpl<ShoppingCartMapper, PjS
 				TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
 				throw new RuntimeException("生成系统编号失败");
 			}
-
+			billNo = billNo +"-"+ AuthUtil.getTenantId();
 			Integer i = 1;
 			// 获取系统编号
 			String SrcOrdNo = serialService.getBillNo("XS", "XS", "XS");
@@ -825,7 +825,7 @@ public class ShoppingCartServiceImpl extends ServiceImpl<ShoppingCartMapper, PjS
 				TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
 				throw new RuntimeException("生成系统编号失败");
 			}
-			billNo = billNo + AuthUtil.getTenantId();
+			billNo = billNo +"-"+ AuthUtil.getTenantId();
 			int i = 1;
 			// 获取系统编号
 			String SrcOrdNo = serialService.getBillNo("JF", "JF", "JF");
@@ -1053,7 +1053,7 @@ public class ShoppingCartServiceImpl extends ServiceImpl<ShoppingCartMapper, PjS
 					TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
 					throw new RuntimeException("生成系统编号失败");
 				}
-				billNo = billNo + AuthUtil.getTenantId();
+				billNo = billNo +"-"+ AuthUtil.getTenantId();
 				List<PjOrder> pjOrderList = new ArrayList<>();
 				List<PjOrderItems> orderItemsList = new ArrayList<>();
 				List<PjOrderItems> orderItemsListShare = new ArrayList<>();

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/stock/controller/StockDescController.java

@@ -920,6 +920,7 @@ public class StockDescController extends BladeController {
 			PjGoodsDesc pjGoodsDescs = goodsDescService.getOne(new LambdaQueryWrapper<PjGoodsDesc>()
 				.eq(PjGoodsDesc::getTenantId, AuthUtil.getTenantId())
 				.eq(PjGoodsDesc::getIsDeleted, 0)
+				.eq(PjGoodsDesc::getSalesCompanyId, AuthUtil.getDeptId())
 				.eq(PjGoodsDesc::getCname, stockDesc.getCname()));
 			if (pjGoodsDescs != null) {
 				productLaunch = productLaunchService.getOne(new LambdaQueryWrapper<PjProductLaunch>()

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

@@ -58,56 +58,56 @@
     </if>
 
     <!-- 日志输出级别 -->
-    <root level="info">
+    <root level="ERROR">
         <appender-ref ref="STDOUT"/>
         <appender-ref ref="${STDOUT_APPENDER}"/>
     </root>
 
-    <logger name="net.sf.ehcache" level="info"/>
-    <logger name="druid.sql" level="info"/>
+    <logger name="net.sf.ehcache" level="ERROR"/>
+    <logger name="druid.sql" level="ERROR"/>
 
 
     <!-- MyBatis log configure -->
-    <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"/>
+    <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"/>
 
     <!-- 减少部分debug日志 -->
-    <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"/>
+    <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"/>
     <!-- cloud -->
-    <logger name="org.apache.http" level="info"/>
-    <logger name="com.netflix.discovery" level="info"/>
-    <logger name="com.netflix.eureka" level="info"/>
+    <logger name="org.apache.http" level="ERROR"/>
+    <logger name="com.netflix.discovery" level="ERROR"/>
+    <logger name="com.netflix.eureka" level="ERROR"/>
     <!-- 业务日志 -->
-    <Logger name="org.springblade" level="info"/>
-    <Logger name="org.springblade.core.tenant" level="info"/>
-    <Logger name="org.springblade.core.version" level="info"/>
+    <Logger name="org.springblade" level="ERROR"/>
+    <Logger name="org.springblade.core.tenant" level="ERROR"/>
+    <Logger name="org.springblade.core.version" level="ERROR"/>
 
     <!-- 减少nacos日志 -->
-    <logger name="com.alibaba.nacos" level="info"/>
+    <logger name="com.alibaba.nacos" level="ERROR"/>
 
 
 </configuration>