20230522 17:47

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjOrder.java

@@ -304,7 +304,7 @@ public class PjOrder implements Serializable {
 	 * 出入库集合
 	 */
 	@TableField(exist = false)
-	private List<PjShip> shipList;
+	private List<PjShip> outboundRecordsList;
 
 	/**
 	 * 商品名称拼接
@@ -341,4 +341,20 @@ public class PjOrder implements Serializable {
 	 */
 	@ApiModelProperty(value = "共享公司名称")
 	private String sharedCompanyName;
+
+	//跳转对应页面的路由
+	@TableField(exist = false)
+	private String url;
+	//页面枚举
+	@TableField(exist = false)
+	private String pageStatus;
+	//页面名字
+	@TableField(exist = false)
+	private String pageLabel;
+
+	/**
+	 * 审核状态
+	 */
+	@ApiModelProperty(value = "审核状态")
+	private String checkStatus;
 }

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjProductLaunch.java

@@ -281,4 +281,10 @@ public class PjProductLaunch implements Serializable {
 	 */
 	@ApiModelProperty(value = "共享成本")
 	private BigDecimal shareCost;
+
+	/**
+	 * 产品名称提取数字
+	 */
+	@ApiModelProperty(value = "产品名称提取数字")
+	private String cnameInt;
 }

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjShipItems.java

@@ -128,7 +128,7 @@ public class PjShipItems implements Serializable {
 	 * 品牌id
 	 */
 	@ApiModelProperty(value = "品牌id")
-	private String brandId;
+	private Long brandId;
 
 	/**
 	 * 品牌名称

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjStockDesc.java

@@ -120,7 +120,7 @@ public class PjStockDesc implements Serializable {
 	* 品牌id
 	*/
 		@ApiModelProperty(value = "品牌id")
-		private String brandId;
+		private Long brandId;
 
 	/**
 	 * 品牌名称

blade-service/blade-sales-part/pom.xml

@@ -53,6 +53,12 @@
             <version>2.8.2.RELEASE</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-check-api</artifactId>
+            <version>2.8.2.RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
 
 
     </dependencies>

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/brand/controller/BrandDescController.java

@@ -87,7 +87,6 @@ public class BrandDescController extends BladeController {
 		LambdaQueryWrapper<PjBrandDesc> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 		lambdaQueryWrapper.eq(PjBrandDesc::getTenantId, AuthUtil.getTenantId())
 			.eq(PjBrandDesc::getIsDeleted, 0)
-			.eq(PjBrandDesc::getSalesCompanyId, AuthUtil.getDeptId())//公司
 			.like(ObjectUtils.isNotEmpty(brandDesc.getCname()), PjBrandDesc::getCname, brandDesc.getCname());
 		IPage<PjBrandDesc> pages = brandDescService.page(Condition.getPage(query), lambdaQueryWrapper);
 
@@ -213,7 +212,6 @@ public class BrandDescController extends BladeController {
 		LambdaQueryWrapper<PjBrandDesc> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 		lambdaQueryWrapper.eq(PjBrandDesc::getTenantId, AuthUtil.getTenantId())
 			.eq(PjBrandDesc::getIsDeleted, 0)
-			.eq(PjBrandDesc::getSalesCompanyId, AuthUtil.getDeptId())//公司
 			.like(ObjectUtils.isNotEmpty(brandDesc.getCname()), PjBrandDesc::getCname, brandDesc.getCname());
 		List<PjBrandDesc> list = brandDescService.list(lambdaQueryWrapper);
 

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

@@ -330,4 +330,16 @@ public class GoodsDescController extends BladeController {
 			this.selectChildById(item.getId(), idList);
 		});
 	}
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/goodsDetail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入goods")
+	public R<PjGoodsDesc> goodsDetail(PjGoodsDesc goods) {
+		goods.setTenantId(AuthUtil.getTenantId());
+		PjGoodsDesc detail = goodsService.getGoodsDetail(goods);
+		return R.data(detail);
+	}
 }

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

@@ -83,4 +83,12 @@ public interface IGoodsDescService extends IService<PjGoodsDesc> {
 	 */
 	void selectGoodsCname(PjGoodsDesc goodsDesc);
 
+	/**
+	 * 获取商品详情
+	 *
+	 * @param goodsDesc
+	 * @return
+	 */
+	PjGoodsDesc getGoodsDetail(PjGoodsDesc goodsDesc);
+
 }

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/goods/service/impl/GoodsDescServiceImpl.java

