1.测试及修改达沃特及新租户代码

blade-service-api/blade-client-api/src/main/java/org/springblade/client/entity/BasicCorpsProfitChange.java

@@ -111,6 +111,11 @@ public class BasicCorpsProfitChange implements Serializable {
 	*/
 		@ApiModelProperty(value = "是否已删除（0 否 1是）")
 		private Integer isDeleted;
+	/**
+	 * 租户id
+	 */
+	@ApiModelProperty(value = "租户id")
+	private String tenantId;
 
 
 }

blade-service-api/blade-purchase-sales-api/src/main/java/org/springblade/purchase/sales/feign/IOrderDescClient.java

@@ -55,6 +55,7 @@ public interface IOrderDescClient {
 	 */
 	@PostMapping(UPDATE_ORDER)
 	R updateOrder(@RequestBody Order order);
+
 	/**
 	 * 修改采购订单状态
 	 *
@@ -138,16 +139,17 @@ public interface IOrderDescClient {
 	 * 年度预算报表获得订单数量和发货数量
 	 */
 	@GetMapping(GET_BY_ORDER_QUANTITY)
-	List<OrderStatisticsVo> getByOrderQuantity(@RequestParam("year") Integer year, @RequestParam("month") Integer month, @RequestParam("corpId") Long corpId);
+	List<OrderStatisticsVo> getByOrderQuantity(@RequestParam("year") Integer year, @RequestParam("month") Integer month,
+											   @RequestParam("corpId") Long corpId, @RequestParam("tenantId") String tenantId);
 
 	@GetMapping(SAVE)
 	boolean save(Order orderNew);
 
 	@GetMapping(ORDER_INVENTORY_LIST)
-	List<OrderVO> orderInventoryList( @RequestParam("billType") String billType,
-									  @RequestParam("itemId") Long itemId,
-									  @RequestParam("corpId") Long corpId,
-									  @RequestParam("storageId") Long storageId);
+	List<OrderVO> orderInventoryList(@RequestParam("billType") String billType,
+									 @RequestParam("itemId") Long itemId,
+									 @RequestParam("corpId") Long corpId,
+									 @RequestParam("storageId") Long storageId);
 
 	@GetMapping(PASS_CHECK)
 	void passCheck(@RequestParam("id") Long id);

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/annualBudget/service/impl/AnnualBudgetItemServiceImpl.java

@@ -81,7 +81,7 @@ public class AnnualBudgetItemServiceImpl extends ServiceImpl<AnnualBudgetItemMap
 				e.setDeliverySummary(BigDecimal.ZERO);
 
 				//根据年 月 客户 查询订单数量和发货数量
-				List<OrderStatisticsVo> orderList = orderDescClient.getByOrderQuantity(e.getYear(), e.getMonth(), e.getCorpId());
+				List<OrderStatisticsVo> orderList = orderDescClient.getByOrderQuantity(e.getYear(), e.getMonth(), e.getCorpId(),e.getTenantId());
 				if (ObjectUtil.isNotEmpty(orderList)){
 					orderList.forEach(o -> {//循环根据品牌赋值
 						if ("KETER".equals(o.getBrand())){//欧记
@@ -157,7 +157,7 @@ public class AnnualBudgetItemServiceImpl extends ServiceImpl<AnnualBudgetItemMap
 				e.setDrivemasterDeliverQuantity(BigDecimal.ZERO);
 
 				//根据年 月 客户 查询订单数量和发货数量
-				List<OrderStatisticsVo> orderList = orderDescClient.getByOrderQuantity(e.getYear(), e.getMonth(), e.getCorpId());
+				List<OrderStatisticsVo> orderList = orderDescClient.getByOrderQuantity(e.getYear(), e.getMonth(), e.getCorpId(),e.getTenantId());
 				if (ObjectUtil.isNotEmpty(orderList)){
 					orderList.forEach(o -> {//循环根据品牌赋值
 						if ("KETER".equals(o.getBrand())){//欧记

blade-service/blade-check/src/main/java/org/springblade/check/service/impl/AuditProecessServiceImpl.java

@@ -500,86 +500,83 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, A
 				if (!save.isSuccess()) {
 					throw new SecurityException("发送消息失败");
 				}
-
-				if (!"681169".equals(AuthUtil.getTenantId())) {
-					if (!ObjectUtils.isNotNull(sysClient.getParamService("synchronous"))
-						&& !"1".equals(sysClient.getParamService("synchronous"))) {
-						Settlement settlement = new Settlement();
-						settlement.setId(auditProecess.getSrcBillId());
-						R settlementR = financeClient.details(auditProecess.getSrcBillId());
-						if (settlementR.isSuccess()) {
-							ObjectMapper objectMapper = new ObjectMapper();
-							Settlement settlement1 = objectMapper.convertValue(settlementR.getData(), Settlement.class);
-							SettlementDTO settlementDTO = new SettlementDTO();
-							settlementDTO.setId(settlement1.getId());
-							settlementDTO.setItemsList(settlement1.getItemsList());
-							settlementDTO.setSrcOrderno(settlement1.getSrcOrderno());
-							settlementDTO.setAmount(settlement1.getAmount());
-							settlementDTO.setBillType("付费");
-							settlementDTO.setCaseOverPayment(settlement1.getCaseOverPayment());
-							settlementDTO.setCheckStatus(settlement1.getCheckStatus());
-							settlementDTO.setCorpId(settlement1.getCorpId());
-							settlementDTO.setCreateTime(settlement1.getCreateTime());
-							settlementDTO.setCreateUser(settlement1.getCreateUser());
-							settlementDTO.setCreateUserName(settlement1.getCreateUserName());
-							settlementDTO.setCustomerModel(settlement1.getCustomerModel());
-							settlementDTO.setDc(settlement1.getDc());
-
-							settlementDTO.setFinanceStatus(settlement1.getFinanceStatus());
-
-							settlementDTO.setPageLabel(settlement1.getPageLabel());
-							settlementDTO.setOverPayment(settlement1.getOverPayment());
-							settlementDTO.setPageStatus(settlement1.getPageStatus());
-							settlementDTO.setSettlementType(settlement1.getSettlementType());
-							settlementDTO.setSrcBillId(settlement1.getSrcBillId());
-							settlementDTO.setSysNo(settlement1.getSysNo());
-							settlementDTO.setTenantId(settlement1.getTenantId());
-							settlementDTO.setUrl(settlement1.getUrl());
-							R saveR = financeClient.saveOrEdit(settlementDTO);
-							if (saveR.isSuccess()) {
-
-								R roleId = sysClient.getRoleIds(AuthUtil.getTenantId(), "财务出纳");
-								if (roleId.isSuccess() && ObjectUtils.isNotNull(roleId.getData())) {
-									R<List<User>> userList = iUserSearchClient.listByRole(roleId.getData().toString());
-									if (userList.isSuccess() && ObjectUtils.isNotNull(userList.getData())) {
-										for (User user : userList.getData()) {
-											//信息
-											Message message = new Message();
-											message.setParameter(String.valueOf(auditProecess.getBillId()));
-											message.setUserName(AuthUtil.getUserName());
-											message.setUserId(AuthUtil.getUserId());
-											message.setToUserId(user.getId());
-											message.setToUserName(user.getName());
-											message.setMessageType(1);
-											message.setTenantId(AuthUtil.getTenantId());
-											message.setCreateUser(AuthUtil.getUserId());
-											message.setCreateTime(new Date());
-											message.setUrl(auditProecess.getUrl());
-											message.setPageLabel(auditProecess.getPageLabel());
-											message.setPageStatus(auditProecess.getPageStatus());
-											message.setMessageBody("付费请核已通过" + ",采购订单号:" + proecessTemp.getBillNo() + ",请继续操作");
-											R messageR = messageClient.save(message);
-											if (!messageR.isSuccess()) {
-												throw new SecurityException("发送消息失败");
-											}
+				String status = sysClient.getParamService("domestic.trade");
+				//判断等于空的或不等与1的为达沃特及内贸不走该流程
+				if ("获取数据失败".equals(status) || ObjectUtils.isNull(status) || !"1".equals(status)) {
+					Settlement settlement = new Settlement();
+					settlement.setId(auditProecess.getSrcBillId());
+					R settlementR = financeClient.details(auditProecess.getSrcBillId());
+					if (settlementR.isSuccess()) {
+						ObjectMapper objectMapper = new ObjectMapper();
+						Settlement settlement1 = objectMapper.convertValue(settlementR.getData(), Settlement.class);
+						SettlementDTO settlementDTO = new SettlementDTO();
+						settlementDTO.setId(settlement1.getId());
+						settlementDTO.setItemsList(settlement1.getItemsList());
+						settlementDTO.setSrcOrderno(settlement1.getSrcOrderno());
+						settlementDTO.setAmount(settlement1.getAmount());
+						settlementDTO.setBillType("付费");
+						settlementDTO.setCaseOverPayment(settlement1.getCaseOverPayment());
+						settlementDTO.setCheckStatus(settlement1.getCheckStatus());
+						settlementDTO.setCorpId(settlement1.getCorpId());
+						settlementDTO.setCreateTime(settlement1.getCreateTime());
+						settlementDTO.setCreateUser(settlement1.getCreateUser());
+						settlementDTO.setCreateUserName(settlement1.getCreateUserName());
+						settlementDTO.setCustomerModel(settlement1.getCustomerModel());
+						settlementDTO.setDc(settlement1.getDc());
+
+						settlementDTO.setFinanceStatus(settlement1.getFinanceStatus());
+
+						settlementDTO.setPageLabel(settlement1.getPageLabel());
+						settlementDTO.setOverPayment(settlement1.getOverPayment());
+						settlementDTO.setPageStatus(settlement1.getPageStatus());
+						settlementDTO.setSettlementType(settlement1.getSettlementType());
+						settlementDTO.setSrcBillId(settlement1.getSrcBillId());
+						settlementDTO.setSysNo(settlement1.getSysNo());
+						settlementDTO.setTenantId(settlement1.getTenantId());
+						settlementDTO.setUrl(settlement1.getUrl());
+						R saveR = financeClient.saveOrEdit(settlementDTO);
+						if (saveR.isSuccess()) {
+
+							R roleId = sysClient.getRoleIds(AuthUtil.getTenantId(), "财务出纳");
+							if (roleId.isSuccess() && ObjectUtils.isNotNull(roleId.getData())) {
+								R<List<User>> userList = iUserSearchClient.listByRole(roleId.getData().toString());
+								if (userList.isSuccess() && ObjectUtils.isNotNull(userList.getData())) {
+									for (User user : userList.getData()) {
+										//信息
+										Message message = new Message();
+										message.setParameter(String.valueOf(auditProecess.getBillId()));
+										message.setUserName(AuthUtil.getUserName());
+										message.setUserId(AuthUtil.getUserId());
+										message.setToUserId(user.getId());
+										message.setToUserName(user.getName());
+										message.setMessageType(1);
+										message.setTenantId(AuthUtil.getTenantId());
+										message.setCreateUser(AuthUtil.getUserId());
+										message.setCreateTime(new Date());
+										message.setUrl(auditProecess.getUrl());
+										message.setPageLabel(auditProecess.getPageLabel());
+										message.setPageStatus(auditProecess.getPageStatus());
+										message.setMessageBody("付费请核已通过" + ",采购订单号:" + proecessTemp.getBillNo() + ",请继续操作");
+										R messageR = messageClient.save(message);
+										if (!messageR.isSuccess()) {
+											throw new SecurityException("发送消息失败");
 										}
-									} else {
-										throw new SecurityException("发送消息失败102");
 									}
-
 								} else {
-									throw new SecurityException("发送消息失败101");
+									throw new SecurityException("发送消息失败102");
 								}
 
 							} else {
-								throw new SecurityException("生成账单保存失败");
+								throw new SecurityException("发送消息失败101");
 							}
+
 						} else {
-							throw new SecurityException("生成账单失败");
+							throw new SecurityException("生成账单保存失败");
 						}
+					} else {
+						throw new SecurityException("生成账单失败");
 					}
 				}
-
 			}
 			//不通过
 			else if (operate == 2) {

blade-service/blade-client/src/main/java/org/springblade/client/goods/controller/GoodsDescController.java

@@ -59,6 +59,7 @@ import org.springblade.purchase.sales.feign.IOrderItemsClient;
 import org.springblade.stock.entity.StockGoods;
 import org.springblade.stock.feign.IStockGoodsClient;
 import org.springblade.stock.vo.StockGoodsVO;
+import org.springblade.system.feign.ISysClient;
 import org.springframework.beans.BeanUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -111,6 +112,8 @@ public class GoodsDescController extends BladeController {
 
 	private final IPriceBankClient priceBankClient;
 
+	private final ISysClient sysClient;
+
 	/**
 	 * 详情
 	 */
@@ -253,13 +256,15 @@ public class GoodsDescController extends BladeController {
 			}
 			String finalShoppingMall = shoppingMall;
 			List<GoodsType> finalTypes = types;
+			String domesticTrade = sysClient.getParamService("domestic.trade");
 			iPage.getRecords().forEach(e -> {
 				List<GoodsType> list = finalTypes.stream().filter(i -> e.getGoodsTypeId().contains(i.getId() + "")).collect(Collectors.toList());
 				if (CollectionUtils.isNotEmpty(list)) {
 					List<String> typeStr = list.stream().map(GoodsType::getCname).collect(Collectors.toList());
 					e.setGoodsTypeName(typeStr.toString().replace("[", "").replace("]", ""));
 				}
-				if ("681169".equals(AuthUtil.getTenantId()) || "941197".equals(AuthUtil.getTenantId())) {
+				//判断 是否等于内贸
+				if ("1".equals(domesticTrade)) {
 					e.setPolicyName(salesPolicyClient.getPolicyName(e.getId()));
 				}
 				e.setShoppingMall(finalShoppingMall);

blade-service/blade-client/src/main/java/org/springblade/client/scheduled/CorpsProfitTimer.java

@@ -50,7 +50,7 @@ public class CorpsProfitTimer {
 		LambdaQueryWrapper<CorpsDesc> corpsDescLambdaQueryWrapper = new LambdaQueryWrapper<>();
 		corpsDescLambdaQueryWrapper
 			.eq(CorpsDesc::getIsDeleted, 0)
-			.eq(CorpsDesc::getTenantId, "681169");
+			.apply("find_in_set(tenant_id,'681169,941197')");
 		List<CorpsDesc> corpsDescList = corpsDescService.list(corpsDescLambdaQueryWrapper);
 		if (CollectionUtils.isNotEmpty(corpsDescList)) {
 			List<CorpsDesc> descList = corpsDescList.stream().filter(e -> e.getMonthProfit() != null).collect(Collectors.toList());
@@ -69,6 +69,7 @@ public class CorpsProfitTimer {
 					basicCorpsProfitChange.setChangeProfitReturn(monthProfit == null ? BigDecimal.ZERO : monthProfit);
 					basicCorpsProfitChange.setChangeSurplusProfit(monthProfit == null ? BigDecimal.ZERO : monthProfit);
 					basicCorpsProfitChange.setChangeMonthProfit(monthProfit.negate());
+					basicCorpsProfitChange.setTenantId(e.getTenantId());
 					basicCorpsProfitChangeService.save(basicCorpsProfitChange);
 				});
 			}

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/service/impl/DeliveryItemsServiceImpl.java

@@ -226,6 +226,7 @@ public class DeliveryItemsServiceImpl extends ServiceImpl<DeliveryItemsMapper, D
 		if (CollectionUtils.isNotEmpty(collect)) {
 			List<DeliveryItems> deliveryItemsList1 = new ArrayList<>();
 			List<StockGoods> stockGoodsList1 = new ArrayList<>();
+			String domesticTrade = sysClient.getParamService("domestic.trade");
 			for (DeliveryItems deliveryItems : reducelList) {
 				BigDecimal oldOrderQuantity = deliveryItems.getActualQuantity();
 				// 原单据的订货数量
@@ -253,7 +254,7 @@ public class DeliveryItemsServiceImpl extends ServiceImpl<DeliveryItemsMapper, D
 				StockGoods stockGoods = null;
 				StockGoodsVO stock = null;
 				StockGoods goods = null;
-				if ("681169".equals(AuthUtil.getTenantId())) {
+				if ("1".equals(domesticTrade)) {
 					goods = stockGoodsList.stream().filter(s ->
 						s.getGoodsId().equals(deliveryItems.getItemId())
 							&& s.getTradeType().equals("GN")
@@ -261,19 +262,7 @@ public class DeliveryItemsServiceImpl extends ServiceImpl<DeliveryItemsMapper, D
 							&& s.getStorageId().equals(deliveryItems.getStorageId())
 					).findFirst().orElse(null);
 				} else {
-					if (ObjectUtils.isNotNull(sysClient.getParamService("synchronous"))
-						&& "1".equals(sysClient.getParamService("synchronous"))) {
-						goods = stockGoodsList.stream().filter(s ->
-							s.getGoodsId().equals(deliveryItems.getItemId())
-								&& s.getTradeType().equals("GN")
-								&& s.getCorpId().equals(delivery.getCorpId())
-								&& s.getWarehouseId().equals(delivery.getStorageId())
-								&& s.getStorageId().equals(deliveryItems.getStorageId())
-						).findFirst().orElse(null);
-						stock = this.getStock(delivery.getTradeType(), deliveryItems.getCorpId(), delivery.getStorageId(), deliveryItems);
-					} else {
-						stock = this.getStock(delivery.getTradeType(), deliveryItems.getCorpId(), delivery.getStorageId(), deliveryItems);
-					}
+					stock = this.getStock(delivery.getTradeType(), deliveryItems.getCorpId(), delivery.getStorageId(), deliveryItems);
 				}
 
 				// todo 国内贸易暂定不更新库存
@@ -289,7 +278,6 @@ public class DeliveryItemsServiceImpl extends ServiceImpl<DeliveryItemsMapper, D
 						//新增库存账
 						throw new RuntimeException("库存为空");
 					}
-
 				} else {
 					if (ObjectUtils.isNotNull(sysClient.getParamService("inventory")) && "1".equals(sysClient.getParamService("inventory"))) {
 						// 发货
@@ -306,28 +294,19 @@ public class DeliveryItemsServiceImpl extends ServiceImpl<DeliveryItemsMapper, D
 					}
 				}
 				//更新发货明细库存字段
-				if ("681169".equals(AuthUtil.getTenantId())) {
+				if ("1".equals(domesticTrade)) {
 					if (goods != null) {
 						deliveryItems.setInventoryNumber(goods.getSurplusRouteQuantity());
 					} else {
 						deliveryItems.setInventoryNumber(BigDecimal.ZERO);
 					}
 				} else {
-					if (ObjectUtils.isNotNull(sysClient.getParamService("synchronous"))
-						&& "1".equals(sysClient.getParamService("synchronous"))) {
-						if (goods != null) {
-							deliveryItems.setInventoryNumber(goods.getSurplusRouteQuantity());
-						} else {
-							deliveryItems.setInventoryNumber(BigDecimal.ZERO);
-						}
+					if (stockGoods != null) {
+						deliveryItems.setInventoryNumber(stockGoods.getSurplusRouteQuantity());
+					} else if (stock != null) {
+						deliveryItems.setInventoryNumber(stock.getSurplusRouteQuantity());
 					} else {
-						if (stockGoods != null) {
-							deliveryItems.setInventoryNumber(stockGoods.getSurplusRouteQuantity());
-						} else if (stock != null) {
-							deliveryItems.setInventoryNumber(stock.getSurplusRouteQuantity());
-						} else {
-							deliveryItems.setInventoryNumber(BigDecimal.ZERO);
-						}
+						deliveryItems.setInventoryNumber(BigDecimal.ZERO);
 					}
 				}
 				if (ObjectUtils.isNotNull(stockGoods)) {
@@ -336,7 +315,7 @@ public class DeliveryItemsServiceImpl extends ServiceImpl<DeliveryItemsMapper, D
 				if (ObjectUtils.isNotNull(goods)) {
 					stockGoodsList1.add(goods);
 				}
-				if ("681169".equals(AuthUtil.getTenantId())) {
+				if ("1".equals(domesticTrade)) {
 					if (ObjectUtils.isNotNull(stock)) {
 						stockGoodsList1.add(stock);
 					}
@@ -551,23 +530,22 @@ public class DeliveryItemsServiceImpl extends ServiceImpl<DeliveryItemsMapper, D
 		if (stockGoods.getOutQuantity().compareTo(deliveryItems.getActualQuantity()) < 0) {
 			throw new RuntimeException("当前可减少出库数量为:" + stockGoods.getOutQuantity() + "小于发货数量,发货数量为:" + deliveryItems.getActualQuantity());
 		}
+		String domesticTrade = sysClient.getParamService("domestic.trade");
 		if (DeliveryEnum.REPEAL.getType().equals(deliveryType)) {
 			stockGoods.setBalanceQuantity(stockGoods.getBalanceQuantity().add(deliveryItems.getArrivalQuantity()));//结余数量 加
-			if (ObjectUtils.isNotNull(sysClient.getParamService("synchronous"))
-				&& "1".equals(sysClient.getParamService("synchronous"))) {
+			if ("1".equals(domesticTrade)) {
 				stockGoods.setLockingQuantity(stockGoods.getLockingQuantity().add(deliveryItems.getActualQuantity()));//锁定数量 加
 				stockGoods.setSurplusRouteQuantity(stockGoods.getBalanceQuantity().subtract(stockGoods.getLockingQuantity()));//可用数量 加
 				stockGoods.setBalanceAmount(stockGoods.getBalanceAmount().add(deliveryItems.getPurchaseTotalAmount()));
 			}
 		} else {
 			stockGoods.setBalanceQuantity(stockGoods.getBalanceQuantity().subtract(deliveryItems.getArrivalQuantity()));//结余数量 加
-			if (ObjectUtils.isNotNull(sysClient.getParamService("synchronous"))
-				&& "1".equals(sysClient.getParamService("synchronous"))) {
+			if ("1".equals(domesticTrade)) {
 				stockGoods.setLockingQuantity(stockGoods.getLockingQuantity().subtract(deliveryItems.getActualQuantity()));//锁定数量 加
 				stockGoods.setSurplusRouteQuantity(stockGoods.getBalanceQuantity().subtract(stockGoods.getLockingQuantity()));//可用数量 加
 			}
 		}
-		if ("681169".equals(AuthUtil.getTenantId())) {
+		if ("1".equals(domesticTrade)) {
 			stockGoods.setOutAmount(stockGoods.getOutAmount().subtract(deliveryItems.getDeliveryAmount()));//出库金额减
 		} else {
 			stockGoods.setOutAmount(stockGoods.getOutAmount().subtract(deliveryItems.getContractAmount()));//出库金额减
@@ -608,8 +586,9 @@ public class DeliveryItemsServiceImpl extends ServiceImpl<DeliveryItemsMapper, D
 		if (stockGoods == null) {
 			throw new RuntimeException("库存账不存在");
 		}
+		String domesticTrade = sysClient.getParamService("domestic.trade");
 		BigDecimal actualQuantity = new BigDecimal("0.00");
-		if ("681169".equals(AuthUtil.getTenantId())) {
+		if ("1".equals(domesticTrade)) {
 			actualQuantity = deliveryItems.getActualQuantity() == null ? new BigDecimal("0") : deliveryItems.getArrivalQuantity();
 		} else {
 			actualQuantity = deliveryItems.getActualQuantity() == null ? new BigDecimal("0") : deliveryItems.getActualQuantity();
@@ -637,10 +616,11 @@ public class DeliveryItemsServiceImpl extends ServiceImpl<DeliveryItemsMapper, D
 				stockGoods.setBalanceVolumn(stockGoods.getBalanceVolumn().subtract(billWeight));//结余码单重量 减
 			}
 		} else {
-			stockGoods.setBalanceQuantity(stockGoods.getBalanceQuantity().subtract(actualQuantity));//结余数量 减
-			stockGoods.setSurplusRouteQuantity(stockGoods.getSurplusRouteQuantity().subtract(actualQuantity));//可用数量 减
+			stockGoods.setBalanceQuantity(stockGoods.getBalanceQuantity().add(actualQuantity));//结余数量 减
+			stockGoods.setSurplusRouteQuantity(stockGoods.getSurplusRouteQuantity().add(actualQuantity));//可用数量 减
+			stockGoods.setLockingQuantity(stockGoods.getLockingQuantity().add(actualQuantity));//可用数量 减
 			if (ObjectUtils.isNotNull(stockGoods.getBalanceAmount())) {
-				stockGoods.setBalanceAmount(stockGoods.getBalanceAmount().subtract(deliveryItems.getDeliveryAmount()));
+				stockGoods.setBalanceAmount(stockGoods.getBalanceAmount().add(deliveryItems.getDeliveryAmount()));
 			} else {
 				stockGoods.setBalanceAmount(deliveryItems.getDeliveryAmount());
 			}
@@ -684,8 +664,9 @@ public class DeliveryItemsServiceImpl extends ServiceImpl<DeliveryItemsMapper, D
 				stockGoods.setBalanceVolumn(stockGoods.getBalanceVolumn() != null ? stockGoods.getBalanceVolumn().add(deliveryItems.getBillWeight()) : new BigDecimal("0").add(deliveryItems.getBillWeight()));//结余码单重量 加
 			}
 		} else {
+			String domesticTrade = sysClient.getParamService("domestic.trade");
 			if ("CG".equals(deliveryItems.getBillType())) {
-				if ("681169".equals(AuthUtil.getTenantId())) {
+				if ("1".equals(domesticTrade)) {
 					stockGoods.setBalanceQuantity(stockGoods.getBalanceQuantity().subtract(deliveryItems.getActualQuantity()));//结余数量
 					stockGoods.setSurplusRouteQuantity(stockGoods.getSurplusRouteQuantity().add(deliveryItems.getPrimaryQuantiy().subtract(deliveryItems.getActualQuantity())));//可用数量
 
@@ -710,7 +691,7 @@ public class DeliveryItemsServiceImpl extends ServiceImpl<DeliveryItemsMapper, D
 					}
 				}
 			} else {
-				if ("681169".equals(AuthUtil.getTenantId())) {
+				if ("1".equals(domesticTrade)) {
 					stockGoods.setBalanceQuantity(stockGoods.getBalanceQuantity().subtract(deliveryItems.getArrivalQuantity()));//结余数量
 					stockGoods.setSurplusRouteQuantity(stockGoods.getBalanceQuantity().subtract(stockGoods.getLockingQuantity()));//可用数量
 				}

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/service/impl/DeliveryServiceImpl.java

@@ -175,17 +175,12 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
 	public R<Delivery> submitDelivery(Delivery delivery) {
 		String status = null;//订单状态
-		if ("681169".equals(AuthUtil.getTenantId())) {
+		String domesticTrade = sysClient.getParamService("domestic.trade");
+		//判断 等于内贸的走校验
+		if ("1".equals(domesticTrade)) {
 			if (ObjectUtil.isEmpty(delivery.getSalesCompany())) {
 				throw new SecurityException("单据所属公司不能为空");
 			}
-		} else {
-			if (ObjectUtils.isNotNull(sysClient.getParamService("synchronous"))
-				&& "1".equals(sysClient.getParamService("synchronous"))) {
-				if (ObjectUtil.isEmpty(delivery.getSalesCompany())) {
-					throw new SecurityException("单据所属公司不能为空");
-				}
-			}
 		}
 		if (StringUtils.isBlank(delivery.getDeliveryStatus())) {
 			status = DeliveryStatusEnum.REPEAL.getType();
@@ -440,26 +435,18 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 		baseMapper.updateById(select);
 
 		String billStatus = null;//订单状态
-		if ("681169".equals(AuthUtil.getTenantId())) {
+		String domesticTrade = sysClient.getParamService("domestic.trade");
+		if ("1".equals(domesticTrade)) {
 			if (delivery.getDeliveryType() != null && delivery.getDeliveryType().equals(DeliveryEnum.DELIVER.getType())) {
 				billStatus = DeliveryStatusEnum.DELIVER.getType();
 			} else if (delivery.getDeliveryType() != null && delivery.getDeliveryType().equals(DeliveryEnum.REPEAL.getType())) {
 				billStatus = DeliveryStatusEnum.REPEAL.getType();
 			}
 		} else {
-			if (ObjectUtils.isNotNull(sysClient.getParamService("synchronous"))
-				&& "1".equals(sysClient.getParamService("synchronous"))) {
-				if (delivery.getDeliveryType() != null && delivery.getDeliveryType().equals(DeliveryEnum.DELIVER.getType())) {
-					billStatus = DeliveryStatusEnum.DELIVER.getType();
-				} else if (delivery.getDeliveryType() != null && delivery.getDeliveryType().equals(DeliveryEnum.REPEAL.getType())) {
-					billStatus = DeliveryStatusEnum.REPEAL.getType();
-				}
-			} else {
-				if (delivery.getDeliveryType() != null && delivery.getDeliveryType().equals(DeliveryEnum.DELIVER.getType())) {
-					billStatus = DeliveryStatusEnum.REVOCATION.getType();
-				} else if (delivery.getDeliveryType() != null && delivery.getDeliveryType().equals(DeliveryEnum.REPEAL.getType())) {
-					billStatus = DeliveryStatusEnum.REPEAL.getType();
-				}
+			if (delivery.getDeliveryType() != null && delivery.getDeliveryType().equals(DeliveryEnum.DELIVER.getType())) {
+				billStatus = DeliveryStatusEnum.REVOCATION.getType();
+			} else if (delivery.getDeliveryType() != null && delivery.getDeliveryType().equals(DeliveryEnum.REPEAL.getType())) {
+				billStatus = DeliveryStatusEnum.REPEAL.getType();
 			}
 		}
 		if (delivery.getId() == null) {
@@ -476,7 +463,7 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 			baseMapper.insert(delivery);
 		} else {
 			Delivery deliverys = baseMapper.selectById(delivery.getId());//查询原始单据
-			if ("681169".equals(AuthUtil.getTenantId())) {
+			if ("1".equals(domesticTrade)) {
 				if (delivery.getDeliveryType().equals(DeliveryEnum.DELIVER.getType()) && delivery.getDeliveryStatus().equals(DeliveryStatusEnum.DELIVER.getType())) {
 					//发货
 					throw new RuntimeException("已收货请勿重复收货");
@@ -485,25 +472,13 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 					throw new RuntimeException("已撤销收货请勿重复撤销收货");
 				}
 			} else {
-				if (ObjectUtils.isNotNull(sysClient.getParamService("synchronous"))
-					&& "1".equals(sysClient.getParamService("synchronous"))) {
-					if (delivery.getDeliveryType().equals(DeliveryEnum.DELIVER.getType()) && delivery.getDeliveryStatus().equals(DeliveryStatusEnum.DELIVER.getType())) {
-						//发货
-						throw new RuntimeException("已收货请勿重复收货");
-					} else if (delivery.getDeliveryType().equals(DeliveryEnum.REPEAL.getType()) && !delivery.getDeliveryStatus().equals(DeliveryStatusEnum.DELIVER.getType())) {
-						//撤销发货
-						throw new RuntimeException("已撤销收货请勿重复撤销收货");
-					}
-				} else {
-					if (delivery.getDeliveryType().equals(DeliveryEnum.DELIVER.getType()) && delivery.getDeliveryStatus().equals(DeliveryStatusEnum.REVOCATION.getType())) {
-						//发货
-						throw new RuntimeException("已收货请勿重复收货");
-					} else if (delivery.getDeliveryType().equals(DeliveryEnum.REPEAL.getType()) && !delivery.getDeliveryStatus().equals(DeliveryStatusEnum.REVOCATION.getType())) {
-						//撤销发货
-						throw new RuntimeException("已撤销收货请勿重复撤销收货");
-					}
+				if (delivery.getDeliveryType().equals(DeliveryEnum.DELIVER.getType()) && delivery.getDeliveryStatus().equals(DeliveryStatusEnum.REVOCATION.getType())) {
+					//发货
+					throw new RuntimeException("已收货请勿重复收货");
+				} else if (delivery.getDeliveryType().equals(DeliveryEnum.REPEAL.getType()) && !delivery.getDeliveryStatus().equals(DeliveryStatusEnum.REVOCATION.getType())) {
+					//撤销发货
+					throw new RuntimeException("已撤销收货请勿重复撤销收货");
 				}
-
 			}
 
 			delivery.setDeliveryStatus(billStatus);
@@ -517,29 +492,19 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 				delivery.setFreightQuantity(delivery.getTotalQuantity());
 				delivery.setFreightTime(date);
 				delivery.setFreightUser(AuthUtil.getUserName());
-				if ("681169".equals(AuthUtil.getTenantId())) {
+				if ("1".equals(domesticTrade)) {
 					orderTemp.setReceivingStatus("已收货");
 				} else {
-					if (ObjectUtils.isNotNull(sysClient.getParamService("synchronous"))
-						&& "1".equals(sysClient.getParamService("synchronous"))) {
-						orderTemp.setReceivingStatus("已收货");
-					} else {
-						orderTemp.setOrderStatus("已完成");
-					}
+					orderTemp.setOrderStatus("已完成");
 					orderTemp.setActualDeliveryDate(date);
 				}
 				orderTemp.setDeliverQuantity(delivery.getTotalQuantity());
 				orderTemp.setDeliverTime(date);
 			} else {
-				if ("681169".equals(AuthUtil.getTenantId())) {
+				if ("1".equals(domesticTrade)) {
 					orderTemp.setReceivingStatus("已收货");
 				} else {
-					if (ObjectUtils.isNotNull(sysClient.getParamService("synchronous"))
-						&& "1".equals(sysClient.getParamService("synchronous"))) {
-						orderTemp.setReceivingStatus("已收货");
-					} else {
-						orderTemp.setOrderStatus("待发货");
-					}
+					orderTemp.setOrderStatus("待发货");
 					orderTemp.setActualDeliveryDate(null);
 				}
 				orderTemp.setDeliverQuantity(BigDecimal.ZERO);
@@ -600,6 +565,7 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 			delivery.setVersion(version);
 		}
 		String billStatus = null;//订单状态
+		String domesticTrade = sysClient.getParamService("domestic.trade");
 		if (delivery.getDeliveryType() != null && delivery.getDeliveryType().equals(DeliveryEnum.TAKE.getType())) {
 			billStatus = DeliveryStatusEnum.HAVWARRIVED.getType();
 		} else if (delivery.getDeliveryType() != null && delivery.getDeliveryType().equals(DeliveryEnum.REVOCATION.getType())) {
@@ -625,8 +591,8 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 			{
 				throw new RuntimeException("已撤销收货请勿重复撤销收货");
 			}
-			if (select.getDeliveryStatus() != null && select.getDeliveryStatus().equals(DeliveryStatusEnum.HAVWARRIVED.getType()) && "681169".equals(AuthUtil.getTenantId())) {
-				throw new SecurityException("此单据已生成凭证,禁止撤销");
+			if (select.getDeliveryStatus() != null && select.getDeliveryStatus().equals(DeliveryStatusEnum.HAVWARRIVED.getType()) && "1".equals(domesticTrade)) {
+				throw new SecurityException("此单据已到货,禁止撤销");
 			}
 			delivery.setDeliveryStatus(billStatus);
 			delivery.setUpdateUser(SecureUtil.getUserId());
@@ -646,15 +612,10 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 			} else if (DeliveryEnum.REVOCATION.getType().equals(delivery.getDeliveryType())) {
 				Order order = new Order();
 				order.setId(delivery.getOrgId());
-				if ("681169".equals(AuthUtil.getTenantId())) {
+				if ("1".equals(domesticTrade)) {
 					order.setOrderStatus("未完成");
 				} else {
-					if (ObjectUtils.isNotNull(sysClient.getParamService("synchronous"))
-						&& "1".equals(sysClient.getParamService("synchronous"))) {
-						order.setOrderStatus("未完成");
-					} else {
-						order.setOrderStatus("待发货");
-					}
+					order.setOrderStatus("待发货");
 				}
 				order.setArrivalTime(null);
 				orderDescClient.updateOrder(order);
@@ -763,8 +724,8 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 			select.setVersion(version);
 			delivery.setVersion(version);
 		}
-
-		if ("681169".equals(AuthUtil.getTenantId())) {
+		String domesticTrade = sysClient.getParamService("domestic.trade");
+		if ("1".equals(domesticTrade)) {
 			if (ObjectUtil.isEmpty(select.getCorpId())) {
 				throw new SecurityException("供应商必填");
 			}
@@ -783,28 +744,6 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 			if (ObjectUtil.isEmpty(select.getCreateTime())) {
 				throw new SecurityException("入库时间必填");
 			}
-		} else {
-			if (ObjectUtils.isNotNull(sysClient.getParamService("synchronous"))
-				&& "1".equals(sysClient.getParamService("synchronous"))) {
-				if (ObjectUtil.isEmpty(select.getCorpId())) {
-					throw new SecurityException("供应商必填");
-				}
-				if (ObjectUtil.isEmpty(select.getPurchaseMode())) {
-					throw new SecurityException("采购方式必填");
-				}
-				if (ObjectUtil.isEmpty(select.getSalesCompany())) {
-					throw new SecurityException("所属公司必填");
-				}
-				if (ObjectUtil.isEmpty(select.getWarehouseType())) {
-					throw new SecurityException("仓库类型必填");
-				}
-				if (ObjectUtil.isEmpty(select.getStorageId())) {
-					throw new SecurityException("仓库名称必填");
-				}
-				if (ObjectUtil.isEmpty(select.getCreateTime())) {
-					throw new SecurityException("入库时间必填");
-				}
-			}
 		}
 		Long corpId = select.getCorpId();
 
@@ -869,7 +808,7 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 
 		if (CollectionUtils.isNotEmpty(deliveryItemsList)) {
 			if ((ObjectUtils.isNotNull(sysClient.getParamService("inventory")) && "1".equals(sysClient.getParamService("inventory")))
-				|| "681169".equals(AuthUtil.getTenantId())) {
+				|| "1".equals(domesticTrade)) {
 				R<List<OrderItems>> r = iOrderItemsClient.selectList(select.getSrcId());
 				if (r.isSuccess() && ObjectUtils.isNotNull(r.getData())) {
 					List<DeliverStockGoods> stockGoodsList2 = new ArrayList<>();
@@ -951,7 +890,7 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 				stockGoodsLog.setTenantId(AuthUtil.getTenantId());
 				stockGoodsLog.setCreateUser(AuthUtil.getUserId());
 				stockGoodsLog.setCreateTime(date);
-				if ("681169".equals(AuthUtil.getTenantId())) {
+				if ("1".equals(domesticTrade)) {
 					// ===================增加益付款逻辑=========================
 					if (e.getPurchaseQuantity().compareTo(e.getActualQuantity()) > 0) {
 						BigDecimal number = e.getPurchaseQuantity().subtract(e.getActualQuantity());
@@ -969,29 +908,7 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 						list.add(overpaymentItem);
 					}
 					// ===================增加益付款逻辑=========================
-				} else {
-					if (ObjectUtils.isNotNull(sysClient.getParamService("synchronous"))
-						&& "1".equals(sysClient.getParamService("synchronous"))) {
-						// ===================增加益付款逻辑=========================
-						if (e.getPurchaseQuantity().compareTo(e.getActualQuantity()) > 0) {
-							BigDecimal number = e.getPurchaseQuantity().subtract(e.getActualQuantity());
-							BigDecimal price = e.getPurchaseAmount();
-							//需要处理的益付款=(差额数量 * 单价)
-							BigDecimal total = number.multiply(price);
-							//益付款明细
-							BusinessOverpaymentItem overpaymentItem = new BusinessOverpaymentItem();
-							overpaymentItem.setBillNo(select.getSrcOrderNo());
-							overpaymentItem.setSrcOrderNo(select.getSysNo());
-							overpaymentItem.setOrderNo(e.getContractNumber());
-							overpaymentItem.setSrcPid(select.getId());
-							overpaymentItem.setSrcId(e.getId());
-							overpaymentItem.setOverpayment(total);
-							list.add(overpaymentItem);
-						}
-						// ===================增加益付款逻辑=========================
-					}
 				}
-
 				//传入库存
 				BigDecimal inventoryNumber = e.getActualQuantity();
 				//传入发票重量
@@ -1027,7 +944,7 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 					throw new SecurityException("贸易类型未指定");
 				}
 				DeliverStockGoods stock = model;
-				if ("681169".equals(AuthUtil.getTenantId())) {
+				if ("1".equals(domesticTrade)) {
 					stockGoodsLog.setBalanceQuantityOld(stock.getBalanceQuantity());
 					stockGoodsLog.setSurplusRouteQuantityOld(stock.getSurplusRouteQuantity());
 					stockGoodsLog.setLockingQuantityOld(stock.getLockingQuantity());
@@ -1153,7 +1070,7 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 			if (!status) {
 				throw new RuntimeException("提交失败");
 			}
-			if ("681169".equals(AuthUtil.getTenantId())) {
+			if ("1".equals(domesticTrade)) {
 				// ===================增加益付款逻辑=========================
 				if (CollectionUtils.isNotEmpty(list)) {
 					BigDecimal itemTotal = list.stream().map(BusinessOverpaymentItem::getOverpayment).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
@@ -1170,32 +1087,12 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 					}
 				}
 				// ===================增加益付款逻辑=========================
-			} else {
-				if (ObjectUtils.isNotNull(sysClient.getParamService("synchronous"))
-					&& "1".equals(sysClient.getParamService("synchronous"))) {
-					// ===================增加益付款逻辑=========================
-					if (CollectionUtils.isNotEmpty(list)) {
-						BigDecimal itemTotal = list.stream().map(BusinessOverpaymentItem::getOverpayment).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
-						//益付款
-						Overpayment overpayment = new Overpayment();
-						overpayment.setCorpId(select.getCorpId());
-						overpayment.setType("add");
-						overpayment.setSrcPid(deliveryId);
-						overpayment.setAmount(itemTotal);
-						overpayment.setList(list);
-						R updateOverpayment = iBusinessOverpaymentClient.updateOverpayment(overpayment);
-						if (!updateOverpayment.isSuccess()) {
-							throw new SecurityException("收货失败:增加客户益付款报错");
-						}
-					}
-					// ===================增加益付款逻辑=========================
-				}
 			}
 		}
 
 		Date date = new Date();
 		Order orderStatus = orderDescClient.getById(select.getSrcId());
-		if ("681169".equals(AuthUtil.getTenantId())) {
+		if ("1".equals(domesticTrade)) {
 			delivery.setDeliveryStatus("已发货");
 			delivery.setFreightQuantity(select.getTotalQuantity());
 			delivery.setFreightTime(date);
@@ -1237,55 +1134,35 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 				throw new RuntimeException("提交失败");
 			}
 		} else {
-			if (ObjectUtils.isNotNull(sysClient.getParamService("inventory"))
-				&& "1".equals(sysClient.getParamService("inventory"))) {
-				delivery.setDeliveryStatus("已发货");
-				delivery.setFreightQuantity(select.getTotalQuantity());
-				delivery.setFreightTime(date);
-				delivery.setFreightUser(AuthUtil.getUserName());
-				baseMapper.updateById(delivery);
-				Order orderTemp = new Order();
-				orderTemp.setId(select.getOrgId());//采购主表id
-				orderTemp.setOrderStatus("待收货");
-				orderTemp.setActualDeliveryDate(date);
-				if (select.getTotalQuantity().compareTo(BigDecimal.ZERO) == 0) {
-					orderTemp.setDeliverQuantity(select.getTotalQuantity());
-				} else {
-					orderTemp.setDeliverQuantity(BigDecimal.ZERO);
-				}
-				orderTemp.setDeliverTime(date);
-				orderDescClient.updateOrder(orderTemp);
+			delivery.setDeliveryStatus("已收货");
+			delivery.setFreightQuantity(select.getTotalQuantity());
+			delivery.setFreightTime(date);
+			delivery.setFreightUser(AuthUtil.getUserName());
+			baseMapper.updateById(delivery);
+
+			Order temp = new Order();
+			temp.setId(select.getOrgId());//采购主表id
+			temp.setOrderStatus("待发货");
+			temp.setActualDeliveryDate(date);
+			if (select.getTotalQuantity().compareTo(BigDecimal.ZERO) == 0) {
+				temp.setDeliverQuantity(select.getTotalQuantity());
 			} else {
-				delivery.setDeliveryStatus("已收货");
-				delivery.setFreightQuantity(select.getTotalQuantity());
-				delivery.setFreightTime(date);
-				delivery.setFreightUser(AuthUtil.getUserName());
-				baseMapper.updateById(delivery);
+				temp.setDeliverQuantity(BigDecimal.ZERO);
+			}
+			temp.setDeliverTime(date);
+			orderDescClient.updateOrder(temp);
 
-				Order temp = new Order();
-				temp.setId(select.getOrgId());//采购主表id
-				temp.setOrderStatus("待发货");
-				temp.setActualDeliveryDate(date);
-				if (select.getTotalQuantity().compareTo(BigDecimal.ZERO) == 0) {
-					temp.setDeliverQuantity(select.getTotalQuantity());
-				} else {
-					temp.setDeliverQuantity(BigDecimal.ZERO);
-				}
-				temp.setDeliverTime(date);
-				orderDescClient.updateOrder(temp);
-
-				Order orderTemp = new Order();
-				orderTemp.setId(select.getSrcId());//销售主表id
-				orderTemp.setOrderStatus("已发货");
-				orderTemp.setActualDeliveryDate(date);
-				if (select.getTotalQuantity().compareTo(BigDecimal.ZERO) == 0) {
-					orderTemp.setDeliverQuantity(select.getTotalQuantity());
-				} else {
-					orderTemp.setDeliverQuantity(BigDecimal.ZERO);
-				}
-				orderTemp.setDeliverTime(date);
-				orderDescClient.updateOrder(orderTemp);
+			Order orderTemp = new Order();
+			orderTemp.setId(select.getSrcId());//销售主表id
+			orderTemp.setOrderStatus("已发货");
+			orderTemp.setActualDeliveryDate(date);
+			if (select.getTotalQuantity().compareTo(BigDecimal.ZERO) == 0) {
+				orderTemp.setDeliverQuantity(select.getTotalQuantity());
+			} else {
+				orderTemp.setDeliverQuantity(BigDecimal.ZERO);
 			}
+			orderTemp.setDeliverTime(date);
+			orderDescClient.updateOrder(orderTemp);
 		}
 
 		String finalBrand = brand;
@@ -1446,27 +1323,16 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 			select.setVersion(version);
 			delivery.setVersion(version);
 		}
-		if ("681169".equals(AuthUtil.getTenantId())) {
+		String domesticTrade = sysClient.getParamService("domestic.trade");
+		if ("1".equals(domesticTrade)) {
 			if (select.getDeliveryStatus() == null || !DeliveryStatusEnum.REVOCATION.getType().equals(select.getDeliveryStatus())) {
 				throw new SecurityException("此单据已撤回或者不存在,禁止重复操作");
 			}
 		} else {
-			if (ObjectUtils.isNotNull(sysClient.getParamService("synchronous"))
-				&& "1".equals(sysClient.getParamService("synchronous"))) {
-				if (select.getDeliveryStatus() == null || !DeliveryStatusEnum.REVOCATION.getType().equals(select.getDeliveryStatus())) {
-					throw new SecurityException("此单据已撤回或者不存在,禁止重复操作");
-				}
-			} else {
-				if (select.getDeliveryStatus() == null || !DeliveryStatusEnum.DELIVER.getType().equals(select.getDeliveryStatus())) {
-					throw new SecurityException("此单据已撤回或者不存在,禁止重复操作");
-				}
+			if (select.getDeliveryStatus() == null || !DeliveryStatusEnum.DELIVER.getType().equals(select.getDeliveryStatus())) {
+				throw new SecurityException("此单据已撤回或者不存在,禁止重复操作");
 			}
 		}
-
-		if (select.getDeliveryStatus() != null && DeliveryStatusEnum.REVOCATION.getType().equals(select.getDeliveryStatus()) && "681169".equals(AuthUtil.getTenantId())) {
-			throw new SecurityException("此单据已生成凭证,禁止撤销");
-		}
-
 		List<DeliveryItems> deliveryItemsList = delivery.getDeliveryItemsList();
 		//从缓存中获得库存
 //		List<StockGoods> stockGoodsList = stockGoodsClient.selectStockGoodsAll();
@@ -1478,7 +1344,7 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 			List<DeliverStockGoods> stockGoodsList1 = new ArrayList<>();
 			List<DeliveryItems> deliveryItemsList1 = new ArrayList<>();
 			for (DeliveryItems e : deliveryItemsList) {
-				if ("681169".equals(AuthUtil.getTenantId())) {
+				if ("1".equals(domesticTrade)) {
 					// ===================撤回益付款逻辑=========================
 					if (e.getPurchaseQuantity().compareTo(e.getActualQuantity()) > 0) {
 						BigDecimal number = e.getPurchaseQuantity().subtract(e.getActualQuantity());
@@ -1496,27 +1362,6 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 						list.add(overpaymentItem);
 					}
 					// ===================撤回益付款逻辑=========================
-				} else {
-					if (ObjectUtils.isNotNull(sysClient.getParamService("synchronous"))
-						&& "1".equals(sysClient.getParamService("synchronous"))) {
-						// ===================撤回益付款逻辑=========================
-						if (e.getPurchaseQuantity().compareTo(e.getActualQuantity()) > 0) {
-							BigDecimal number = e.getPurchaseQuantity().subtract(e.getActualQuantity());
-							BigDecimal price = e.getPurchaseAmount();
-							//需要处理的益付款=(差额数量 * 单价)
-							BigDecimal total = number.multiply(price);
-							//益付款明细
-							BusinessOverpaymentItem overpaymentItem = new BusinessOverpaymentItem();
-							overpaymentItem.setBillNo(select.getSrcOrderNo());
-							overpaymentItem.setSrcOrderNo(select.getSysNo());
-							overpaymentItem.setOrderNo(e.getContractNumber());
-							overpaymentItem.setSrcPid(select.getId());
-							overpaymentItem.setSrcId(e.getId());
-							overpaymentItem.setOverpayment(total);
-							list.add(overpaymentItem);
-						}
-						// ===================撤回益付款逻辑=========================
-					}
 				}
 
 
@@ -1585,7 +1430,7 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 			if (!res.isSuccess()) {
 				throw new SecurityException(res.getMsg());
 			}
-			if ("681169".equals(AuthUtil.getTenantId())) {
+			if ("1".equals(domesticTrade)) {
 				Long corpId = select.getCorpId();
 				// ===================撤回添加益付款逻辑=========================
 				if (CollectionUtils.isNotEmpty(list)) {
@@ -1603,27 +1448,6 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 					}
 				}
 				// ===================撤回添加益付款逻辑=========================
-			} else {
-				if (ObjectUtils.isNotNull(sysClient.getParamService("synchronous"))
-					&& "1".equals(sysClient.getParamService("synchronous"))) {
-					Long corpId = select.getCorpId();
-					// ===================撤回添加益付款逻辑=========================
-					if (CollectionUtils.isNotEmpty(list)) {
-						BigDecimal itemTotal = list.stream().map(BusinessOverpaymentItem::getOverpayment).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
-						//益付款
-						Overpayment overpayment = new Overpayment();
-						overpayment.setCorpId(corpId);
-						overpayment.setType("repealAdd");
-						overpayment.setSrcPid(deliveryId);
-						overpayment.setAmount(itemTotal);
-						overpayment.setList(list);
-						R updateOverpayment = iBusinessOverpaymentClient.updateOverpayment(overpayment);
-						if (!updateOverpayment.isSuccess()) {
-							throw new SecurityException("收货失败:增加客户益付款报错");
-						}
-					}
-					// ===================撤回添加益付款逻辑=========================
-				}
 			}
 		}
 		//更新收货单状态为:录入
@@ -1631,15 +1455,10 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 
 		Order temp = new Order();//销售订单
 		temp.setId(select.getOrgId());
-		if ("681169".equals(AuthUtil.getTenantId())) {
+		if ("1".equals(domesticTrade)) {
 			temp.setOrderStatus("未完成");
 		} else {
-			if (ObjectUtils.isNotNull(sysClient.getParamService("synchronous"))
-				&& "1".equals(sysClient.getParamService("synchronous"))) {
-				temp.setOrderStatus("未完成");
-			} else {
-				temp.setOrderStatus("待发货");
-			}
+			temp.setOrderStatus("待发货");
 		}
 		temp.setDeliverQuantity(BigDecimal.ZERO);
 		orderDescClient.updateOrder(temp);
@@ -2055,8 +1874,8 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 		if (select == null) {
 			throw new SecurityException("未查到相关数据,操作失败");
 		}
-
-		if ("681169".equals(AuthUtil.getTenantId())) {
+		String domesticTrade = sysClient.getParamService("domestic.trade");
+		if ("1".equals(domesticTrade)) {
 			select.setWagonNumberStatus("1");
 			select.setWagonNumberOne(delivery.getWagonNumberOne());
 			select.setWagonNumberTwo(delivery.getWagonNumberTwo());
@@ -2089,8 +1908,8 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 		if (select == null) {
 			throw new SecurityException("未查到相关数据,操作失败");
 		}
-
-		if ("681169".equals(AuthUtil.getTenantId())) {
+		String domesticTrade = sysClient.getParamService("domestic.trade");
+		if ("1".equals(domesticTrade)) {
 			delivery.setWagonNumberStatus("0");
 			delivery.setWagonNumberOne(" ");
 			delivery.setWagonNumberTwo(" ");

blade-service/blade-los/src/main/java/org/springblade/los/business/aea/service/impl/AeaBillsServiceImpl.java

@@ -942,14 +942,6 @@ public class AeaBillsServiceImpl extends ServiceImpl<AeaBillsMapper, AeaBills> i
 			auditProecessDTO.setGrossProfitUsd(amountUsdD.subtract(amountUsdC));
 			auditProecessDTO.setGrossProfitLoc(auditProecessDTO.getGrossProfit().add(bCurrencyService.converterCny("USD", auditProecessDTO.getGrossProfitUsd(), "", "1")));
 			auditProecessDTO.setCustomizeOne(declare.getMblno());
-			Map<String, Object> map = dataProcessingUtil.profitStatus(declare.getId(), declare.getBusinessType(), feeCenterList);
-			if (ObjectUtils.isNotNull(map)) {
-				auditProecessDTO.setCustomizeTwo(map.get("profitStatusText").toString());
-				String errMsg = map.get("errorMessage").toString().trim();
-				if(!errMsg.isEmpty()){
-					throw new SecurityException(errMsg);
-				}
-			}
 			if ("AE".equals(declare.getBusinessType())) {
 				auditProecessDTO.setCustomizeThree(declare.getEtd());
 			} else if ("AI".equals(declare.getBusinessType())) {

blade-service/blade-los/src/main/java/org/springblade/los/business/amends/service/impl/AmendsServiceImpl.java

@@ -372,14 +372,6 @@ public class AmendsServiceImpl extends ServiceImpl<AmendsMapper, Amends> impleme
 				auditProecessDTO.setEtd(declare.getEta());
 			}
 			auditProecessDTO.setCustomizeOne(declare.getMblno());
-			Map<String, Object> map = dataProcessingUtil.profitStatus(declare.getId(), declare.getBusinessType(), feeCenterList);
-			if (ObjectUtils.isNotNull(map)) {
-				auditProecessDTO.setCustomizeTwo(map.get("profitStatusText").toString());
-				String errMsg = map.get("errorMessage").toString().trim();
-				if(!errMsg.isEmpty()){
-					throw new SecurityException(errMsg);
-				}
-			}
 			if ("AEA".equals(declare.getBusinessType()) || "SEA".equals(declare.getBusinessType())) {
 				auditProecessDTO.setCustomizeThree(declare.getEtd());
 			} else if ("AIA".equals(declare.getBusinessType()) || "SIA".equals(declare.getBusinessType())) {

blade-service/blade-los/src/main/java/org/springblade/los/business/customsDeclaration/service/impl/CustomsDeclarationServiceImpl.java

@@ -440,14 +440,6 @@ public class CustomsDeclarationServiceImpl extends ServiceImpl<CustomsDeclaratio
 			auditProecessDTO.setGrossProfitLoc(auditProecessDTO.getGrossProfit().add(bCurrencyService.converterCny("USD", auditProecessDTO.getGrossProfitUsd(), "", "1")));
 			auditProecessDTO.setSalesCompanyName(declare.getCreateDeptName());
 			auditProecessDTO.setCustomizeOne(declare.getMblno());
-			Map<String, Object> map = dataProcessingUtil.profitStatus(declare.getId(), declare.getBusinessType(), feeCenterList);
-			if (ObjectUtils.isNotNull(map)) {
-				auditProecessDTO.setCustomizeTwo(map.get("profitStatusText").toString());
-				String errMsg = map.get("errorMessage").toString().trim();
-				if(!errMsg.isEmpty()){
-					throw new SecurityException(errMsg);
-				}
-			}
 			if ("BGSE".equals(declare.getBusinessType())) {
 				if (ObjectUtils.isNotNull(declare.getDeclareDate())) {
 					auditProecessDTO.setCustomizeThree(declare.getDeclareDate());

blade-service/blade-los/src/main/java/org/springblade/los/business/generalBill/service/impl/GeneralBillServiceImpl.java

@@ -52,7 +52,10 @@ import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -406,14 +409,6 @@ public class GeneralBillServiceImpl extends ServiceImpl<GeneralBillMapper, Gener
 			auditProecessDTO.setSrcId(declare.getSrcId());
 			auditProecessDTO.setSrcCnName(declare.getSrcCnName());
 			auditProecessDTO.setSrcEnName(declare.getSrcEnName());
-			Map<String,Object> map = dataProcessingUtil.profitStatus(declare.getId(), declare.getBusinessType(),feeCenterList);
-			if (ObjectUtils.isNotNull(map)){
-				auditProecessDTO.setCustomizeTwo(map.get("profitStatusText").toString());
-				String errMsg = map.get("errorMessage").toString().trim();
-				if(!errMsg.isEmpty()){
-					throw new SecurityException(errMsg);
-				}
-			}
 			R financeProcess = auditProecessService.createFinanceProcess(auditProecessDTO);
 			if (!financeProcess.isSuccess()) {
 				throw new SecurityException("操作失败,请联系管理员");

blade-service/blade-los/src/main/java/org/springblade/los/business/sea/controller/BillsController.java

@@ -356,6 +356,9 @@ public class BillsController extends BladeController {
 				} else if (AuthUtil.getUserRole().contains("业务员")) {
 					lambdaQueryWrapper.and(i -> i.eq(Bills::getSrcId, AuthUtil.getUserId()).or()
 						.eq(Bills::getCreateUser, AuthUtil.getUserId()));
+				} else if (AuthUtil.getUserRole().contains("客服")) {
+					lambdaQueryWrapper.and(i -> i.eq(Bills::getCustomerServiceId, AuthUtil.getUserId()).or()
+						.eq(Bills::getCreateUser, AuthUtil.getUserId()));
 				} else {
 					lambdaQueryWrapper.eq(Bills::getCreateUser, AuthUtil.getUserId());
 				}
@@ -802,6 +805,9 @@ public class BillsController extends BladeController {
 				} else if (AuthUtil.getUserRole().contains("业务员")) {
 					lambdaQueryWrapper.and(i -> i.eq(Bills::getSrcId, AuthUtil.getUserId()).or()
 						.eq(Bills::getCreateUser, AuthUtil.getUserId()));
+				} else if (AuthUtil.getUserRole().contains("客服")) {
+					lambdaQueryWrapper.and(i -> i.eq(Bills::getCustomerServiceId, AuthUtil.getUserId()).or()
+						.eq(Bills::getCreateUser, AuthUtil.getUserId()));
 				} else {
 					lambdaQueryWrapper.eq(Bills::getCreateUser, AuthUtil.getUserId());
 				}
@@ -1035,6 +1041,9 @@ public class BillsController extends BladeController {
 				} else if (AuthUtil.getUserRole().contains("业务员")) {
 					lambdaQueryWrapper.and(i -> i.eq(Bills::getSrcId, AuthUtil.getUserId()).or()
 						.eq(Bills::getCreateUser, AuthUtil.getUserId()));
+				} else if (AuthUtil.getUserRole().contains("客服")) {
+					lambdaQueryWrapper.and(i -> i.eq(Bills::getCustomerServiceId, AuthUtil.getUserId()).or()
+						.eq(Bills::getCreateUser, AuthUtil.getUserId()));
 				} else {
 					lambdaQueryWrapper.eq(Bills::getCreateUser, AuthUtil.getUserId());
 				}

blade-service/blade-los/src/main/java/org/springblade/los/business/sea/service/IDataProcessingService.java

@@ -14,5 +14,4 @@ public interface IDataProcessingService {
 
 	 List<LosAuditPathsLevels> toExamine(List<LosAuditPathsLevels> auditPathsLevels, String deptId);
 
-	Map<String,Object> profitStatus(Long id, String businessType, List<FeeCenter> feeCenterList);
 }

blade-service/blade-los/src/main/java/org/springblade/los/business/sea/service/impl/BillsServiceImpl.java

@@ -1489,52 +1489,6 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 				this.updateBatchById(billsList);
 			}
 		}
-		String status = sysClient.getParamServiceNew("is.profit.margin");
-		if ("1".equals(status)) {
-			List<FeeCenter> feeCenterListPS = feeCenterList.stream().filter(e -> e.getFeeCnName().equals("PS")).collect(Collectors.toList());
-			List<FeeCenter> feeCenterListHY = feeCenterList.stream().filter(e -> e.getFeeCnName().equals("海运费")).collect(Collectors.toList());
-			if (!feeCenterListPS.isEmpty() && feeCenterListHY.isEmpty()) {
-				throw new RuntimeException("PS费与海运费需同时存在，当前缺少海运费用信息");
-			}
-			if (!feeCenterListPS.isEmpty()) {
-				BigDecimal amountHYD = feeCenterList.stream()
-					.filter(e -> e.getFeeCnName().equals("海运费") && "USD".equals(e.getCurCode()) && "D".equals(e.getDc()))
-					.map(FeeCenter::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
-				BigDecimal amountHYC = feeCenterList.stream()
-					.filter(e -> e.getFeeCnName().equals("海运费") && "USD".equals(e.getCurCode()) && "C".equals(e.getDc()))
-					.map(FeeCenter::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
-				BigDecimal amountPSD = feeCenterList.stream()
-					.filter(e -> e.getFeeCnName().equals("PS") && "USD".equals(e.getCurCode()) && "D".equals(e.getDc()))
-					.map(FeeCenter::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
-				BigDecimal amountPSC = feeCenterList.stream()
-					.filter(e -> e.getFeeCnName().equals("PS") && "USD".equals(e.getCurCode()) && "C".equals(e.getDc()))
-					.map(FeeCenter::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
-				if (("PP".equals(declare.getMpaymode()) && ("MM".equals(declare.getBillType()) || "DD".equals(declare.getBillType()))) ||
-					("CC".equals(declare.getMpaymode()) && "MH".equals(declare.getBillType()))) {
-					BCorps bCorps = ibCorpsService.getById(declare.getCorpId());
-					BigDecimal PSAmount = amountPSC.subtract(amountPSD);
-					BigDecimal HYAmount = amountHYD.subtract(amountHYC);
-					BigDecimal rate = new BigDecimal("0.00");
-					if (PSAmount.compareTo(new BigDecimal("0.00")) > 0 && HYAmount.compareTo(new BigDecimal("0.00")) > 0) {
-						rate = PSAmount.divide(HYAmount, MathContext.DECIMAL32).setScale(2, RoundingMode.HALF_UP);
-					} else {
-						throw new RuntimeException("海运费利润：" + HYAmount + ",  PS利润:" + PSAmount);
-					}
-					if (ObjectUtils.isNotNull(bCorps) && ObjectUtils.isNotNull(bCorps.getPsRate()) && new BigDecimal(bCorps.getPsRate()).compareTo(new BigDecimal("0.00")) == 0) {
-						throw new RuntimeException("往来单位PS规则为空或零，不能存在PS费用");
-					}
-					if (new BigDecimal(bCorps.getPsRate()).compareTo(rate) < 0) {
-						throw new RuntimeException("PS比例高，公司实际分成比例:" + rate + ".系统比例为:" + bCorps.getPsRate());
-					}
-				} else {
-					throw new RuntimeException("只有预付、直单和主单，或分单和到付才可以输入PS");
-				}
-			} /*else if (!feeCenterListPS.isEmpty() && feeCenterListHY.isEmpty()) {
-				throw new RuntimeException("PS费与海运费需同时存在，当前缺少PS费用信息");
-			} else if (!feeCenterListPS.isEmpty()) {
-				throw new RuntimeException("PS费与海运费需同时存在，当前缺少海运费用信息");
-			}*/
-		}
 		// 没开启审批流直接走 通过流程
 		if (pathsActs == null || pathsActs.getIsEnable() == 2) {
 			throw new SecurityException("当前租户未查询到审批流配置");
@@ -1604,14 +1558,6 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 				auditProecessDTO.setEtd(declare.getEta());
 			}
 			auditProecessDTO.setCustomizeOne(declare.getMblno());
-			Map<String, Object> map = dataProcessingUtil.profitStatus(declare.getId(), declare.getBusinessType(), feeCenterList);
-			if (ObjectUtils.isNotNull(map)) {
-				auditProecessDTO.setCustomizeTwo(map.get("profitStatusText").toString());
-				String errMsg = map.get("errorMessage").toString().trim();
-				if(!errMsg.isEmpty()){
-					throw new SecurityException(errMsg);
-				}
-			}
 			if ("SE".equals(declare.getBusinessType())) {
 				auditProecessDTO.setCustomizeThree(declare.getEtd());
 			} else if ("SI".equals(declare.getBusinessType())) {
@@ -4309,14 +4255,6 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 					auditProecessDTO.setEtd(declare.getEta());
 				}
 				auditProecessDTO.setCustomizeOne(declare.getMblno());
-				Map<String, Object> map = dataProcessingUtil.profitStatus(declare.getId(), declare.getBusinessType(), feeCenterList);
-				if (ObjectUtils.isNotNull(map)) {
-					auditProecessDTO.setCustomizeTwo(map.get("profitStatusText").toString());
-					String errMsg = map.get("errorMessage").toString().trim();
-					if(!errMsg.isEmpty()){
-						throw new SecurityException(errMsg);
-					}
-				}
 				if ("SE".equals(declare.getBusinessType())) {
 					auditProecessDTO.setCustomizeThree(declare.getEtd());
 				} else if ("SI".equals(declare.getBusinessType())) {

blade-service/blade-los/src/main/java/org/springblade/los/business/sea/service/impl/DataProcessingImplService.java

@@ -40,11 +40,6 @@ public class DataProcessingImplService implements IDataProcessingService {
 
 	private final IDeptUtils deptUtils;
 
-	private final BillsMapper billsMapper;
-
-	private final IBCorpsService bCorpsService;
-
-
 	@Override
 	public List<LosAuditPathsLevels> toExamine(List<LosAuditPathsLevels> auditPathsLevels, String deptId) {
 		List<User> userList = userClient.getUserByDept(deptUtils.getDeptPid(), AuthUtil.getTenantId());
@@ -93,382 +88,4 @@ public class DataProcessingImplService implements IDataProcessingService {
 		return auditPathsLevels;
 	}
 
-	@Override
-	public Map<String,Object> profitStatus(Long id, String businessType, List<FeeCenter> feeCenterList) {
-		if(ObjectUtils.isNull(id) || id<=0){
-			throw new RuntimeException("PS: 缺少业务 id！");
-		}
-		if(ObjectUtils.isNull(businessType) || businessType.isEmpty()){
-			throw new RuntimeException("PS: 缺少业务类型！");
-		}
-
-		List<FeeCenter> fcList = ObjectUtils.isNotNull(feeCenterList) ? feeCenterList : new ArrayList<>();
-		if(fcList.isEmpty()){
-
-		}
-
-		if("SE,SI".contains(businessType)){
-			return profitStatus_HY(id, businessType, fcList);
-		// }else if("SEA".equals(businessType) || "SEI".equals(businessType)){
-		//	return profitStatus_HY(id, businessType, fcList);
-		}
-
-		return null;
-	}
-
-	public Map<String,Object> profitStatus_HY(Long id, String businessType, List<FeeCenter> feeCenterList) {
-		Map<String, Object> R = new HashMap<>();
-
-		Bills bill = billsMapper.selectOne(new LambdaQueryWrapper<Bills>()
-			.select(Bills::getId, Bills::getQuotationMethod, Bills::getCorpId, Bills::getCarrierId,
-				Bills::getHpaymode, Bills::getMpaymode, Bills::getBillType, Bills::getHblno)
-			.eq(Bills::getId, id)
-			.eq(Bills::getTenantId, AuthUtil.getTenantId())
-			.eq(Bills::getIsDeleted, 0));
-
-		if (ObjectUtils.isNull(bill)) {
-			throw new RuntimeException("请核的业务 id 不存在");
-		}
-
-		List<Bills> billsList = new ArrayList<>();
-		billsList.add(bill);
-		if("MM".equals(bill.getBillType())){
-			List<Bills> billsList1 = billsMapper.selectList(new LambdaQueryWrapper<Bills>()
-				.select(Bills::getId, Bills::getQuotationMethod, Bills::getCorpId, Bills::getCarrierId,
-					Bills::getHpaymode, Bills::getMpaymode, Bills::getBillType, Bills::getHblno)
-				.eq(Bills::getTenantId, AuthUtil.getTenantId())
-				.eq(Bills::getIsDeleted, 0)
-				.eq(Bills::getMasterId, bill.getId()));
-			billsList.addAll(billsList1);
-		}
-
-		// 费用名称
-		// 1722822288795000833	O/F		海运费	145
-		// 1722823384343011329	P/S		P/S		220
-		// 1746015648988901393	HP/S	HP/S	623
-		// 特殊 PS 客户名称
-		// 1425		W0077	W0077
-		// 1561		W0091	W0091
-		// 3415		W0256	W0256
-		// 5110		W0312	W0312
-		// 6363		W0380	W0380
-		// 10120	W0582	W0582
-		// 11794	W0643	W0643
-		// 12247	W0661	W0661
-		// 12431	W0675	W0675
-		// 12731	W0689	W0689
-		// 'F':aAuditItem.RefNo2:='正常';
-		// 'M':aAuditItem.RefNo2:='为负';
-		// 'H':aAuditItem.RefNo2:='过高';
-		// 'L':aAuditItem.RefNo2:='过低';
-		// 'U':aAuditItem.RefNo2:='不成比例';
-		// 'D':aAuditItem.RefNo2:='不成比例且过低';
-
-		String specPScorpIds = ",1425,1561,3415,5110,6363,10120,11794,12247,12431,12731,";
-
-		BigDecimal usdOFProfit = new BigDecimal(BigInteger.ZERO);
-		BigDecimal ofInAmtProfit = new BigDecimal(BigInteger.ZERO);
-		Integer ofCNYCount = 0;
-
-		BigDecimal HPSProfit = new BigDecimal(BigInteger.ZERO);
-		BigDecimal specProfit = new BigDecimal(BigInteger.ZERO);
-		BigDecimal specInAmtProfit = new BigDecimal(BigInteger.ZERO);
-
-		BigDecimal psProfit = new BigDecimal(BigInteger.ZERO);
-		BigDecimal psInAmtProfit = new BigDecimal(BigInteger.ZERO);
-
-		StringBuilder errMsg = new StringBuilder();
-
-		// 特殊ps客户 Id
-		Long specPSCorpId = 0L;
-		// 高收退费客户 Id
-		Long hpsCorpId = 0L;
-
-		List<Long> idList = billsList.stream().map(Bills::getId).collect(Collectors.toList());
-		List<Long> corpIdList = billsList.stream().map(Bills::getCorpId).collect(Collectors.toList());
-		List<Long> carrierIdList = billsList.stream().map(Bills::getCarrierId).collect(Collectors.toList());
-
-		List<FeeCenter> fcList = feeCenterList.stream().filter(e->idList.contains(e.getId())).collect(Collectors.toList());
-		for (FeeCenter fee : fcList) {
-			if (specPSCorpId == 0 && ObjectUtils.isNotNull(fee.getCorpId())) {
-				if (specPScorpIds.indexOf("," + fee.getCorpId().toString() + ",") >= 0) {
-					specPSCorpId = fee.getCorpId();
-				}
-			}
-			BigDecimal amt = fee.getAmount();
-			if (MagicValues.C.equals(fee.getDc())) {
-				amt = amt.multiply(new BigDecimal(-1));
-			}
-			if (MagicValues.USD.equals(fee.getCurCode())) {
-				if ("O/F".equals(fee.getFeeCode())) {
-					// 145
-					usdOFProfit = usdOFProfit.add(amt);
-				}
-				if ("P/S".equals(fee.getFeeCode())) {
-					// 220
-					psProfit = psProfit.subtract(amt);
-				}
-				if ("HP/S".equals(fee.getFeeCode())) {
-					if (hpsCorpId == 0 && ObjectUtils.isNotNull(fee.getCorpId())) {
-						hpsCorpId = fee.getCorpId();
-					}
-					// 623
-					HPSProfit = HPSProfit.add(amt);
-					specProfit = specProfit.subtract(amt);
-				}
-			} else {
-				if ("O/F".equals(fee.getFeeCode())) {
-					// 145
-					ofInAmtProfit = ofInAmtProfit.add(amt.divide(new BigDecimal("6.8"), 2, BigDecimal.ROUND_HALF_UP));
-					ofCNYCount += 1;
-				}
-				if ("P/S".equals(fee.getFeeCode())) {
-					// 220
-					psInAmtProfit = psInAmtProfit.add(amt);
-				}
-				if ("HP/S".equals(fee.getFeeCode())) {
-					if (hpsCorpId == 0 && ObjectUtils.isNotNull(fee.getCorpId())) {
-						hpsCorpId = fee.getCorpId();
-					}
-					// 623
-					specInAmtProfit = specInAmtProfit.subtract(amt);
-				}
-			}
-
-			// W0
-			Long feeCorpId = fee.getCorpId();
-			Long billId = fee.getPid();
-			Long corpId = corpIdList.get(idList.indexOf(billId));
-			Long carrierId = carrierIdList.get(idList.indexOf(billId));
-			if(!feeCorpId.equals(corpId) && !feeCorpId.equals(carrierId)){
-				// int bc = bCorpsService.count();
-			}
-		}
-
-		// 提取客户 PsRate
-		BCorps bCorps11 = bCorpsService.getById(bill.getCorpId());
-		BigDecimal PsRate = new BigDecimal(BigInteger.ZERO);
-		Integer corpIsDC = 0;
-		if (ObjectUtils.isNotNull(bCorps11)) {
-			if ("外部报价".equals(bill.getQuotationMethod())) {
-				PsRate = new BigDecimal(bCorps11.getPsRateExternal());
-			} else {
-				PsRate = new BigDecimal(bCorps11.getPsRate());
-			}
-			if (ObjectUtils.isNotNull(bCorps11.getCorpTypeName()) && bCorps11.getCorpTypeName().contains("国内直接客户")) {
-				corpIsDC = 1;
-			}
-		}
-		BigDecimal specPsRate = new BigDecimal(BigInteger.ZERO);
-		Boolean isPS = false;
-
-		if (specPSCorpId > 0) {
-			BCorps bCorps12 = bCorpsService.getById(specPSCorpId);
-			if (ObjectUtils.isNotNull(bCorps12)) {
-				specPsRate = new BigDecimal(bCorps12.getPsRate());
-			}
-		}
-
-		if (hpsCorpId > 0) {
-			BCorps bCorps13 = bCorpsService.getById(hpsCorpId);
-			if (ObjectUtils.isNotNull(bCorps13)) {
-				Long ownerCorpId = ObjectUtils.isNotNull(bCorps13.getCorpId()) ? bCorps13.getCorpId() : 0L;
-				if (ownerCorpId.equals(bill.getCorpId()) || ownerCorpId.equals(bill.getCarrierId()) || hpsCorpId.equals(bill.getCorpId())) {
-					isPS = ObjectUtils.isNotNull(bCorps13.getIsPs()) && bCorps13.getIsPs() == 1;
-				}
-			}
-		}
-
-		String ps_text = ofCNYCount > 0 ? "(应收/应付)存在RMB海运费" : "";
-		String ps_remarks = "";
-		String ps_ps = "";
-		String ps_spec = "";
-
-		usdOFProfit = usdOFProfit.setScale(2, RoundingMode.HALF_UP);
-		ofInAmtProfit = ofInAmtProfit.setScale(2, RoundingMode.HALF_UP);
-		psInAmtProfit = psInAmtProfit.setScale(2, RoundingMode.HALF_UP);
-		psProfit = psProfit.setScale(2, RoundingMode.HALF_UP);
-		HPSProfit = HPSProfit.setScale(2, RoundingMode.HALF_UP);
-		PsRate = PsRate.setScale(2, RoundingMode.HALF_UP);
-		specPsRate = specPsRate.setScale(2, RoundingMode.HALF_UP);
-		specProfit = specProfit.setScale(2, RoundingMode.HALF_UP);
-		specInAmtProfit = specInAmtProfit.setScale(2, RoundingMode.HALF_UP);
-		if (psInAmtProfit.compareTo(BigDecimal.ZERO) != 0) {
-			ps_remarks += " PS不能出现 RMB 费用\r\n";
-		}
-
-		if ("CC".equals(bill.getMpaymode()) && psProfit.compareTo(BigDecimal.ZERO) != 0) {
-			ps_remarks += " 主单付费方式为CC 不能出现PS\r\n";
-		}
-
-		if (("PP".equals(bill.getMpaymode()) && (MagicValues.DD.equals(bill.getBillType()) || MagicValues.MM.equals(bill.getBillType())))
-			|| ("CC".equals(bill.getMpaymode()) && ObjectUtils.isNotNull(bill.getHblno()))) {
-			if (specPScorpIds.contains("," + specPSCorpId.toString() + ",")) {
-				if (usdOFProfit.compareTo(BigDecimal.ZERO) != 0) {
-					BigDecimal tt1 = usdOFProfit.add(ofInAmtProfit).add(HPSProfit).setScale(2, BigDecimal.ROUND_HALF_UP);
-					if (tt1.compareTo(BigDecimal.ZERO) != 0) {
-						BigDecimal pt1 = psProfit.divide(tt1, 2, BigDecimal.ROUND_HALF_UP);
-						if (pt1.compareTo(specPsRate) > 0) {
-							BigDecimal psr1 = new BigDecimal(1).subtract(pt1).setScale(2, BigDecimal.ROUND_HALF_UP);
-							ps_remarks += " PS比例高，公司比例： " + psr1.toString() + " 系统比例为:" + specPsRate.toString() + "\r\n";
-							BigDecimal psr2 = new BigDecimal(1).subtract(specPsRate).setScale(2, BigDecimal.ROUND_HALF_UP);
-							ps_ps += "公司分成比例:" + psr1.toString() + " (" + psr2.toString() + ")\r\n";
-						}
-					}
-				}
-			} else {
-				if (usdOFProfit.compareTo(BigDecimal.ZERO) != 0) {
-					BigDecimal tt1 = usdOFProfit.add(ofInAmtProfit).add(HPSProfit).setScale(2, BigDecimal.ROUND_HALF_UP);
-					if (tt1.compareTo(BigDecimal.ZERO) != 0) {
-						BigDecimal pt1 = psProfit.divide(tt1, 4, BigDecimal.ROUND_HALF_UP);
-						if (pt1.compareTo(PsRate) > 0) {
-							BigDecimal psr1 = new BigDecimal(1).subtract(pt1).setScale(2, BigDecimal.ROUND_HALF_UP);
-							ps_remarks += " PS比例高，公司比例： " + psr1.toString() + " 系统比例为:" + specPsRate.toString() + "\r\n";
-							BigDecimal psr2 = new BigDecimal(1).subtract(PsRate).setScale(2, BigDecimal.ROUND_HALF_UP);
-							ps_ps += "公司分成比例:" + psr1.toString() + " (" + psr2.toString() + ")\r\n";
-						}
-					}
-				}
-			}
-		} else {
-			if (psProfit.compareTo(BigDecimal.ZERO) != 0) {
-				ps_remarks += "只有预付、直单和主单，或分单和到付才可以输入PS\r\n";
-			}
-		}
-
-		BigDecimal tt2 = specProfit.add(specInAmtProfit).setScale(2, BigDecimal.ROUND_HALF_UP);
-		if (tt2.compareTo(BigDecimal.ZERO) == 1) {
-			if (isPS == true) {
-				ps_spec += "存在高收退费\r\n";
-			} else {
-				ps_remarks += "不应该存在高收退费\r\n";
-				ps_spec += "不应该存在高收退费\r\n";
-			}
-		}
-
-		ps_remarks = ps_remarks.trim();
-		ps_ps = ps_ps.trim();
-
-		R.put("profitStatus", "");
-		R.put("profitRemarks", ps_remarks.trim());
-		R.put("profitSpec", ps_ps.trim() + "\r\n" + ps_spec.trim());
-		R.put("text", ps_text);
-		R.put("corpIsDC", corpIsDC);
-		R.put("ifDCCorp", corpIsDC == 1 ? "DC" : "");
-
-		//   FOverFeeLimit:=Trim(GetSysConst('SEA_ISSUEBILL_OVERFEE_LIMIT', '100000'));
-		// 判断是否国内直客
-
-		BigDecimal sumUSDDr = new BigDecimal(BigInteger.ZERO);
-		BigDecimal sumCNYDr = new BigDecimal(BigInteger.ZERO);
-		BigDecimal sumLocDr = new BigDecimal(BigInteger.ZERO);
-
-		BigDecimal sumUSDCr = new BigDecimal(BigInteger.ZERO);
-		BigDecimal sumCNYCr = new BigDecimal(BigInteger.ZERO);
-		BigDecimal sumLocCr = new BigDecimal(BigInteger.ZERO);
-
-		BigDecimal sumOFPS = new BigDecimal(BigInteger.ZERO);
-		// 当前单据，计算 ProfitStatus
-		for (FeeCenter fee : feeCenterList) {
-			if (MagicValues.C.equals(fee.getDc()) && "P/S".equals(fee.getFeeCode())) {
-				// if("USD".equals(fee.getCurCode())){
-				sumOFPS = sumOFPS.add(fee.getAmountLoc()).setScale(2, BigDecimal.ROUND_HALF_UP);
-			}
-
-			if (MagicValues.D.equals(fee.getDc())) {
-				if ("USD".equals(fee.getCurCode())) {
-					sumUSDDr = sumUSDDr.add(fee.getAmount()).setScale(2, BigDecimal.ROUND_HALF_UP);
-				} else {
-					sumCNYDr = sumCNYDr.add(fee.getAmount()).setScale(2, BigDecimal.ROUND_HALF_UP);
-				}
-				sumLocDr = sumLocDr.add(fee.getAmountLoc()).setScale(2, BigDecimal.ROUND_HALF_UP);
-			}
-
-			if (MagicValues.C.equals(fee.getDc())) {
-				if ("USD".equals(fee.getCurCode())) {
-					sumUSDCr = sumUSDCr.add(fee.getAmount()).setScale(2, BigDecimal.ROUND_HALF_UP);
-				} else {
-					sumCNYCr = sumCNYCr.add(fee.getAmount()).setScale(2, BigDecimal.ROUND_HALF_UP);
-				}
-				sumLocCr = sumLocCr.add(fee.getAmountLoc()).setScale(2, BigDecimal.ROUND_HALF_UP);
-			}
-
-			// W 号检测
-
-		}
-
-
-		BigDecimal sumProfitUSD = sumUSDDr.subtract(sumUSDCr).setScale(2, BigDecimal.ROUND_HALF_UP);
-		BigDecimal sumProfitCNY = sumCNYDr.subtract(sumCNYCr).setScale(2, BigDecimal.ROUND_HALF_UP);
-		BigDecimal sumProfitLoc = sumLocDr.subtract(sumLocCr).setScale(2, BigDecimal.ROUND_HALF_UP);
-
-		BigDecimal profitRate = new BigDecimal(BigInteger.ZERO);
-		if (sumLocDr.compareTo(BigDecimal.ZERO) == 1) {
-			profitRate = sumProfitLoc.divide(sumLocDr, 4, BigDecimal.ROUND_HALF_UP).setScale(4, BigDecimal.ROUND_HALF_UP);
-		}
-
-		String profitStatus = "F";
-		if (!ps_ps.isEmpty()) {
-			profitStatus = "U";
-		}
-		if (sumProfitLoc.compareTo(BigDecimal.ZERO) == 0) {
-			profitStatus = "Z";
-		} else if (sumProfitLoc.compareTo(BigDecimal.ZERO) < 0) {
-			profitStatus = "M";
-		} else if (sumLocDr.compareTo(BigDecimal.ZERO) > 0) {
-			if (profitRate.compareTo(new BigDecimal("0.4")) >= 0) {
-				profitStatus = "H";
-			} else if (profitRate.compareTo(new BigDecimal("0.02")) < 0) {
-				profitStatus = "U".equals(profitStatus) ? "D" : "L";
-			}
-		}
-
-		R.put("profitStatus", profitStatus);
-		switch (profitStatus) {
-			case "Z":
-				R.put("profitStatusText", "为零");
-				R.put("profitStatusCnText", "利润为零");
-				R.put("profitStatusEnText", "Profit was zero!");
-				break;
-			case "D":
-				R.put("profitStatusText", "不成比例且过低");
-				R.put("profitStatusCnText", "利润不成比例且过低");
-				R.put("profitStatusEnText", "Profit was unfair and low!");
-				break;
-			case "H":
-				R.put("profitStatusText", "过高");
-				R.put("profitStatusCnText", "利润过高");
-				R.put("profitStatusEnText", "Profit was high!");
-				break;
-			case "L":
-				R.put("profitStatusText", "过低");
-				R.put("profitStatusCnText", "利润过低");
-				R.put("profitStatusEnText", "Profit was low!");
-				break;
-			case "F":
-				R.put("profitStatusText", "正常");
-				R.put("profitStatusCnText", "利润正常");
-				R.put("profitStatusEnText", "");
-				break;
-			case "M":
-				R.put("profitStatusText", "为负");
-				R.put("profitStatusCnText", "利润为负");
-				R.put("profitStatusEnText", "Profit was minus!");
-				break;
-			case "U":
-				R.put("profitStatusText", "不成比例");
-				R.put("profitStatusCnText", "不成比例");
-				R.put("profitStatusEnText", "P/S was unfair!");
-				break;
-			default:
-				R.put("profitStatusText", "");
-				R.put("profitStatusCnText", "");
-				R.put("profitStatusEnText", "");
-		}
-
-		R.put("errorMessage", errMsg.toString().trim());
-
-		return R;
-	}
-
 }

blade-service/blade-los/src/main/java/org/springblade/los/statisticAnalysis/service/impl/StatisticAnalysisServiceImpl.java

@@ -2166,7 +2166,7 @@ public class StatisticAnalysisServiceImpl extends ServiceImpl<FinanceProfitMappe
 		}
 		Calendar calendar = Calendar.getInstance();
 		calendar.setTime(date);
-		calendar.add(Calendar.DAY_OF_MONTH, -day);
+		calendar.add(Calendar.DAY_OF_MONTH, day);
 		Date date1 = calendar.getTime();
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 		LambdaQueryWrapper<Bills> lambdaQueryWrapper = new LambdaQueryWrapper<>();
@@ -2188,7 +2188,7 @@ public class StatisticAnalysisServiceImpl extends ServiceImpl<FinanceProfitMappe
 		}
 		Calendar calendar = Calendar.getInstance();
 		calendar.setTime(date);
-		calendar.add(Calendar.DAY_OF_MONTH, -day);
+		calendar.add(Calendar.DAY_OF_MONTH, day);
 		Date date1 = calendar.getTime();
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 		LambdaQueryWrapper<Bills> lambdaQueryWrapper = new LambdaQueryWrapper<>();

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/feign/OrderDescClient.java

@@ -79,8 +79,8 @@ public class OrderDescClient implements IOrderDescClient {
 		if (order.getId() == null) {
 			throw new SecurityException("修改状态失败");
 		}
-
-		if ("681169".equals(AuthUtil.getTenantId()) || "941197".equals(AuthUtil.getTenantId())) {
+		String domesticTrade = sysClient.getParamService("domestic.trade");
+		if ("1".equals(domesticTrade)) {
 			if ("待发货".equals(order.getOrderStatus()) || "未完成".equals(order.getOrderStatus())) {
 				if (ObjectUtil.isNotEmpty(order.getDeliverQuantity())) {
 					if (order.getDeliverQuantity().compareTo(BigDecimal.ZERO) == 0) {
@@ -103,40 +103,16 @@ public class OrderDescClient implements IOrderDescClient {
 			}
 			iOrderService.updateById(order);
 		} else {
-			if (ObjectUtils.isNotNull(sysClient.getParamService("synchronous"))
-				&& "1".equals(sysClient.getParamService("synchronous"))) {
-				if (ObjectUtil.isNotEmpty(order.getDeliverQuantity())) {
-					if (order.getDeliverQuantity().compareTo(BigDecimal.ZERO) == 0) {
-						iOrderService.update(null, new LambdaUpdateWrapper<Order>()
-							.set(Order::getDeliverTime, null)
-							.set(Order::getActualDeliveryDate, null)
-							.eq(Order::getId, order.getId())
-						);
-					}
-				}
-				if (ObjectUtil.isNotEmpty(order.getReceiveQuantity())) {
-					if (order.getReceiveQuantity().compareTo(BigDecimal.ZERO) == 0) {
-						iOrderService.update(null, new LambdaUpdateWrapper<Order>()
-							.set(Order::getReceiveTime, null)
-							.set(Order::getActualDeliveryDate, null)
-							.eq(Order::getId, order.getId())
-						);
-					}
-				}
-				iOrderService.updateById(order);
-			} else {
-				if (ObjectUtil.isNotEmpty(order.getStatus())) {
-					R<String> dictKey = dictBizClient.getOneByValue("to_examine", "是否启用", AuthUtil.getTenantId());
-					if ((dictKey.isSuccess() && "1".equals(dictKey.getData())) || 6 == order.getStatus()) {
-						iOrderService.collectHairGoods(order);
-					} else {
-						iOrderService.updateById(order);
-					}
+			if (ObjectUtil.isNotEmpty(order.getStatus())) {
+				R<String> dictKey = dictBizClient.getOneByValue("to_examine", "是否启用", AuthUtil.getTenantId());
+				if ((dictKey.isSuccess() && "1".equals(dictKey.getData())) || 6 == order.getStatus()) {
+					iOrderService.collectHairGoods(order);
 				} else {
 					iOrderService.updateById(order);
 				}
+			} else {
+				iOrderService.updateById(order);
 			}
-
 		}
 		return R.success("操作成功");
 	}
@@ -225,7 +201,7 @@ public class OrderDescClient implements IOrderDescClient {
 		LambdaQueryWrapper<Order> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 		lambdaQueryWrapper.eq(Order::getIsDeleted, 0);
 		lambdaQueryWrapper.ne(Order::getStatus, 0);
-		lambdaQueryWrapper.eq(Order::getTenantId, 681169);
+		lambdaQueryWrapper.eq(Order::getTenantId, AuthUtil.getTenantId());
 		lambdaQueryWrapper.eq(Order::getTradeType, OrderTypeEnum.DOMESTIC.getType());
 		lambdaQueryWrapper.eq(Order::getBillType, OrderTypeEnum.SALES.getType());
 		lambdaQueryWrapper.isNotNull(Order::getCheckDate);
@@ -464,8 +440,8 @@ public class OrderDescClient implements IOrderDescClient {
 	 * 年度预算报表获得订单数量和发货数量
 	 */
 	@Override
-	public List<OrderStatisticsVo> getByOrderQuantity(Integer year, Integer month, Long corpId) {
-		return iOrderService.getByOrderQuantity(year, month, corpId);
+	public List<OrderStatisticsVo> getByOrderQuantity(Integer year, Integer month, Long corpId,String tenantId) {
+		return iOrderService.getByOrderQuantity(year, month, corpId,tenantId);
 	}
 
 	@Override

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

@@ -347,7 +347,8 @@ public interface OrderMapper extends BaseMapper<Order> {
 	/**
 	 * 年度预算报表获得订单数量和发货数量
 	 */
-	List<OrderStatisticsVo> getByOrderQuantity(@Param("year") Integer year, @Param("month") Integer month, @Param("corpId") Long corpId);
+	List<OrderStatisticsVo> getByOrderQuantity(@Param("year") Integer year, @Param("month") Integer month,
+											   @Param("corpId") Long corpId,@Param("tenantId")String tenantId);
 
 	int updateStockGoods(StockGoods stockGoods);
 

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

@@ -477,14 +477,10 @@
             <if test='storageId != null'>
                 AND item.storage_id = #{storageId}
             </if>
-            <if test='tenantId != null and tenantId != "" and tenantId == "681169"'>
+            <if test='tenantId != null and tenantId != "" and tenantId == tenantId'>
                 and bo.actual_delivery_date is NULL
                 AND bo.order_status NOT IN ('录入')
             </if>
-        <if test='tenantId != null and tenantId != "" and tenantId == "941197"'>
-            and bo.actual_delivery_date is NULL
-            AND bo.order_status NOT IN ('录入')
-        </if>
         GROUP BY bo.id,
         bo.actual_delivery_date,
         bo.order_no,
@@ -1742,7 +1738,7 @@ ORDER BY
         business_delivery bd
         LEFT JOIN business_delivery_items bdi ON bd.id = bdi.pid
         WHERE
-        bd.tenant_id = '681169'
+        bd.tenant_id =  #{statisticsVo.tenantId}
         AND bd.is_deleted = 0
         AND bd.bill_type = 'FH'
         GROUP BY
@@ -1814,7 +1810,7 @@ ORDER BY
         business_delivery bd
         LEFT JOIN business_delivery_items bdi ON bd.id = bdi.pid
         WHERE
-        bd.tenant_id = '681169'
+        bd.tenant_id = #{statisticsVo.tenantId}
         AND bd.is_deleted = 0
         AND bd.bill_type = 'FH'
         GROUP BY
@@ -1882,7 +1878,7 @@ ORDER BY
         business_delivery bd
         LEFT JOIN business_delivery_items bdi ON bd.id = bdi.pid
         WHERE
-        bd.tenant_id = '681169'
+        bd.tenant_id = #{statisticsVo.tenantId}
         AND bd.is_deleted = 0
         AND bd.bill_type = 'FH'
         GROUP BY
@@ -1956,7 +1952,7 @@ ORDER BY
         business_delivery bd
         LEFT JOIN business_delivery_items bdi ON bd.id = bdi.pid
         WHERE
-        bd.tenant_id = '681169'
+        bd.tenant_id = #{statisticsVo.tenantId}
         AND bd.is_deleted = 0
         AND bd.bill_type = 'FH'
         GROUP BY
@@ -2040,7 +2036,7 @@ ORDER BY
         business_delivery bd
         LEFT JOIN business_delivery_items bdi ON bd.id = bdi.pid
         WHERE
-        bd.tenant_id = '681169'
+        bd.tenant_id = #{statisticsVo.tenantId}
         AND bd.is_deleted = 0
         AND bd.bill_type = 'FH'
         GROUP BY
@@ -2106,7 +2102,7 @@ ORDER BY
         business_delivery bd
         LEFT JOIN business_delivery_items bdi ON bd.id = bdi.pid
         WHERE
-        bd.tenant_id = '681169'
+        bd.tenant_id = #{statisticsVo.tenantId}
         AND bd.is_deleted = 0
         AND bd.bill_type = 'FH'
         GROUP BY
@@ -2176,7 +2172,7 @@ ORDER BY
         business_delivery bd
         LEFT JOIN business_delivery_items bdi ON bd.id = bdi.pid
         WHERE
-        bd.tenant_id = '681169'
+        bd.tenant_id = #{statisticsVo.tenantId}
         AND bd.is_deleted = 0
         AND bd.bill_type = 'FH'
         GROUP BY
@@ -2244,7 +2240,7 @@ ORDER BY
         business_delivery bd
         LEFT JOIN business_delivery_items bdi ON bd.id = bdi.pid
         WHERE
-        bd.tenant_id = '681169'
+        bd.tenant_id = #{statisticsVo.tenantId}
         AND bd.is_deleted = 0
         AND bd.bill_type = 'FH'
         GROUP BY
@@ -2308,7 +2304,7 @@ ORDER BY
         business_delivery bd
         LEFT JOIN business_delivery_items bdi ON bd.id = bdi.pid
         WHERE
-        bd.tenant_id = '681169'
+        bd.tenant_id = #{statisticsVo.tenantId}
         AND bd.is_deleted = 0
         AND bd.bill_type = 'FH'
         GROUP BY
@@ -2981,7 +2977,7 @@ ORDER BY
             LEFT JOIN basic_goods_desc BGD ON b.Item_id = BGD.id
             WHERE
                 b.is_deleted = 0
-                AND b.tenant_id = '681169'
+                AND b.tenant_id = #{statisticsVo.tenantId}
                 AND BGD.brand IS NOT NULL
                 <if test="statisticsVo.brand != null and statisticsVo.brand != ''">
                     and BGD.brand in
@@ -3450,7 +3446,7 @@ ORDER BY
         ) BOI ON BOI.pid = BO.id
         LEFT JOIN basic_goods_desc BGD ON BGD.id = BOI.item_id
         <where>
-            BO.tenant_id = '681169'
+            BO.tenant_id = #{tenantId}
             AND BO.is_deleted = 0
             AND BO.bill_type = 'XS'
             AND BO.receipt_time IS NOT NULL
@@ -3508,7 +3504,7 @@ ORDER BY
             <if test="tradeType != null and tradeType != ''">
                 AND BO.trade_type = #{tradeType}
             </if>
-            <if test="tenantId != null and tenantId != '' and tenantId == '681169'">
+            <if test="tenantId != null and tenantId != '' and tenantId == tenantId">
                 AND BOFT.item_id != '1478203344012222466'
             </if>
             <if test="orderStartDate != null and orderStartDate != ''">
@@ -3522,7 +3518,7 @@ ORDER BY
     <select id="purchaseExpenditure" resultType="BigDecimal">
         SELECT
             (CASE WHEN
-                BO.tenant_id = '681169'
+                BO.tenant_id = #{tenantId}
             THEN
                 (SUM(BOI.amount) + SUM(BO.predict_ocean_freight) + SUM(BO.create_profit))
             ELSE
@@ -3729,11 +3725,7 @@ ORDER BY
         <if test='storageId != null'>
             and item.storage_id = #{storageId}
         </if>
-        <if test='tenantId != null and tenantId != "" and tenantId == "681169"'>
-            and bo.actual_delivery_date is NULL
-            AND bo.order_status NOT IN ('录入')
-        </if>
-        <if test='tenantId != null and tenantId != "" and tenantId == "941197"'>
+        <if test='tenantId != null and tenantId != "" and tenantId == tenantId'>
             and bo.actual_delivery_date is NULL
             AND bo.order_status NOT IN ('录入')
         </if>

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

@@ -434,7 +434,7 @@ public interface IOrderService extends IService<Order> {
 	/**
 	 * 年度预算报表获得订单数量和发货数量
 	 */
-	List<OrderStatisticsVo> getByOrderQuantity(Integer year, Integer month, Long corpId);
+	List<OrderStatisticsVo> getByOrderQuantity(Integer year, Integer month, Long corpId,String tenantId);
 
 	/**
 	 * 计算国内费用

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

@@ -620,7 +620,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				}
 				List<OrderFees> feeList = orderFeesService.list(new LambdaQueryWrapper<OrderFees>().eq(OrderFees::getPid, order.getId()).ne(OrderFees::getItemId, feeId).eq(OrderFees::getIsDeleted, 0));
 				BigDecimal totalFee = feeList.stream().map(OrderFees::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
-				if ("681169".equals(AuthUtil.getTenantId()) || "941197".equals(AuthUtil.getTenantId())) {
+				String domesticTrade = sysClient.getParamService("domestic.trade");
+				if ("1".equals(domesticTrade)) {
 					grossProfit = grossProfit.add(totalFee);
 				} else {
 					grossProfit = grossProfit.subtract(totalFee);
@@ -2825,8 +2826,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	 * 年度预算报表获得订单数量和发货数量
 	 */
 	@Override
-	public List<OrderStatisticsVo> getByOrderQuantity(Integer year, Integer month, Long corpId) {
-		return baseMapper.getByOrderQuantity(year, month, corpId);
+	public List<OrderStatisticsVo> getByOrderQuantity(Integer year, Integer month, Long corpId,String tenantId) {
+		return baseMapper.getByOrderQuantity(year, month, corpId,tenantId);
 	}
 
 	/**

blade-service/blade-stock/src/main/java/org/springblade/stock/feign/StockGoodsClient.java

@@ -233,12 +233,13 @@ public class StockGoodsClient implements IStockGoodsClient {
 		List<StockGoods> listNew = new ArrayList<>();
 		List<StorageDesc> storageDescList = storageClient.selectStorageIds(ids.toString());
 		List<CorpsDesc> corpsDescList = corpsDescClient.selectByCorpIds(corpIds.toString());
+		String domesticTrade = sysClient.getParamService("domestic.trade");
 		for (StockGoods stockGoods1 : list) {
 			String name = storageDescList.stream().filter(e -> stockGoods1.getStorageId().equals(e.getId())).findFirst().orElse(new StorageDesc()).getCname();
 			String corpName = corpsDescList.stream().filter(e -> stockGoods1.getCorpId().equals(e.getId())).findFirst().orElse(new CorpsDesc()).getCname();
 			stockGoods1.setStorageName(name);
 			stockGoods1.setCorpName(corpName);
-			if ("681169".equals(AuthUtil.getTenantId())){
+			if ("1".equals(domesticTrade)){
 				listNew.add(stockGoods1);
 			}else{
 				if (new BigDecimal("0.00").compareTo(stockGoods1.getBalanceQuantity()) != 0) {

blade-service/blade-stock/src/main/java/org/springblade/stock/mapper/StockGoodsMapper.xml

@@ -668,11 +668,7 @@
         <if test='corpId != null'>
             and item.corp_id = #{corpId}
         </if>
-        <if test='tenantId != null and tenantId != "" and tenantId == "681169"'>
-            and bo.actual_delivery_date is NULL
-            AND bo.order_status NOT IN ('录入')
-        </if>
-        <if test='tenantId != null and tenantId != "" and tenantId == "941197"'>
+        <if test='tenantId != null and tenantId != "" and tenantId == tenantId'>
             and bo.actual_delivery_date is NULL
             AND bo.order_status NOT IN ('录入')
         </if>

blade-service/blade-stock/src/main/java/org/springblade/stock/service/impl/StockGoodsServiceImpl.java

@@ -23,7 +23,6 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import io.seata.spring.annotation.GlobalTransactional;
 import lombok.AllArgsConstructor;
 import org.springblade.client.entity.CorpsDesc;
 import org.springblade.client.entity.GoodsDesc;
@@ -255,6 +254,9 @@ public class StockGoodsServiceImpl extends ServiceImpl<StockGoodsMapper, StockGo
 				if ("681169".equals(AuthUtil.getTenantId())) {
 					stockGoods.setWarehouseId(1510440001509326849L);
 				}
+				if ("941197".equals(AuthUtil.getTenantId())) {
+					stockGoods.setWarehouseId(1532185120948215810L);
+				}
 				//获取商品id
 				GoodsDesc goodsDesc = goodsDescList.stream().filter(e -> e.getCode().equals(datum.getCode())).findFirst().orElse(null);
 				if (goodsDesc != null) {
@@ -581,15 +583,11 @@ public class StockGoodsServiceImpl extends ServiceImpl<StockGoodsMapper, StockGo
 			.eq(StringUtils.isNotBlank(stockGoods.getBillNo()), StockGoods::getBillNo, stockGoods.getBillNo())
 			.eq(StringUtils.isNotBlank(stockGoods.getCntrNo()), StockGoods::getCntrNo, stockGoods.getCntrNo())
 			.eq(StockGoods::getIsDeleted, 0);
-		if (ObjectUtil.isNotEmpty(stockGoods.getTenantId()) && stockGoods.getTenantId().equals("681169")) {
+		String domesticTrade = sysClient.getParamService("domestic.trade");
+		if (ObjectUtil.isNotEmpty(stockGoods.getTenantId()) && domesticTrade.equals("1")) {
 			stockGoodsLambdaQueryWrapper.eq(StockGoods::getTenantId, stockGoods.getTenantId());
 		} else {
-			if (ObjectUtils.isNotNull(sysClient.getParamService("synchronous"))
-				&& "1".equals(sysClient.getParamService("synchronous"))) {
-				stockGoodsLambdaQueryWrapper.eq(StockGoods::getTenantId, stockGoods.getTenantId());
-			} else {
-				stockGoodsLambdaQueryWrapper.eq(StockGoods::getTenantId, AuthUtil.getTenantId());
-			}
+			stockGoodsLambdaQueryWrapper.eq(StockGoods::getTenantId, AuthUtil.getTenantId());
 		}
 		List<StockGoods> goodsList = baseMapper.selectList(stockGoodsLambdaQueryWrapper);
 		if (CollectionUtils.isNotEmpty(goodsList)) {

blade-service/blade-system/src/main/java/org/springblade/system/controller/ParamServiceController.java

@@ -105,7 +105,7 @@ public class ParamServiceController extends BladeController {
 			.eq(ParamService::getIsDeleted, 0)
 		);
 		if (ObjectUtils.isNotNull(paramService)) {
-			if (!"681169".equals(paramService.getTenantId())) {
+			if (!"681169".equals(paramService.getTenantId()) && !"941197".equals(AuthUtil.getTenantId())) {
 				return R.data(paramService.getParamValue());
 			} else {
 				if ("whether.display.member".equals(param)) {

blade-service/trade-finance/src/main/java/org/springblade/finance/controller/AccController.java

@@ -822,17 +822,12 @@ public class AccController extends BladeController {
 //		}
 		List<CorpsDesc> corpsDescList = corpsDescClient.selectByCorpIds(corpIds);
 		List<CorpsDesc> companyIdsList = corpsDescClient.selectByCorpIds(companyIds);
+		String domesticTrade = sysClient.getParamService("domestic.trade");
 		accList.forEach(e -> {
-			if ("681169".equals(AuthUtil.getTenantId()) && ObjectUtils.isNotNull(e.getBillType())) {
+			if ("1".equals(domesticTrade) && ObjectUtils.isNotNull(e.getBillType())) {
 				if ("申请".equals(e.getBillType())) {
 					e.setBillType("付费");
 				}
-			} else {
-				if (ObjectUtils.isNotNull(sysClient.getParamService("synchronous"))
-					&& "1".equals(sysClient.getParamService("synchronous"))
-					&& "申请".equals(e.getBillType())) {
-					e.setBillType("付费");
-				}
 			}
 			//录入人
 			e.setCreateUserName(iUserClient.userInfoById(e.getCreateUser()).getData().getRealName());
@@ -863,15 +858,10 @@ public class AccController extends BladeController {
 			}
 			e.setOutstandingAmount(e.getAmount().subtract(e.getSettlementAmount()));
 		});
-		if ("681169".equals(AuthUtil.getTenantId())) {
+		if ("1".equals(domesticTrade)) {
 			ExcelUtil.export(response, "导出账单信息", "导出数据表", BeanUtil.copy(accList, ExportAccDWTOut.class), ExportAccDWTOut.class);
 		} else {
-			if (ObjectUtils.isNotNull(sysClient.getParamService("synchronous"))
-				&& "1".equals(sysClient.getParamService("synchronous"))) {
-				ExcelUtil.export(response, "导出账单信息", "导出数据表", BeanUtil.copy(accList, ExportAccDWTOut.class), ExportAccDWTOut.class);
-			} else {
 				ExcelUtil.export(response, "导出账单信息", "导出数据表", BeanUtil.copy(accList, ExportAccOut.class), ExportAccOut.class);
-			}
 		}
 
 	}

blade-service/trade-finance/src/main/java/org/springblade/finance/service/impl/SettlementServiceImpl.java

@@ -212,17 +212,13 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 		if ("待结算".equals(settlement.getFinanceStatus())) {
 			throw new SecurityException("此结算单未结算 或者 已经撤销,禁止重复操作");
 		}
-		if ("结算完成".equals(settlement.getFinanceStatus()) && "681169".equals(AuthUtil.getTenantId())) {
+		String domesticTrade = sysClient.getParamService("domestic.trade");
+		if ("结算完成".equals(settlement.getFinanceStatus()) && "1".equals(domesticTrade)) {
 			throw new SecurityException("此结算单已生成凭证,禁止撤销");
-		} else {
-			if (ObjectUtils.isNotNull(sysClient.getParamService("synchronous"))
-				&& "1".equals(sysClient.getParamService("synchronous"))) {
-				throw new SecurityException("此结算单已生成凭证,禁止撤销");
-			}
 		}
 
 		//国内财务需要判断溢付款
-		if ("681169".equals(settlement.getTenantId())) {
+		if ("1".equals(domesticTrade)) {
 			//收费明细的核销金额
 			BigDecimal reduce = new BigDecimal(BigInteger.ZERO);
 			if (CollectionUtils.isNotEmpty(itemsList)) {
@@ -250,37 +246,6 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 					throw new SecurityException(overpayment.getMsg());
 				}
 			}
-		} else {
-			if (ObjectUtils.isNotNull(sysClient.getParamService("synchronous"))
-				&& "1".equals(sysClient.getParamService("synchronous"))) {
-				//收费明细的核销金额
-				BigDecimal reduce = new BigDecimal(BigInteger.ZERO);
-				if (CollectionUtils.isNotEmpty(itemsList)) {
-					reduce = itemsList.stream().map(Items::getThisAmount).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
-				}
-				//如果人民币金额大于核销金额明细 撤销生成的溢付款  撤销使用的溢付款
-				if (settlement.getAmount().compareTo(reduce) > 0) {
-					if (settlement.getCaseOverPayment() != null && settlement.getCaseOverPayment().compareTo(BigDecimal.ZERO) > 0) {
-						throw new SecurityException("此结算单人民币金额足够,不能使用溢付款");
-					}
-					R overpayment = this.updateOverpayment(settlement, SettlementEnum.REPEALADD.getStatus(), settlement.getAmount().subtract(reduce));
-					if (!overpayment.isSuccess()) {
-						throw new SecurityException(overpayment.getMsg());
-					}
-				} else if (settlement.getAmount().compareTo(reduce) == 0) {
-					if (settlement.getCaseOverPayment() != null && settlement.getCaseOverPayment().compareTo(BigDecimal.ZERO) > 0) {
-						throw new SecurityException("此结算单人民币金额足够,不能使用溢付款");
-					}
-				} else {
-					if ((settlement.getAmount().add(settlement.getCaseOverPayment())).compareTo(reduce) != 0) {
-						throw new SecurityException("此结算单人民币金额加溢付款金额不能超过或少于结算单核销金额和");
-					}
-					R overpayment = this.updateOverpayment(settlement, SettlementEnum.REPEALREDUCE.getStatus(), settlement.getCaseOverPayment());
-					if (!overpayment.isSuccess()) {
-						throw new SecurityException(overpayment.getMsg());
-					}
-				}
-			}
 		}
 		Settlement model = new Settlement();
 		BeanUtils.copyProperties(settlementDTO, model);
@@ -357,10 +322,10 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 		if ("673511".equals(SecureUtil.getTenantId()) || "628326".equals(AuthUtil.getTenantId()) && itemsList.size() > 0) {
 			model.setBillNo(itemsList.get(0).getBillNo());
 		}
-
+		String domesticTrade = sysClient.getParamService("domestic.trade");
 		//如果id=null, 无论主表还是从表, 必然都是新增
 		//国内财务需要判断溢付款
-		if ("681169".equals(settlement.getTenantId())) {
+		if ("1".equals(domesticTrade)) {
 			//收费明细的核销金额
 			BigDecimal reduce = new BigDecimal(BigInteger.ZERO);
 			if (CollectionUtils.isNotEmpty(itemsList)) {
@@ -392,41 +357,6 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 					throw new SecurityException(overpayment.getMsg());
 				}
 			}
-		} else {
-			if (ObjectUtils.isNotNull(sysClient.getParamService("synchronous"))
-				&& "1".equals(sysClient.getParamService("synchronous"))) {
-				//收费明细的核销金额
-				BigDecimal reduce = new BigDecimal(BigInteger.ZERO);
-				if (CollectionUtils.isNotEmpty(itemsList)) {
-					reduce = itemsList.stream().map(Items::getThisAmount).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
-				}
-
-				if (ObjectUtil.isEmpty(settlement.getAmount())) {
-					settlement.setAmount(BigDecimal.ZERO);
-				}
-				//如果人民币金额大于核销金额明细生成溢付款  小于使用溢付款
-				if (settlement.getAmount().compareTo(reduce) > 0) {
-					if (settlement.getCaseOverPayment() != null && settlement.getCaseOverPayment().compareTo(BigDecimal.ZERO) > 0) {
-						throw new SecurityException("此结算单人民币金额足够,不能使用溢付款");
-					}
-					R overpayment = this.updateOverpayment(settlement, SettlementEnum.ADD.getStatus(), settlement.getAmount().subtract(reduce));
-					if (!overpayment.isSuccess()) {
-						throw new SecurityException(overpayment.getMsg());
-					}
-				} else if (settlement.getAmount().compareTo(reduce) == 0) {
-					if (settlement.getCaseOverPayment() != null && settlement.getCaseOverPayment().compareTo(BigDecimal.ZERO) > 0) {
-						throw new SecurityException("此结算单人民币金额足够,不能使用溢付款");
-					}
-				} else {
-					if ((settlement.getAmount().add(settlement.getCaseOverPayment())).compareTo(reduce) != 0) {
-						throw new SecurityException("此结算单人民币金额加溢付款金额不能超过或少于结算单核销金额和");
-					}
-					R overpayment = this.updateOverpayment(settlement, SettlementEnum.REDUCE.getStatus(), settlement.getCaseOverPayment());
-					if (!overpayment.isSuccess()) {
-						throw new SecurityException(overpayment.getMsg());
-					}
-				}
-			}
 		}
 		if (id == null) {
 
@@ -1683,13 +1613,11 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 		}
 
 		model.setForeignAmount(foreignTotal);
+		String domesticTrade = sysClient.getParamService("domestic.trade");
 		// todo 暂定用租户判断 国内贸易 收费 人民币金额 可以手输
-		if (!"681169".equals(SecureUtil.getTenantId())) {
-			if (!ObjectUtils.isNotNull(sysClient.getParamService("synchronous"))
-				&& !"1".equals(sysClient.getParamService("synchronous"))) {
-				if (!"234557".equals(SecureUtil.getTenantId())) {
-					model.setAmount(total);
-				}
+		if (!"1".equals(domesticTrade)) {
+			if (!"234557".equals(SecureUtil.getTenantId())) {
+				model.setAmount(total);
 			}
 		}
 		if ("673511".equals(SecureUtil.getTenantId()) || "628326".equals(AuthUtil.getTenantId()) && itemsList.size() > 0) {
@@ -3746,7 +3674,7 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 				throw new SecurityException("此结算单已结算过,禁止重复操作");
 			}
 			settlement.setFinanceStatus("结算完成");
-		}  else if ("对账收".equals(settlement.getBillType()) || "对账付".equals(settlement.getBillType())) {
+		} else if ("对账收".equals(settlement.getBillType()) || "对账付".equals(settlement.getBillType())) {
 			if ("已对账".equals(settlement.getFinanceStatus())) {
 				throw new SecurityException("此对账单已对账过,禁止重复操作");
 			}
@@ -3776,7 +3704,7 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 			orderList = landClient.selectOrderList(orderIdList);
 		}
 		boolean type = true;
-		if ("对账收".equals(settlementDTO.getBillType())||"对账付".equals(settlementDTO.getBillType())) {
+		if ("对账收".equals(settlementDTO.getBillType()) || "对账付".equals(settlementDTO.getBillType())) {
 			type = false;
 		}
 		for (Items item : itemsList) {
@@ -3909,7 +3837,7 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 				throw new SecurityException("此结算单未结算 或者 已经撤销,禁止重复操作");
 			}
 			settlement.setFinanceStatus("待结算");
-		}  else if ("对账收".equals(settlement.getBillType()) || "对账付".equals(settlement.getBillType())) {
+		} else if ("对账收".equals(settlement.getBillType()) || "对账付".equals(settlement.getBillType())) {
 			if ("未对账".equals(settlement.getFinanceStatus())) {
 				throw new SecurityException("此对账单未对账 或者 已经撤销,禁止重复操作");
 			}
@@ -3939,7 +3867,7 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 			orderList = landClient.selectOrderList(orderIdList);
 		}
 		boolean type = true;
-		if ("对账收".equals(settlementDTO.getBillType())||"对账付".equals(settlementDTO.getBillType())) {
+		if ("对账收".equals(settlementDTO.getBillType()) || "对账付".equals(settlementDTO.getBillType())) {
 			type = false;
 		}
 		for (Items item : itemsList) {
@@ -4060,7 +3988,7 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 				type = "CF";
 			} else if ("对账收".equals(model.getBillType())) {
 				type = "DZD";
-			}else if ("对账付".equals(model.getBillType())) {
+			} else if ("对账付".equals(model.getBillType())) {
 				type = "DZC";
 			}
 

blade-service/trade-purchase/src/main/java/com/trade/purchase/extra/service/impl/ClaimServiceImpl.java

@@ -59,6 +59,7 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.CollectionUtil;
 import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.core.tool.utils.StringUtil;
+import org.springblade.system.feign.ISysClient;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
@@ -101,7 +102,7 @@ public class ClaimServiceImpl extends ServiceImpl<ClaimMapper, Claim> implements
 
 	private final JdyTenantMapper jdTenantMapper;
 
-	private final JdyModuleMapper moduleMapper;
+	private final ISysClient sysClient;
 
 
 	@Override
@@ -360,8 +361,8 @@ public class ClaimServiceImpl extends ServiceImpl<ClaimMapper, Claim> implements
 		Claim claimOne = baseMapper.selectById(id);
 
 		String accountName = null;
-
-		if ("681169".equals(AuthUtil.getTenantId())) {
+		String domesticTrade = sysClient.getParamService("domestic.trade");
+		if ("1".equals(domesticTrade)) {
 
 			if (claimOne == null) {
 				throw new SecurityException("未查到相关数据,操作失败");

blade-service/trade-purchase/src/main/java/com/trade/purchase/extra/service/impl/LeadsServiceImpl.java

@@ -122,20 +122,12 @@ public class LeadsServiceImpl extends ServiceImpl<LeadsMapper, Leads> implements
 		leadsQueryWrapper.eq(Leads::getTenantId, AuthUtil.getTenantId());
 		leadsQueryWrapper.eq(Leads::getIsDeleted, 0);
 		leadsQueryWrapper.like(ObjectUtil.isNotEmpty(leads.getCreateUserName()), Leads::getCreateUserName, leads.getCreateUserName());
-
-		if(AuthUtil.getTenantId().equals("681169")){
+		String domesticTrade = sysClient.getParamService("domestic.trade");
+		if(domesticTrade.equals("1")){
 			String userRole = AuthUtil.getUserRole();
 			if (!userRole.contains("抄送人")) {
 				leadsQueryWrapper.eq(Leads::getCreateUser, AuthUtil.getUserId());
 			}
-		}else{
-			if (ObjectUtils.isNotNull(sysClient.getParamService("synchronous"))
-				&& "1".equals(sysClient.getParamService("synchronous"))){
-				String userRole = AuthUtil.getUserRole();
-				if (!userRole.contains("抄送人")) {
-					leadsQueryWrapper.eq(Leads::getCreateUser, AuthUtil.getUserId());
-				}
-			}
 		}
 		leadsQueryWrapper.orderByDesc(Leads::getCreateTime);
 		IPage<Leads> pages = baseMapper.selectPage(Condition.getPage(query), leadsQueryWrapper);