变更

blade-service/blade-mocha-item/src/main/java/org/springblade/mocha/service/impl/SalesPolicyServiceImpl.java

@@ -368,7 +368,7 @@ public class SalesPolicyServiceImpl extends ServiceImpl<SalesPolicyMapper, Sales
 		if (salesPolicy == null) {
 			throw new SecurityException("审批失败");
 		}
-		salesPolicy.setStatus(3);
+		salesPolicy.setStatus(2);
 		baseMapper.updateById(salesPolicy);
 	}
 

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/mapper/OrderMapper.xml

@@ -461,7 +461,6 @@ FROM
 WHERE
 	bo.is_deleted = '0'
 	AND bo.`status` != '0'
-	AND bo.settlment_amount = '0.00'
 	AND item.is_deleted = '0'
 	AND bo.tenant_id = #{tenantId}
 	AND bo.trade_type = #{tradeType}

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

@@ -50,25 +50,32 @@ public class BidingItemsServiceImpl extends ServiceImpl<BidingItemsMapper, Bidin
 	public List<BidingItems> saveBidingItemsMessage(List<BidingItems> list, Long pid, Integer distinguish){
 		//获得当前用户信息
 		CorpsAttn corpsAttn = corpsAttnClient.getUser(AuthUtil.getUserId());
-		if (ObjectUtil.isEmpty(corpsAttn) || ObjectUtil.isEmpty(corpsAttn.getPid())){
-			throw new SecurityException("用户信息异常");
-		}
+		if (ObjectUtil.isNotEmpty(corpsAttn)){
+			if (ObjectUtil.isEmpty(corpsAttn) || ObjectUtil.isEmpty(corpsAttn.getPid())){
+				throw new SecurityException("用户信息异常");
+			}
 
-		//获得代理信息
-		LambdaQueryWrapper<BidingAgent> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-		lambdaQueryWrapper.eq(BidingAgent::getTenantId, AuthUtil.getTenantId());
-		lambdaQueryWrapper.eq(BidingAgent::getIsDeleted,0);
-		lambdaQueryWrapper.eq(BidingAgent::getPid, pid);
-		lambdaQueryWrapper.in(BidingAgent::getAgentId, corpsAttn.getPid());
-		BidingAgent bidingAgent = bidingAgentMapper.selectOne(lambdaQueryWrapper);
-
-		if (ObjectUtil.isNotEmpty(bidingAgent)){
-			if (bidingAgent.getNonEditable() == null){//为空代表第一次添加标书对比
-				bidingAgent.setNonEditable(0);
-			} else if (bidingAgent.getNonEditable() == 0){//为零代表已经添加标书 此次为修改
-				bidingAgent.setNonEditable(1);
-			} else if (bidingAgent.getNonEditable() == 1){//为一代表已经修改过一次 不允许再修改
-				throw new SecurityException("投标信息只允许修改一次");
+			//获得代理信息
+			LambdaQueryWrapper<BidingAgent> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+			lambdaQueryWrapper.eq(BidingAgent::getTenantId, AuthUtil.getTenantId());
+			lambdaQueryWrapper.eq(BidingAgent::getIsDeleted,0);
+			lambdaQueryWrapper.eq(BidingAgent::getPid, pid);
+			lambdaQueryWrapper.in(BidingAgent::getAgentId, corpsAttn.getPid());
+			BidingAgent bidingAgent = bidingAgentMapper.selectOne(lambdaQueryWrapper);
+
+			if (ObjectUtil.isNotEmpty(bidingAgent)){
+				if (bidingAgent.getNonEditable() == null){//为空代表第一次添加标书对比
+					bidingAgent.setNonEditable(0);
+				} else if (bidingAgent.getNonEditable() == 0){//为零代表已经添加标书 此次为修改
+					bidingAgent.setNonEditable(1);
+				} else if (bidingAgent.getNonEditable() == 1){//为一代表已经修改过一次 不允许再修改
+					throw new SecurityException("投标信息只允许修改一次");
+				}
+			}
+
+			if (ObjectUtil.isNotEmpty(bidingAgent)){
+				//更新代理明细信息
+				bidingAgentMapper.updateById(bidingAgent);
 			}
 		}
 
@@ -92,10 +99,7 @@ public class BidingItemsServiceImpl extends ServiceImpl<BidingItemsMapper, Bidin
 				baseMapper.updateById(item);
 			}
 		});
-		if (ObjectUtil.isNotEmpty(bidingAgent)){
-			//更新代理明细信息
-			bidingAgentMapper.updateById(bidingAgent);
-		}
+
 		return list;
 	}