@@ -274,6 +274,20 @@ public class GoodsDescServiceImpl extends ServiceImpl<GoodsDescMapper, PjGoodsDe
 	}
 
 	/**
+	 * 获取商品详情
+	 *
+	 * @param goodsDesc
+	 * @return
+	 */
+	@Override
+	public PjGoodsDesc getGoodsDetail(PjGoodsDesc goodsDesc) {
+		// 获取商品详情
+		PjGoodsDesc desc = baseMapper.selectById(goodsDesc.getId());
+
+		return desc;
+	}
+
+	/**
 	 * 校验商品唯一性
 	 *
 	 * @param goodsDesc

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

@@ -286,7 +286,7 @@ public class OrderController extends BladeController {
 	 * 小程序销售详情
 	 */
 	@GetMapping("/appDetail")
-	@ApiOperationSupport(order = 1)
+	@ApiOperationSupport(order = 12)
 	@ApiOperation(value = "小程序销售详情", notes = "传入order")
 	public R<PjOrder> appDetail(PjOrder order) {
 		order.setTenantId(AuthUtil.getTenantId());
@@ -294,4 +294,35 @@ public class OrderController extends BladeController {
 		return R.data(detail);
 	}
 
+	/**
+	 * 销售申请退款请核
+	 */
+	@PostMapping("/checkOrder ")
+	@ApiOperationSupport(order = 13)
+	@ApiOperation(value = "请核", notes = "传入order")
+	public R checkOrder(@RequestBody PjOrder order) {
+		PjOrder declare = orderService.checkOrder(order);
+		return R.data(declare);
+	}
+
+	/**
+	 * 退款审核通过
+	 */
+	@PostMapping("/passCheck")
+	@ApiOperationSupport(order = 14)
+	@ApiOperation(value = "审核通过", notes = "传入id")
+	public R passCheck(@ApiParam(value = "主表id", required = true) @RequestParam Long id) {
+		return orderService.passCheck(id);
+	}
+
+	/**
+	 * 退款审核中
+	 */
+	@PostMapping("/underReview")
+	@ApiOperationSupport(order = 15)
+	@ApiOperation(value = "审核中", notes = "传入id")
+	public R underReview(@ApiParam(value = "主表id", required = true) @RequestParam Long id) {
+		return orderService.underReview(id);
+	}
+
 }

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

@@ -79,4 +79,24 @@ public interface IOrderService extends IService<PjOrder> {
 	 */
 	PjOrder getAppMessageById(PjOrder order);
 
+	/**
+	 * 销售申请退款请核
+	 *
+	 * @param order
+	 * @return
+	 */
+	PjOrder checkOrder(PjOrder order);
+
+	/**
+	 * 退款审批通过
+	 * @param id
+	 */
+	R passCheck(Long id);
+
+	/**
+	 * 退款审核中
+	 * @param id
+	 */
+	R underReview(Long id);
+
 }

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

@@ -20,6 +20,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import io.seata.spring.annotation.GlobalTransactional;
 import lombok.AllArgsConstructor;
+import org.springblade.check.dto.AuditProecessDTO;
+import org.springblade.check.entity.AuditPathsActs;
+import org.springblade.check.entity.AuditPathsLevels;
+import org.springblade.check.feign.ICheckClient;
+import org.springblade.client.entity.CorpsDesc;
 import org.springblade.client.feign.ISerialClient;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
@@ -46,6 +51,7 @@ import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 配件销售采购表 服务实现类
@@ -61,6 +67,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 	 * 生成系统编号
 	 */
 	private ISerialClient serialClient;
+	private ICheckClient checkClient;
 
 	private final OrderItemsMapper orderItemsMapper;
 	private final ShipMapper shipMapper;
