2025年2月7日16:56:51

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

@@ -695,6 +695,48 @@ public class OrderController extends BladeController {
 	}
 
 	/**
+	 * 小程序积分订单查询
+	 */
+	@GetMapping("/appStatusPointsList")
+	@ApiOperationSupport(order = 11)
+	@ApiOperation(value = "小程序积分订单查询", notes = "传入order")
+	public R<IPage<PjOrder>> appStatusPointsList(PjOrder order, Query query) {
+		LambdaQueryWrapper<PjOrder> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.eq(PjOrder::getTenantId, AuthUtil.getTenantId())
+			.eq(PjOrder::getIsDeleted, 0)
+			.eq(PjOrder::getBsType, "JF")
+			.eq(PjOrder::getSalesCompanyId, AuthUtil.getDeptId())//公司
+			.eq(ObjectUtils.isNotEmpty(order.getSalesCompanyName()), PjOrder::getSalesCompanyName, order.getSalesCompanyName())//所属公司
+			.and(ObjectUtils.isNotNull(order.getRetrieval()), i -> i.like(PjOrder::getGoodsNameJoin, order.getRetrieval())
+				.or().like(PjOrder::getShortcutJoin, order.getRetrieval()))
+			.apply(ObjectUtils.isNotEmpty(order.getStatus()), "find_in_set(status,'" + order.getStatus() + "')")
+			.orderByDesc(PjOrder::getCreateTime);
+		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("老板")) {
+			if (AuthUtil.getUserRole().contains("业务员")) {
+				lambdaQueryWrapper.eq(PjOrder::getSalerId, AuthUtil.getUserId());
+			} else if (AuthUtil.getUserRole().contains("客户")) {
+				lambdaQueryWrapper.eq(PjOrder::getCreateUser, AuthUtil.getUserId());
+			}
+		}
+		IPage<PjOrder> pages = orderService.page(Condition.getPage(query), lambdaQueryWrapper);
+		if (!pages.getRecords().isEmpty()) {
+			List<Long> ids = pages.getRecords().stream().map(PjOrder::getId).collect(Collectors.toList());
+			//获得销售明细
+			LambdaQueryWrapper<PjOrderItems> itemsLambdaQueryWrapper = new LambdaQueryWrapper<>();
+			itemsLambdaQueryWrapper.eq(PjOrderItems::getTenantId, AuthUtil.getTenantId())
+				.eq(PjOrderItems::getIsDeleted, 0)
+				.in(PjOrderItems::getPid, ids);
+			List<PjOrderItems> itemsList = orderItemsService.list(itemsLambdaQueryWrapper);
+			pages.getRecords().forEach(e -> {
+				if (!itemsList.isEmpty()) {
+					e.setGoodsNameJoin(itemsList.stream().filter(i -> i.getPid().equals(e.getId())).map(PjOrderItems::getGoodsName).collect(Collectors.joining(",")));
+				}
+			});
+		}
+		return R.data(pages);
+	}
+
+	/**
 	 * 销售申请退款请核
 	 */
 	@PostMapping("/checkOrder")
@@ -793,6 +835,7 @@ public class OrderController extends BladeController {
 			//公司
 			.eq(PjOrder::getSalesCompanyId, AuthUtil.getDeptId())
 			.eq(PjOrder::getActualPaymentStatus, 1)
+			.apply("find_in_set(bs_type,'XS,GX')")
 			.eq(PjOrder::getCustomerId, pjCorpsAttn.getPid())
 			.orderByDesc(PjOrder::getCreateTime);
 		List<PjOrder> list = orderService.list(lambdaQueryWrapper);

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/statistics/service/impl/StatisticsServiceImpl.java

@@ -620,11 +620,11 @@ public class StatisticsServiceImpl implements IStatisticsService {
 						}
 						if ("已取消".equals(items.getStatus())) {
 							items.setBalanceAmount(new BigDecimal("0.00"));
-							items.setGoodsNum(new BigDecimal("0.00"));
-							items.setProfit(new BigDecimal("0.00"));
-							items.setSubTotalMoney(new BigDecimal("0.00"));
-							items.setFreight(new BigDecimal("0.00"));
-							items.setCostprie(new BigDecimal("0.00"));
+//							items.setGoodsNum(new BigDecimal("0.00"));
+//							items.setProfit(new BigDecimal("0.00"));
+//							items.setSubTotalMoney(new BigDecimal("0.00"));
+//							items.setFreight(new BigDecimal("0.00"));
+//							items.setCostprie(new BigDecimal("0.00"));
 						} else {
 							if ("TKXS".equals(item.getBsType()) || "TKCG".equals(item.getBsType())) {
 								if (amount.compareTo(items.getSubTotalMoney().abs()) >= 0) {
@@ -779,11 +779,11 @@ public class StatisticsServiceImpl implements IStatisticsService {
 						}
 						if ("已取消".equals(items.getStatus())) {
 							items.setBalanceAmount(new BigDecimal("0.00"));
-							items.setGoodsNum(new BigDecimal("0.00"));
-							items.setProfit(new BigDecimal("0.00"));
-							items.setSubTotalMoney(new BigDecimal("0.00"));
-							items.setFreight(new BigDecimal("0.00"));
-							items.setCostprie(new BigDecimal("0.00"));
+//							items.setGoodsNum(new BigDecimal("0.00"));
+//							items.setProfit(new BigDecimal("0.00"));
+//							items.setSubTotalMoney(new BigDecimal("0.00"));
+//							items.setFreight(new BigDecimal("0.00"));
+//							items.setCostprie(new BigDecimal("0.00"));
 						} else {
 							if ("TKXS".equals(item.getBsType()) || "TKCG".equals(item.getBsType())) {
 								if (amount.compareTo(items.getSubTotalMoney().abs()) >= 0) {
@@ -1090,11 +1090,11 @@ public class StatisticsServiceImpl implements IStatisticsService {
 						}
 						if ("已取消".equals(items.getStatus())) {
 							items.setBalanceAmount(new BigDecimal("0.00"));
-							items.setGoodsNum(new BigDecimal("0.00"));
-							items.setProfit(new BigDecimal("0.00"));
-							items.setSubTotalMoney(new BigDecimal("0.00"));
-							items.setFreight(new BigDecimal("0.00"));
-							items.setCostprie(new BigDecimal("0.00"));
+//							items.setGoodsNum(new BigDecimal("0.00"));
+//							items.setProfit(new BigDecimal("0.00"));
+//							items.setSubTotalMoney(new BigDecimal("0.00"));
+//							items.setFreight(new BigDecimal("0.00"));
+//							items.setCostprie(new BigDecimal("0.00"));
 						} else {
 							if ("TKXS".equals(item.getBsType()) || "TKCG".equals(item.getBsType())) {
 								if (amount.compareTo(items.getSubTotalMoney().abs()) >= 0) {
@@ -1123,10 +1123,10 @@ public class StatisticsServiceImpl implements IStatisticsService {
 						}
 						items.setSurplusNum(items.getGoodsNum().subtract(items.getOutGoodsTotalShipNum()));
 						items.setSurplusAmount(items.getSubTotalMoney().subtract(items.getOutGoodsTotalShipAmount()));
+						saleDetailDtoList2.add(items);
 					}
 				}
 			}
-
 		}
 		return saleDetailDtoList2;
 	}