2022年10月23 20:28

blade-service/blade-land/src/main/java/org/springblade/land/controller/OrderController.java

@@ -247,14 +247,20 @@ public class OrderController extends BladeController {
 		List<OrderAcctVO> acct = orderService.getAcctNoPage(acctVO);
 
 		String role = AuthUtil.getUserRole();
-		System.out.println("role==="+role);
 		if (role.contains(LandConst.ROLE_KH)) {
 			List<KhAcctExcel> list = new ArrayList<>();
 			if (CollectionUtils.isNotEmpty(acct)) {
 				list = BeanUtil.copy(acct, KhAcctExcel.class);
 			}
 			ExcelUtil.export(response, "陆运台账", "陆运台账", list, KhAcctExcel.class);
-		} else if (role.contains(LandConst.ROLE_PT) && role.contains(LandConst.ROLE_FGDD)) {
+		} else if (role.contains(LandConst.ROLE_DUZX) || role.contains(LandConst.DDZX_MANAGER)) {
+			List<DdzxAcctExcel> list = new ArrayList<>();
+			if (CollectionUtils.isNotEmpty(acct)) {
+				list = BeanUtil.copy(acct, DdzxAcctExcel.class);
+			}
+			ExcelUtil.export(response, "陆运台账", "陆运台账", list, DdzxAcctExcel.class);
+		}else if (role.contains(LandConst.ROLE_PT) && role.contains(LandConst.ROLE_FGDD)
+			&& !role.contains(LandConst.ROLE_DUZX) && !role.contains(LandConst.DDZX_MANAGER)) {
 			List<PtAcctExcel> list = new ArrayList<>();
 			if (CollectionUtils.isNotEmpty(acct)) {
 				list = BeanUtil.copy(acct, PtAcctExcel.class);
@@ -278,13 +284,7 @@ public class OrderController extends BladeController {
 				list = BeanUtil.copy(acct, PtZddAcctExcel.class);
 			}
 			ExcelUtil.export(response, "陆运台账", "陆运台账", list, PtZddAcctExcel.class);
-		}else if (role.contains(LandConst.ROLE_DUZX) || role.contains(LandConst.DDZX_MANAGER)) {
-			List<DdzxAcctExcel> list = new ArrayList<>();
-			if (CollectionUtils.isNotEmpty(acct)) {
-				list = BeanUtil.copy(acct, DdzxAcctExcel.class);
-			}
-			ExcelUtil.export(response, "陆运台账", "陆运台账", list, DdzxAcctExcel.class);
-		}else {
+		}{
 			throw new RuntimeException("用户无导出权限");
 		}
 	}

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

@@ -343,8 +343,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				// 采购金额求和
 				BigDecimal reduce = list.stream().reduce(BigDecimal.ZERO, (x, y) -> x.add(y.getPurchaseAmount().multiply(y.getOrderQuantity())), BigDecimal::add);
 				// 金额求和
-//				BigDecimal amount = list.stream().map(OrderItems::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);  //旧
-				BigDecimal amount = list.stream().map(OrderItems::getOutFactoryPrice).reduce(BigDecimal.ZERO, BigDecimal::add);//新
+				BigDecimal amount = BigDecimal.ZERO;
+				if (AuthUtil.getTenantId().equals("577435")){
+					amount = list.stream().map(OrderItems::getOutFactoryPrice).reduce(BigDecimal.ZERO, BigDecimal::add);
+				}else {
+					amount = list.stream().map(OrderItems::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
+				}
 				//毛利额 = 销售金额-采购金额-预计海运费-本次使用返利+应收费用（除包装费）
 				BigDecimal grossProfit = amount.subtract(reduce.add(order.getPredictOceanFreight())).subtract(order.getCreateProfit() == null ? BigDecimal.ZERO : order.getCreateProfit());
 				//国内主表需要总重量总体积