@@ -100,7 +107,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 		shipLambdaQueryWrapper.eq(PjShip::getTenantId, AuthUtil.getTenantId())
 			.eq(PjShip::getIsDeleted, 0)
 			.eq(PjShip::getOrdId, detail.getId());
-		detail.setShipList(shipMapper.selectList(shipLambdaQueryWrapper));
+		detail.setOutboundRecordsList(shipMapper.selectList(shipLambdaQueryWrapper));
 		return detail;
 	}
 
@@ -194,7 +201,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 						if (ObjectUtil.isNotEmpty(goodsDesc.getWhether()) && goodsDesc.getWhether().equals("1")){//是否管理批次号
 							lambdaQueryWrapper.eq(PjStockDesc::getDot, item.getDot());
 						}else {
-							lambdaQueryWrapper.isNull(PjStockDesc::getDot);
+							lambdaQueryWrapper.and(i -> i.eq(PjStockDesc::getDot, "").or().isNull(PjStockDesc::getDot));
 						}
 
 						PjStockDesc stockDesc = stockDescMapper.selectOne(lambdaQueryWrapper);
@@ -406,4 +413,104 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 		return detail;
 	}
 
+	/**
+	 * 销售申请退款请核
+	 *
+	 * @param order
+	 * @return
+	 */
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
+	public PjOrder checkOrder(PjOrder order) {
+		PjOrder declare = baseMapper.selectById(order.getId());
+
+		//审批数据
+		AuditProecessDTO auditProecessDTO = new AuditProecessDTO();
+		//获取审批级次
+		List<AuditPathsLevels> auditPathsLevels = null;
+		// 判断是否有审批流,如果审批流已开启就进入审批流,否则直接走申请通过
+		AuditPathsActs pathsActs = null;
+		//是否开启流程
+		pathsActs = checkClient.getActsByActId(1106, "status");
+		//获取审批信息
+		auditPathsLevels = checkClient.listLevelsByActId(1106, "status");
+		auditProecessDTO.setTimes(1);
+		auditProecessDTO.setProcessType("退款审批");
+
+		// 没开启审批流直接走 通过流程
+		if (pathsActs == null || pathsActs.getIsEnable() == 2) {
+			throw new SecurityException("当前租户未查询到审批流配置");
+		} else {
+
+			if (CollectionUtils.isEmpty(auditPathsLevels)) {
+				throw new SecurityException("开启审批失败:未查询到审批信息");
+			}
+
+			// 绑定审核类型
+			auditProecessDTO.setCheckType("PJTK");//代理订单
+			// 追加跳转路由url
+			auditProecessDTO.setUrl(order.getUrl());
+			auditProecessDTO.setPageStatus(order.getPageStatus());
+			auditProecessDTO.setPageLabel(order.getPageLabel());
+			auditProecessDTO.setOrderRemark(declare.getRemarks());//订单备注
+			auditProecessDTO.setPathsLevelsList(auditPathsLevels);
+			auditProecessDTO.setActId(1);
+			auditProecessDTO.setSrcBillId(declare.getId());//申请表id
+			auditProecessDTO.setBillId(declare.getId());//业务id
+			auditProecessDTO.setBillNo(declare.getOrdNo());//业务编号
+			auditProecessDTO.setSendUserId(AuthUtil.getUserId());//请核人id
+			auditProecessDTO.setSendName(AuthUtil.getUserName());//请核人名称
+			auditProecessDTO.setSendTime(new Date());//请核时间
+			auditProecessDTO.setBillTime(declare.getCreateTime());//业务日期
+			auditProecessDTO.setTenantId(AuthUtil.getTenantId());//租户id
+			R financeProcess = checkClient.createFinanceProcess(auditProecessDTO);
+			if (!financeProcess.isSuccess()) {
+				throw new SecurityException("操作失败,请联系管理员");
+			}
+		}
+
+		declare.setStatus("退款中");
+		baseMapper.updateById(declare);
+
+		return declare;
+	}
+
+	/**
+	 * 退款审批通过
+	 */
+	@Override
+	public R passCheck(Long id) {
+		PjOrder order = baseMapper.selectById(id);
+		if (order == null) {
+			throw new SecurityException("审批通过失败");
+		}
+		if (order.getStatus() == "已取消") {
+			throw new SecurityException("订单已审批通过请勿重复审批");
+		}
+
+		order.setStatus("已取消");
+		order.setCheckStatus("审核完成");
+		baseMapper.updateById(order);
+
+		return R.success("操作成功");
+	}
+
+	/**
+	 * 审核中
+	 */
+	@Override
+	public R underReview(Long id) {
+		PjOrder order = baseMapper.selectById(id);
+		if (order == null) {
+			throw new SecurityException("审批通过失败");
+		}
+
+		order.setStatus("退款中");
+		order.setCheckStatus("审批中");
+		baseMapper.updateById(order);
+
+		return R.success("操作成功");
+	}
+
 }

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/productLaunch/controller/ProductLaunchController.java

