2023年3月1日12:30:44

blade-service/blade-client/src/main/java/org/springblade/client/tonglianPayment/controller/ParametersController.java

@@ -26,6 +26,7 @@ import javax.validation.Valid;
 import org.springblade.client.tonglianPayment.service.IParametersService;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springframework.web.bind.annotation.*;
@@ -66,6 +67,7 @@ public class ParametersController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入parameters")
 	public R<IPage<Parameters>> list(Parameters parameters, Query query) {
+		parameters.setTenantId(AuthUtil.getTenantId());
 		IPage<Parameters> pages = parametersService.page(Condition.getPage(query), Condition.getQueryWrapper(parameters));
 		return R.data(pages);
 	}
@@ -88,6 +90,7 @@ public class ParametersController extends BladeController {
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "新增", notes = "传入parameters")
 	public R save(@Valid @RequestBody Parameters parameters) {
+		parameters.setTenantId(AuthUtil.getTenantId());
 		return R.status(parametersService.save(parameters));
 	}
 
@@ -98,6 +101,7 @@ public class ParametersController extends BladeController {
 	@ApiOperationSupport(order = 5)
 	@ApiOperation(value = "修改", notes = "传入parameters")
 	public R update(@Valid @RequestBody Parameters parameters) {
+		parameters.setTenantId(AuthUtil.getTenantId());
 		return R.status(parametersService.updateById(parameters));
 	}
 
@@ -108,6 +112,7 @@ public class ParametersController extends BladeController {
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入parameters")
 	public R submit(@Valid @RequestBody Parameters parameters) {
+		parameters.setTenantId(AuthUtil.getTenantId());
 		return R.status(parametersService.saveOrUpdate(parameters));
 	}
 

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/controller/ExportDeliveryController.java

@@ -262,16 +262,13 @@ public class ExportDeliveryController extends BladeController {
 	@ApiOperation(value = "出口贸易首页 收发货审核数据", notes = "出口贸易首页 收发货审核数据")
 	public R checkDate(Delivery delivery){
 		DeliveryData deliveryData = new DeliveryData();
-		if ("673511".equals(AuthUtil.getTenantId())){
+		if (StringUtils.isBlank(delivery.getTradeType())){
 
 			deliveryData.setFinancingNumber(iFinancingClient.count());
 			deliveryData.setSellNumber(iOrderDescClient.countOrder("CK",null,null, "check"));
 			deliveryData.setPurchaseNumber(iOrderDescClient.countOrder("RK",null,null,"check"));
 			deliveryData.setInventoryNumber(iOrderDescClient.countOrder("PD",null,null,"check"));
 		}else{
-			if (StringUtils.isBlank(delivery.getTradeType())){
-				throw new SecurityException("缺少贸易类型");
-			}
 			//获取发货未审核数据
 			LambdaQueryWrapper<Delivery> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 			lambdaQueryWrapper.eq(Delivery::getIsDeleted,0);
@@ -307,7 +304,7 @@ public class ExportDeliveryController extends BladeController {
 	@ApiOperation(value = "出口贸易首页 收发货实时数据", notes = "出口贸易首页 收发货实时数据")
 	public R realTimeData(DeliveryVO delivery) {
 		DeliveryData deliveryData = new DeliveryData();
-		if ("673511".equals(AuthUtil.getTenantId())) {
+		if (StringUtils.isBlank(delivery.getTradeType())) {
 			if (ObjectUtils.isNotNull(delivery.getOrderStartDate()) && ObjectUtils.isNotNull(delivery.getOrderEndDate())){
 				delivery.setOrderStartDate(delivery.getOrderStartDate()+" 00:00:00");
 				delivery.setOrderEndDate(delivery.getOrderEndDate()+" 24:59:59");
@@ -315,9 +312,7 @@ public class ExportDeliveryController extends BladeController {
 			deliveryData.setSellNumber(iOrderDescClient.countOrder("CK",delivery.getOrderStartDate(),delivery.getOrderEndDate(),"1"));
 			deliveryData.setPurchaseNumber(iOrderDescClient.countOrder("RK",delivery.getOrderStartDate(),delivery.getOrderEndDate(),"1"));
 		} else {
-			if (StringUtils.isBlank(delivery.getTradeType())) {
-				throw new SecurityException("缺少贸易类型");
-			}
+
 			//获取发货未审核数据
 			LambdaQueryWrapper<Delivery> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 			lambdaQueryWrapper.eq(Delivery::getIsDeleted, 0);

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

@@ -639,7 +639,7 @@ public class ExportOrderController extends BladeController {
 	@ApiOperation(value = "出口贸易首页 订单审核数据", notes = "出口贸易首页 订单审核数据")
 	public R checkDate(OrderVO order) {
 		CheckDate checkDate = new CheckDate();
-		if (AuthUtil.getTenantId().equals("673511")) {
+		if (StringUtils.isBlank(order.getTradeType())) {
 			//入库待审核
 			LambdaQueryWrapper<Order> RKlambdaQueryWrapper = new LambdaQueryWrapper<>();
 			RKlambdaQueryWrapper.eq(Order::getTenantId, AuthUtil.getTenantId())
@@ -672,10 +672,6 @@ public class ExportOrderController extends BladeController {
 			checkDate.setOfferNumber(orderService.count(PDlambdaQueryWrapper));
 			checkDate.setFinancingSum(financingClient.count());
 		} else {
-			if (StringUtils.isBlank(order.getTradeType())) {
-				throw new SecurityException("缺少贸易类型");
-			}
-
 			//获取销售未审核数据
 			LambdaQueryWrapper<Order> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 			lambdaQueryWrapper.eq(Order::getIsDeleted, 0);
@@ -722,7 +718,7 @@ public class ExportOrderController extends BladeController {
 	@ApiOperation(value = "出口贸易首页 订单实时数据", notes = "出口贸易首页 订单实时数据")
 	public R realTimeData(OrderVO order) {
 		CheckDate checkDate = new CheckDate();
-		if (AuthUtil.getTenantId().equals("673511")) {
+		if (StringUtils.isBlank(order.getTradeType())) {
 			//入库待审核
 			LambdaQueryWrapper<Order> RKlambdaQueryWrapper = new LambdaQueryWrapper<>();
 			RKlambdaQueryWrapper.eq(Order::getTenantId, AuthUtil.getTenantId())
@@ -746,9 +742,6 @@ public class ExportOrderController extends BladeController {
 			checkDate.setPurchaseNumber(RKOrderList.stream().map(Order::getStorageQuantity).reduce(BigDecimal.ZERO, BigDecimal::add).intValue());
 			checkDate.setSellNumber(CKOrderList.stream().map(Order::getStorageQuantity).reduce(BigDecimal.ZERO, BigDecimal::add).intValue());
 		} else {
-			if (StringUtils.isBlank(order.getTradeType())) {
-				throw new SecurityException("缺少贸易类型");
-			}
 			//获取销售未审核数据
 			LambdaQueryWrapper<Order> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 			lambdaQueryWrapper.eq(Order::getIsDeleted, 0);

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

@@ -33,10 +33,13 @@ import org.springblade.purchase.sales.excel.AnalysisDetailsExcel;
 import org.springblade.purchase.sales.service.IOrderItemsService;
 import org.springblade.purchase.sales.service.IOrderService;
 import org.springblade.purchase.sales.vo.OrderVO;
+import org.springblade.system.entity.Tenant;
+import org.springblade.system.feign.ISysClient;
 import org.springblade.system.user.entity.User;
 import org.springblade.system.user.feign.IUserClient;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.math.BigDecimal;
@@ -62,6 +65,7 @@ public class AppPartsController extends BladeController {
 	private final IUserClient userClient;//获取用户信息
 	private final IStorageClient iStorageClient;//库区信息
 	private final IFinanceClient financeClient;
+	private final ISysClient sysClient;
 	/**
 	 * 库区信息
 	 */
@@ -72,7 +76,16 @@ public class AppPartsController extends BladeController {
 	 */
 	@GetMapping("/revenueExpenditure")
 	@ApiOperation(value = "营业收入和采购支出", notes = "传入order")
-	public R revenueExpenditure(@RequestParam("tenantId") String tenantId) {
+	public R revenueExpenditure(@RequestParam(value = "tenantId" ,required = false) String tenantId, HttpServletRequest request) {
+		if (ObjectUtils.isNull(request.getHeader("Blade-Auth"))){
+			// 获取租户信息
+			R<Tenant> tenant = sysClient.getTenantByAppId(request.getHeader("appId"));
+			if (tenant.isSuccess() && ObjectUtils.isNotNull(tenant.getData())) {
+				tenantId = tenant.getData().getTenantId();
+			} else {
+				throw new RuntimeException("获取数据失败");
+			}
+		}
 		return R.data(orderService.revenueExpenditure(tenantId));
 	}
 

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

@@ -5944,7 +5944,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	@Override
 	public MonthSales monthSales(OrderVO order) {
 		MonthSales monthSales = new MonthSales();
-		if (AuthUtil.getTenantId().equals("673511")) {
+		if (StringUtils.isBlank(order.getTradeType())) {
 			//入库总单据
 			LambdaQueryWrapper<Order> RKSumLambdaQueryWrapper = new LambdaQueryWrapper<>();
 			RKSumLambdaQueryWrapper.eq(Order::getTenantId, AuthUtil.getTenantId())
@@ -5969,9 +5969,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				monthSales.setYieldRate(BigDecimal.ZERO);
 			}
 		} else {
-			if (StringUtils.isBlank(order.getTradeType())) {
-				throw new SecurityException("缺少贸易类型");
-			}
 			if (StringUtils.isBlank(order.getBillType())) {
 				throw new SecurityException("缺少订单类型");
 			}

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

@@ -229,7 +229,7 @@ public class AccController extends BladeController {
 				accLambdaQueryWrapper.ge(Acc::getRentStartDate, acc.getRentStartDateList().get(0));
 				accLambdaQueryWrapper.le(Acc::getRentStartDate, acc.getRentStartDateList().get(1));
 			}
-			if ("673511".equals(AuthUtil.getTenantId())) {
+			if ("673511".equals(AuthUtil.getTenantId()) || "628326".equals(AuthUtil.getTenantId())) {
 				accLambdaQueryWrapper.ge(ObjectUtils.isNotNull(acc.getCreateStartDate()), Acc::getSrcDate, acc.getCreateStartDate())
 					.le(ObjectUtils.isNotNull(acc.getCreateEndDate()), Acc::getSrcDate, acc.getCreateEndDate());
 			}
@@ -584,7 +584,7 @@ public class AccController extends BladeController {
 		} else if (acc.getSettlementStatus() != null && acc.getSettlementStatus() == 2) {
 			accLambdaQueryWrapper.apply("Amount != Settlement_Amount");
 		}
-		if ("673511".equals(AuthUtil.getTenantId())) {
+		if ("673511".equals(AuthUtil.getTenantId()) || "628326".equals(AuthUtil.getTenantId())) {
 			accLambdaQueryWrapper.ge(ObjectUtils.isNotNull(acc.getCreateStartDate()), Acc::getSrcDate, acc.getCreateStartDate())
 				.le(ObjectUtils.isNotNull(acc.getCreateEndDate()), Acc::getSrcDate, acc.getCreateEndDate());
 		}
@@ -804,7 +804,7 @@ public class AccController extends BladeController {
 		} else if (acc.getSettlementStatus() != null && acc.getSettlementStatus() == 2) {
 			accLambdaQueryWrapper.apply("Amount != Settlement_Amount");
 		}
-		if ("673511".equals(AuthUtil.getTenantId())) {
+		if ("673511".equals(AuthUtil.getTenantId()) || "628326".equals(AuthUtil.getTenantId())) {
 			accLambdaQueryWrapper.ge(ObjectUtils.isNotNull(acc.getCreateStartDate()), Acc::getSrcDate, acc.getCreateStartDate())
 				.le(ObjectUtils.isNotNull(acc.getCreateEndDate()), Acc::getSrcDate, acc.getCreateEndDate());
 		}

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

@@ -249,7 +249,7 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 		order.setOrderNo(settlement.getSrcOrderno());
 		Order order1 = orderDescClient.getByOrder(order);
 		if (ObjectUtils.isNotNull(order1)) {
-			if (!"673511".equals(AuthUtil.getTenantId())) {
+			if (!"673511".equals(AuthUtil.getTenantId()) || !"628326".equals(AuthUtil.getTenantId())) {
 				orderFeesClient.updateOrder(order1.getId());
 			}
 		}
@@ -290,7 +290,7 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 		List<Items> itemsList = settlementDTO.getItemsList();
 		model.setItemsList(itemsList);
 
-		if ("673511".equals(SecureUtil.getTenantId()) && itemsList.size() > 0) {
+		if ("673511".equals(SecureUtil.getTenantId()) || "628326".equals(AuthUtil.getTenantId()) && itemsList.size() > 0) {
 			model.setBillNo(itemsList.get(0).getBillNo());
 		}
 
@@ -1404,7 +1404,7 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 				model.setAmount(total);
 			}
 		}
-		if ("673511".equals(SecureUtil.getTenantId()) && itemsList.size() > 0) {
+		if ("673511".equals(SecureUtil.getTenantId()) || "628326".equals(AuthUtil.getTenantId()) && itemsList.size() > 0) {
 			model.setBillNo(itemsList.get(0).getBillNo());
 		}
 		//如果id=null, 无论主表还是从表, 必然都是新增

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/mapper/OrderItemsMapper.xml

@@ -138,7 +138,7 @@
     </select>
     <select id="appIndexStatistics" resultType="java.math.BigDecimal">
             SELECT IFNULL(sum(storage_in_quantity),0) FROM business_order_items
-            WHERE is_deleted = 0 and tenant_id = '673511'
+            WHERE is_deleted = 0 and (tenant_id = '673511' or tenant_id = '628326')
             <if test="billType == 'RK'">
                 and is_Issue = '3'
             </if>

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/service/impl/OrderServiceImpl.java

@@ -2108,7 +2108,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				for (OrderItems item : orderItems) {
 					try {
 						//创建文件夹
-						File packageFile = new File("/home/minio/file/673511-bladex/upload");
+						File packageFile = new File("/home/minio/file/"+AuthUtil.getTenantId()+"-bladex/upload");
 						//文件夹是否创建成功
 						if (!packageFile.getParentFile().exists()) {
 							boolean a = packageFile.mkdirs();