@@ -54,6 +54,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -97,6 +98,7 @@ public class ProductLaunchController extends BladeController {
 			.eq(PjProductLaunch::getIsDeleted, 0)
 			.eq(PjProductLaunch::getBillType, productLaunch.getBillType())
 			.eq(PjProductLaunch::getSalesCompanyId, AuthUtil.getDeptId())//公司
+			.eq(ObjectUtil.isNotEmpty(productLaunch.getBrandId()), PjProductLaunch::getBrandId, productLaunch.getBrandId())
 			.like(ObjectUtils.isNotEmpty(productLaunch.getCname()), PjProductLaunch::getCname, productLaunch.getCname())//名称
 			.like(ObjectUtils.isNotEmpty(productLaunch.getSpecificationAndModel()), PjProductLaunch::getSpecificationAndModel, productLaunch.getSpecificationAndModel())//规格型号
 			.like(ObjectUtils.isNotEmpty(productLaunch.getSalesCompanyName()), PjProductLaunch::getSalesCompanyName, productLaunch.getSalesCompanyName());
@@ -234,11 +236,14 @@ public class ProductLaunchController extends BladeController {
 			.eq(PjProductLaunch::getIsDeleted, 0)
 			.eq(PjProductLaunch::getUpAndDownShelves,1)
 			.eq(PjProductLaunch::getSalesCompanyId, AuthUtil.getDeptId())//公司
-			.like(ObjectUtil.isNotEmpty(productLaunch.getCname()), PjProductLaunch::getCname, productLaunch.getCname())
 			.eq(ObjectUtils.isNotEmpty(productLaunch.getBrandId()), PjProductLaunch::getBrandId, productLaunch.getBrandId())//品牌
 			.like(ObjectUtils.isNotEmpty(productLaunch.getBrandName()), PjProductLaunch::getBrandName, productLaunch.getBrandName())
 			.ne(PjProductLaunch::getWhetherShare, 1)
 			.orderByAsc(PjProductLaunch::getBillType);
+
+			if (ObjectUtil.isNotEmpty(productLaunch.getCname())){
+				lambdaQueryWrapper.and(i -> i.like(PjProductLaunch::getCname, productLaunch.getCname()).or().like(PjProductLaunch::getCnameInt, productLaunch.getCname()));
+			}
 		IPage<PjProductLaunch> pages = productLaunchService.page(Condition.getPage(query), lambdaQueryWrapper);
 
 		if (CollectionUtils.isNotEmpty(pages.getRecords())){
@@ -287,10 +292,10 @@ public class ProductLaunchController extends BladeController {
 	@GetMapping("/appDetail")
 	@ApiOperationSupport(order = 13)
 	@ApiOperation(value = "小程序详情", notes = "传入productLaunch")
-	public R<PjProductLaunch> appDetail(PjProductLaunch productLaunch) {
+	public R<Map<String, Object>> appDetail(PjProductLaunch productLaunch) {
 		productLaunch.setTenantId(AuthUtil.getTenantId());
-		PjProductLaunch detail = productLaunchService.getAppMessageById(productLaunch);
-		return R.data(detail);
+		Map<String, Object> map = productLaunchService.getAppMessageById(productLaunch);
+		return R.data(map);
 	}
 
 	/**

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

@@ -27,6 +27,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 配件批发产品上架 服务类
@@ -81,7 +82,7 @@ public interface IProductLaunchService extends IService<PjProductLaunch> {
 	 * @param productLaunch
 	 * @return
 	 */
-	PjProductLaunch getAppMessageById(PjProductLaunch productLaunch);
+	Map<String, Object> getAppMessageById(PjProductLaunch productLaunch);
 
 	/**
 	 * 详情选择所属公司修改价格

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

@@ -45,9 +45,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 /**
  * 配件批发产品上架 服务实现类
@@ -254,6 +252,7 @@ public class ProductLaunchServiceImpl extends ServiceImpl<ProductLaunchMapper, P
 				productLaunch.setExplosionProof(pjGoodsDesc.getExplosionProof());
 				productLaunch.setOriginalFactory(pjGoodsDesc.getOriginalFactory());
 				productLaunch.setSelfRecovery(pjGoodsDesc.getSelfRecovery());
+				productLaunch.setCnameInt(pjGoodsDesc.getCnameInt());
 			}else {
 				throw new RuntimeException("商品"+e.getCname()+"名称错误或商品不存在");
 			}
@@ -279,6 +278,7 @@ public class ProductLaunchServiceImpl extends ServiceImpl<ProductLaunchMapper, P
 			LambdaQueryWrapper<PjProductLaunch> queryWrapper = new LambdaQueryWrapper<>();
 			queryWrapper.eq(PjProductLaunch::getTenantId, AuthUtil.getTenantId())
 				.eq(PjProductLaunch::getCname, productLaunch.getCname())
+				.eq(PjProductLaunch::getSalesCompanyId, productLaunch.getSalesCompanyId())
 				.eq(PjProductLaunch::getIsDeleted, 0)
 				.eq(PjProductLaunch::getBillType, 0);
 			PjProductLaunch one = baseMapper.selectOne(queryWrapper);
@@ -325,7 +325,10 @@ public class ProductLaunchServiceImpl extends ServiceImpl<ProductLaunchMapper, P
 	 * 小程序详情
 	 */
 	@Override
-	public PjProductLaunch getAppMessageById(PjProductLaunch productLaunch) {
+	public Map<String, Object> getAppMessageById(PjProductLaunch productLaunch) {
+
+		Map<String, Object> map = new HashMap<>();
+
 		PjProductLaunch detail = baseMapper.selectById(productLaunch.getId());
 		detail.setGoodsNum(new BigDecimal(1));
 
@@ -360,21 +363,46 @@ public class ProductLaunchServiceImpl extends ServiceImpl<ProductLaunchMapper, P
 			throw new RuntimeException("未查到用户信息");
 		}
 
-		LambdaQueryWrapper<PjProductLaunch> queryWrapper = new LambdaQueryWrapper<>();
-		queryWrapper.eq(PjProductLaunch::getTenantId, AuthUtil.getTenantId())
-			.eq(PjProductLaunch::getIsDeleted, 0)
-			.eq(PjProductLaunch::getGoodsId, detail.getGoodsId())
-			.eq(PjProductLaunch::getBillType, 1)
-			.eq(PjProductLaunch::getWhetherShare, 0)
-			.eq(PjProductLaunch::getSalesCompanyId, detail.getSalesCompanyId());
-
-		List<PjProductLaunch> list = baseMapper.selectList(queryWrapper);
-		if (ObjectUtil.isNotEmpty(list)){
-			detail.setSharedCompanyInventory(list.get(0).getInventory());
+		map.put("type", detail.getBillType());
+
+		if (detail.getBillType() == 0){//本地
+			//查询是否有共享
+			LambdaQueryWrapper<PjProductLaunch> queryWrapper = new LambdaQueryWrapper<>();
+			queryWrapper.eq(PjProductLaunch::getTenantId, AuthUtil.getTenantId())
+				.eq(PjProductLaunch::getIsDeleted, 0)
+				.eq(PjProductLaunch::getGoodsId, detail.getGoodsId())
+				.eq(PjProductLaunch::getBillType, 1)
+				.eq(PjProductLaunch::getWhetherShare, 0)
+				.eq(PjProductLaunch::getSalesCompanyId, detail.getSalesCompanyId());
+
+			PjProductLaunch selectOne = baseMapper.selectOne(queryWrapper);
+			if (ObjectUtil.isNotEmpty(selectOne)){
+				//获得附件
+				selectOne.setFilesList(productLaunchFilesService.list(new QueryWrapper<PjProductLaunchFiles>()
+					.eq("pid", selectOne.getId())
+					.eq("is_deleted", 0)));
+
+				if (ObjectUtil.isNotEmpty(corpsDesc.getPriceSystem())){
+					if ("售价1".equals(corpsDesc.getPriceSystem())){
+						selectOne.setMallPrice(selectOne.getPriceOne());
+					}else if ("售价2".equals(corpsDesc.getPriceSystem())){
+						selectOne.setMallPrice(selectOne.getPriceTwo());
+					}else if ("售价3".equals(corpsDesc.getPriceSystem())){
+						selectOne.setMallPrice(selectOne.getPriceThree());
+					}else if ("售价4".equals(corpsDesc.getPriceSystem())){
+						selectOne.setMallPrice(selectOne.getPriceFour());
+					}
+				}
+			}
+			map.put("thisLocality", detail);
+			map.put("offsite", selectOne);
+
+		}else {
+			map.put("thisLocality", null);
+			map.put("offsite", detail);
 		}
-		detail.setShareList(list);
 
-		return detail;
+		return map;
 	}
 
 	/**

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

@@ -356,7 +356,7 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
 				if (ObjectUtil.isNotEmpty(goodsDesc.getWhether()) && goodsDesc.getWhether().equals("1")){//管理批次号
 					lambdaQueryWrapper.eq(PjStockDesc::getDot, item.getDot());
 				}else {
-					lambdaQueryWrapper.isNull(PjStockDesc::getDot);
+					lambdaQueryWrapper.and(i -> i.eq(PjStockDesc::getDot, "").or().isNull(PjStockDesc::getDot));
 				}
 
 				PjStockDesc stockOne = stockDescMapper.selectOne(lambdaQueryWrapper);
@@ -571,7 +571,7 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
 				if (ObjectUtil.isNotEmpty(goodsDesc.getWhether()) && goodsDesc.getWhether().equals("1")){//管理批次号
 					lambdaQueryWrapper.eq(PjStockDesc::getDot, item.getDot());
 				}else {
-					lambdaQueryWrapper.isNull(PjStockDesc::getDot);
+					lambdaQueryWrapper.and(i -> i.eq(PjStockDesc::getDot, "").or().isNull(PjStockDesc::getDot));
 				}
 
 				PjStockDesc stockOne = stockDescMapper.selectOne(lambdaQueryWrapper);

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

@@ -231,9 +231,16 @@ public class ShoppingCartServiceImpl extends ServiceImpl<ShoppingCartMapper, PjS
 							LambdaQueryWrapper<PjProductLaunch> queryWrapper = new LambdaQueryWrapper<>();
 							queryWrapper.eq(PjProductLaunch::getTenantId, AuthUtil.getTenantId())
 								.eq(PjProductLaunch::getIsDeleted, 0)
-								.eq(PjProductLaunch::getBillType, 0)
-								.eq(PjProductLaunch::getSalesCompanyId, e.getSharedCompanyId())
 								.eq(PjProductLaunch::getGoodsId, e.getGoodsId());
+
+							if (productLaunch.getBillType() == 0){
+								queryWrapper.eq(PjProductLaunch::getSourceCompanyId, e.getSharedCompanyId())
+									.eq(PjProductLaunch::getBillType, 1);
+							}else {
+								queryWrapper.eq(PjProductLaunch::getSalesCompanyId, e.getSharedCompanyId())
+									.eq(PjProductLaunch::getBillType, 0);
+							}
+
 							List<PjProductLaunch> launchList = productLaunchMapper.selectList(queryWrapper);
 
 							if (ObjectUtil.isNotEmpty(launchList)){