2025年2月19日16:09:47

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/dto/SaleDetail.java

@@ -116,5 +116,17 @@ public class SaleDetail {
 	@ExcelIgnore
 	private String whetherRebate;
 
+	/**
+	 * 业务公司
+	 */
+	@ExcelProperty(value = "业务公司")
+	private String logisticsCorpName;
+
+	/**
+	 * 制单人
+	 */
+	@ExcelProperty(value = "制单人")
+	private String createUserName;
+
 
 }

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/dto/SaleDetailDto.java

@@ -5,6 +5,7 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
 import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -118,6 +119,21 @@ public class SaleDetailDto {
 	@ExcelProperty(value = "毛利")
 	private BigDecimal profit;
 	/**
+	 * 毛利
+	 */
+	@ExcelProperty(value = "发票金额")
+	private BigDecimal invoiceAmount;
+	/**
+	 * 业务公司
+	 */
+	@ExcelProperty(value = "业务公司")
+	private String logisticsCorpName;
+	/**
+	 * 制单人
+	 */
+	@ExcelProperty(value = "制单人")
+	private String createUserName;
+	/**
 	 * 业务日期起
 	 */
 	@ExcelIgnore

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjSettlement.java

@@ -204,4 +204,15 @@ public class PjSettlement implements Serializable {
 	 */
 	@TableField(exist = false)
 	private List<PjpfFiles> filesList;
+
+	/**
+	 * 物流公司id
+	 */
+	@ApiModelProperty(value = "物流公司id")
+	private String logisticsCorpId;
+	/**
+	 * 物流公司名称
+	 */
+	@ApiModelProperty(value = "物流公司名称")
+	private String logisticsCorpName;
 }

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjSettlementItems.java

@@ -178,5 +178,16 @@ public class PjSettlementItems implements Serializable {
 	@ApiModelProperty(value = "发票日期")
 	private Date invoiceDate;
 
+	/**
+	 * 物流公司id
+	 */
+	@ApiModelProperty(value = "物流公司id")
+	private String logisticsCorpId;
+	/**
+	 * 物流公司名称
+	 */
+	@ApiModelProperty(value = "物流公司名称")
+	private String logisticsCorpName;
+
 
 }

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

@@ -114,7 +114,7 @@ public class OrderController extends BladeController {
 				PjOrder::getGoodsTotalShipAmount, PjOrder::getOutGoodsTotalShipNum, PjOrder::getOutGoodsTotalShipAmount,
 				PjOrder::getGoodsTotalShipNum, PjOrder::getSalesAmount, PjOrder::getRefno, PjOrder::getPrimaryGoodsTotalNum,
 				PjOrder::getPrimaryFundingAmount, PjOrder::getUseAdvanceChargeAmount, PjOrder::getProduceAdvanceChargeAmount,
-				PjOrder::getDeliveryBusinesDate, PjOrder::getSalesCompanyId)
+				PjOrder::getDeliveryBusinesDate, PjOrder::getSalesCompanyId,PjOrder::getLogisticsCorpName)
 			.eq(PjOrder::getTenantId, AuthUtil.getTenantId())
 			.eq(PjOrder::getIsDeleted, 0)
 			.eq(PjOrder::getBsType, order.getBsType())
@@ -123,6 +123,7 @@ public class OrderController extends BladeController {
 			.eq(ObjectUtils.isNotEmpty(order.getReturnsStatus()), PjOrder::getReturnsStatus, order.getReturnsStatus())//退货状态
 			.like(ObjectUtils.isNotEmpty(order.getStorageName()), PjOrder::getStorageName, order.getStorageName())
 			.like(ObjectUtils.isNotEmpty(order.getSalerName()), PjOrder::getSalerName, order.getSalerName())
+			.like(ObjectUtils.isNotEmpty(order.getLogisticsCorpName()), PjOrder::getLogisticsCorpName, order.getLogisticsCorpName())
 			.eq(ObjectUtils.isNotEmpty(order.getCustomerId()), PjOrder::getCustomerId, order.getCustomerId())//客户
 			.eq(ObjectUtils.isNotEmpty(order.getGenerateTask()), PjOrder::getGenerateTask, order.getGenerateTask())//客户
 			.eq(ObjectUtils.isNotEmpty(order.getSalerId()), PjOrder::getSalerId, order.getSalerId())//业务员
@@ -259,7 +260,7 @@ public class OrderController extends BladeController {
 				PjOrder::getGoodsTotalShipAmount, PjOrder::getOutGoodsTotalShipNum, PjOrder::getOutGoodsTotalShipAmount,
 				PjOrder::getGoodsTotalShipNum, PjOrder::getSalesAmount, PjOrder::getRefno, PjOrder::getPrimaryGoodsTotalNum,
 				PjOrder::getPrimaryFundingAmount, PjOrder::getUseAdvanceChargeAmount, PjOrder::getProduceAdvanceChargeAmount,
-				PjOrder::getCost, PjOrder::getGrossProfit, PjOrder::getFreight)
+				PjOrder::getCost, PjOrder::getGrossProfit, PjOrder::getFreight,PjOrder::getLogisticsCorpName)
 			.eq(PjOrder::getTenantId, AuthUtil.getTenantId())
 			.eq(PjOrder::getIsDeleted, 0)
 			.eq(PjOrder::getBsType, order.getBsType())

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/order/mapper/OrderItemsMapper.xml

@@ -111,6 +111,8 @@
     <select id="saleDetailPage" resultType="org.springblade.salesPart.dto.SaleDetailDto">
         SELECT
         po.customer_name AS customerName,
+        po.invoice_amount AS invoiceAmount,
+        po.logistics_corp_name AS logisticsCorpName,
         bu.real_name AS salerName,
         poi.pid AS pid,
         poi.id AS itemId,
@@ -248,12 +250,14 @@
         IF
         ( poi.primary_goods_total_amount, poi.primary_goods_total_amount, 0 ) AS primaryGoodsTotalMoney,
         IF
-        ( poi.primary_goods_total_num, poi.primary_goods_total_num, 0 ) AS primary_goods_total_num
+        ( poi.primary_goods_total_num, poi.primary_goods_total_num, 0 ) AS primary_goods_total_num,
+        buc.real_name AS createUserName
         FROM
         `pjpf_order_items` poi
         LEFT JOIN pjpf_goods_desc pgd ON poi.goods_id = pgd.id
         LEFT JOIN pjpf_order po ON poi.pid = po.id
         LEFT JOIN blade_user bu ON po.saler_id = bu.id
+        LEFT JOIN blade_user buc ON po.create_user = buc.id
         LEFT JOIN pjpf_storage_desc psd on  po.storage_id = psd.id
         WHERE
         poi.is_deleted = '0'
@@ -267,6 +271,9 @@
         <if test="saleDetailDto.storageId !=null and saleDetailDto.storageId != ''">
             and po.storage_id=#{saleDetailDto.storageId}
         </if>
+        <if test="saleDetailDto.logisticsCorpName !=null and saleDetailDto.logisticsCorpName != ''">
+            and po.logistics_corp_name=#{saleDetailDto.logisticsCorpName}
+        </if>
         <if test="saleDetailDto.businessSource !=null and saleDetailDto.businessSource != ''">
             and po.business_source=#{saleDetailDto.businessSource}
         </if>
@@ -325,6 +332,8 @@
     <select id="saleDetailList" resultType="org.springblade.salesPart.dto.SaleDetailDto">
         SELECT
         po.customer_name AS customerName,
+        po.invoice_amount AS invoiceAmount,
+        po.logistics_corp_name AS logisticsCorpName,
         bu.real_name AS salerName,
         poi.pid AS pid,
         poi.id AS itemId,
@@ -462,12 +471,14 @@
         IF
         ( poi.primary_goods_total_amount, poi.primary_goods_total_amount, 0 ) AS primaryGoodsTotalMoney,
         IF
-        ( poi.primary_goods_total_num, poi.primary_goods_total_num, 0 ) AS primary_goods_total_num
+        ( poi.primary_goods_total_num, poi.primary_goods_total_num, 0 ) AS primary_goods_total_num,
+        buc.real_name AS createUserName
         FROM
         `pjpf_order_items` poi
         LEFT JOIN pjpf_goods_desc pgd ON poi.goods_id = pgd.id
         LEFT JOIN pjpf_order po ON poi.pid = po.id
         LEFT JOIN blade_user bu ON po.saler_id = bu.id
+        LEFT JOIN blade_user buc ON po.create_user = buc.id
         LEFT JOIN pjpf_storage_desc psd on  po.storage_id = psd.id
         WHERE
         poi.is_deleted = '0'
@@ -481,6 +492,9 @@
         <if test="storageId !=null and storageId != ''">
             and po.storage_id=#{storageId}
         </if>
+        <if test="logisticsCorpName !=null and logisticsCorpName != ''">
+            and po.logistics_corp_name=#{logisticsCorpName}
+        </if>
         <if test="customerName !=null and customerName != ''">
             and po.customer_name like concat('%', #{customerName}, '%')
         </if>

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/order/service/impl/OrderServiceImpl.java

@@ -4730,6 +4730,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 		order.setReturnsStatus("");
 		order.setOrdNo("");
 		order.setSrcOrdNo("");
+		order.setGenerateTask("0");
 		order.setDeliveryBusinesDate(null);
 		//获得销售明细
 		LambdaQueryWrapper<PjOrderItems> itemsLambdaQueryWrapper = new LambdaQueryWrapper<>();

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/settlement/controller/SettlementController.java

@@ -102,6 +102,7 @@ public class SettlementController extends BladeController {
 		lambdaQueryWrapper.eq(ObjectUtils.isNotNull(settlement.getAccountId()), PjSettlement::getAccountId, settlement.getAccountId());
 		lambdaQueryWrapper.eq(ObjectUtils.isNotNull(settlement.getFinanceStatus()), PjSettlement::getFinanceStatus, settlement.getFinanceStatus());
 		lambdaQueryWrapper.eq(ObjectUtils.isNotNull(settlement.getSettlementDate()), PjSettlement::getSettlementDate, settlement.getSettlementDate());
+		lambdaQueryWrapper.eq(ObjectUtils.isNotNull(settlement.getLogisticsCorpId()), PjSettlement::getLogisticsCorpId, settlement.getLogisticsCorpId());
 		lambdaQueryWrapper.eq(PjSettlement::getSalesCompanyId, AuthUtil.getDeptId());//公司
 		lambdaQueryWrapper.eq(ObjectUtils.isNotNull(settlement.getDc()), PjSettlement::getDc, settlement.getDc());
 		if (ObjectUtils.isNotNull(settlement.getSettlementDateList()) && !settlement.getSettlementDateList().isEmpty()) {

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/settlement/service/impl/SettlementServiceImpl.java

@@ -113,6 +113,8 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, PjSettl
 			settlement.setInvoiceNo(settlement.getSettlementItemsList().stream().map(PjSettlementItems::getInvoiceNo)
 				.collect(Collectors.joining(",")));
 			for (PjSettlementItems item : settlement.getSettlementItemsList()) {
+				settlement.setLogisticsCorpId(item.getLogisticsCorpId());
+				settlement.setLogisticsCorpName(item.getLogisticsCorpName());
 				stringBuilder.append(item.getSrcBillNo()).append(",");
 				if (item.getId() == null) {
 					item.setCreateTime(new Date());

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

@@ -973,79 +973,6 @@ public class StatisticsServiceImpl implements IStatisticsService {
 					.eq(PjOrderItems::getTenantId, AuthUtil.getTenantId())
 					.in(PjOrderItems::getPid, pids));
 			}
-			/*for (PjOrder item : pjOrderList) {
-				List<SaleDetailDto> saleDetailDtoList1 = saleDetailDtoIPage.stream()
-					.filter(e -> e.getOrdNo().equals(item.getOrdNo())).collect(Collectors.toList());
-				if (!saleDetailDtoList1.isEmpty()) {
-					BigDecimal returnsAmount = pjOrderItemsList.stream().filter(e -> e.getPid().equals(item.getId())
-							&& !"线下退款".equals(e.getRefundType())).map(PjOrderItems::getReturnsAmount)
-						.reduce(BigDecimal.ZERO, BigDecimal::add);
-					BigDecimal amount = item.getPaymentAmountTl().subtract(returnsAmount);
-					amount = amount.abs();
-					for (SaleDetailDto items : saleDetailDtoList1) {
-						items.setRemarks(item.getRemarks());
-						if (!pjOrderItemsList.isEmpty()) {
-							PjOrderItems orderItems = pjOrderItemsList.stream().filter(e -> e.getId().equals(items.getItemId())).findFirst().orElse(null);
-							if (orderItems != null) {
-								items.setItemRemarks(orderItems.getRemarks());
-								items.setGoodsNum(orderItems.getGoodsNum());
-								items.setPrice(orderItems.getPrice());
-								items.setSubTotalMoney(orderItems.getGoodsNum().multiply(orderItems.getPrice()));
-								items.setSubTotalMoney(items.getSubTotalMoney().add(item.getFreight()));
-								if ("1".equals(saleDetailDto.getWhetherRebate())) {
-									items.setCostprie(orderItems.getGoodsNum().multiply(orderItems.getRebatePrice()));
-								} else {
-									items.setCostprie(orderItems.getGoodsNum().multiply(orderItems.getCostpriePrice()));
-								}
-								items.setProfit(items.getSubTotalMoney().subtract(items.getCostprie()));
-								items.setReturnsNumber(orderItems.getReturnsNumber());
-								items.setReturnsAmount(orderItems.getReturnsAmount());
-								items.setOutGoodsTotalShipNum(orderItems.getOutGoodsTotalShipNum());
-								items.setOutGoodsTotalShipAmount(orderItems.getOutGoodsTotalShipAmount());
-								items.setPrimaryGoodsTotalNum(orderItems.getPrimaryGoodsTotalNum());
-								items.setPrimaryGoodsTotalMoney(orderItems.getPrimaryGoodsTotalAmount());
-								items.setCostpriePrice(orderItems.getCostpriePrice());
-							}
-						}
-						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"));
-						} else {
-							if ("TKXS".equals(item.getBsType()) || "TKCG".equals(item.getBsType())) {
-								if (amount.compareTo(items.getSubTotalMoney().abs()) >= 0) {
-									items.setBalanceAmount(new BigDecimal("0.00"));
-									amount = amount.subtract(items.getSubTotalMoney().abs());
-								} else {
-									items.setBalanceAmount(new BigDecimal("0.00").subtract(items.getSubTotalMoney().abs().subtract(amount)));
-									amount = new BigDecimal("0.00");
-								}
-								items.setGoodsNum(new BigDecimal("0.00").subtract(items.getReturnsNumber()));
-								items.setSubTotalMoney(new BigDecimal("0.00").subtract(items.getReturnsAmount()).subtract(item.getFreight()));
-								BigDecimal costprie = items.getReturnsNumber().multiply(items.getCostpriePrice());
-								BigDecimal profit = items.getSubTotalMoney().abs().subtract(costprie);
-								items.setProfit(new BigDecimal("0.00").subtract(profit));
-								items.setFreight(new BigDecimal("0.00").subtract(items.getFreight()));
-								items.setCostprie(new BigDecimal("0.00").subtract(costprie));
-							} else {
-								if (amount.compareTo(items.getSubTotalMoney()) >= 0) {
-									items.setBalanceAmount(new BigDecimal("0.00"));
-									amount = amount.subtract(items.getSubTotalMoney());
-								} else {
-									items.setBalanceAmount(items.getSubTotalMoney().subtract(amount));
-									amount = new BigDecimal("0.00");
-								}
-							}
-						}
-						items.setSurplusNum(items.getGoodsNum().subtract(items.getOutGoodsTotalShipNum()));
-						items.setSurplusAmount(items.getSubTotalMoney().subtract(items.getOutGoodsTotalShipAmount()));
-						saleDetailDtoList2.add(items);
-					}
-				}
-			}*/
 			for (PjOrder item : pjOrderList) {
 				List<SaleDetailDto> saleDetailDtoList1 = saleDetailDtoIPage.stream()
 					.filter(e -> e.getOrdNo().equals(item.getOrdNo())).collect(Collectors.toList());
@@ -1135,7 +1062,7 @@ public class StatisticsServiceImpl implements IStatisticsService {
 			.ge(ObjectUtils.isNotNull(saleDetailDto.getBusinesDateStart()), PjOrder::getBusinesDate, saleDetailDto.getBusinesDateStart())
 			.le(ObjectUtils.isNotNull(saleDetailDto.getBusinesDateEnd()), PjOrder::getBusinesDate, saleDetailDto.getBusinesDateEnd())
 			.apply(ObjectUtils.isNotNull(saleDetailDto.getDateStart()), "DATE_FORMAT( delivery_busines_date, '%Y-%m-%d' )  >= '" + saleDetailDto.getDateStart() + "'")
-			.apply(ObjectUtils.isNotNull(saleDetailDto.getDateEnd()), "DATE_FORMAT( delivery_busines_date, '%Y-%m-%d' )  >= '" + saleDetailDto.getDateEnd() + "'");
+			.apply(ObjectUtils.isNotNull(saleDetailDto.getDateEnd()), "DATE_FORMAT( delivery_busines_date, '%Y-%m-%d' )  <= '" + saleDetailDto.getDateEnd() + "'");
 		if ("2".equals(saleDetailDto.getBsType())) {
 			lambdaQueryWrapper.isNotNull(PjOrder::getSalerId);
 			lambdaQueryWrapper.groupBy(PjOrder::getSalerName);
@@ -1162,7 +1089,7 @@ public class StatisticsServiceImpl implements IStatisticsService {
 				.ge(ObjectUtils.isNotNull(saleDetailDto.getBusinesDateStart()), PjOrder::getBusinesDate, saleDetailDto.getBusinesDateStart())
 				.le(ObjectUtils.isNotNull(saleDetailDto.getBusinesDateEnd()), PjOrder::getBusinesDate, saleDetailDto.getBusinesDateEnd())
 				.apply(ObjectUtils.isNotNull(saleDetailDto.getDateStart()), "DATE_FORMAT( delivery_busines_date, '%Y-%m-%d' )  >= '" + saleDetailDto.getDateStart() + "'")
-				.apply(ObjectUtils.isNotNull(saleDetailDto.getDateEnd()), "DATE_FORMAT( delivery_busines_date, '%Y-%m-%d' )  >= '" + saleDetailDto.getDateEnd() + "'");
+				.apply(ObjectUtils.isNotNull(saleDetailDto.getDateEnd()), "DATE_FORMAT( delivery_busines_date, '%Y-%m-%d' )  <= '" + saleDetailDto.getDateEnd() + "'");
 			if ("2".equals(saleDetailDto.getBsType())) {
 				orderLambdaQueryWrapper.apply("find_in_set(saler_name,'" + name + "')");
 			} else {
@@ -1294,8 +1221,8 @@ public class StatisticsServiceImpl implements IStatisticsService {
 			.eq(ObjectUtils.isNotNull(saleDetailDto.getStorageId()), PjOrder::getStorageId, saleDetailDto.getStorageId())
 			.ge(ObjectUtils.isNotNull(saleDetailDto.getBusinesDateStart()), PjOrder::getBusinesDate, saleDetailDto.getBusinesDateStart())
 			.le(ObjectUtils.isNotNull(saleDetailDto.getBusinesDateEnd()), PjOrder::getBusinesDate, saleDetailDto.getBusinesDateEnd())
-			.ge(ObjectUtils.isNotNull(saleDetailDto.getDateStart()), PjOrder::getDeliveryBusinesDate, saleDetailDto.getDateStart())
-			.le(ObjectUtils.isNotNull(saleDetailDto.getDateEnd()), PjOrder::getDeliveryBusinesDate, saleDetailDto.getDateEnd());
+			.apply(ObjectUtils.isNotNull(saleDetailDto.getDateStart()), "DATE_FORMAT( delivery_busines_date, '%Y-%m-%d' )  >= '" + saleDetailDto.getDateStart() + "'")
+			.apply(ObjectUtils.isNotNull(saleDetailDto.getDateEnd()), "DATE_FORMAT( delivery_busines_date, '%Y-%m-%d' )  <= '" + saleDetailDto.getDateEnd() + "'");
 		if ("2".equals(saleDetailDto.getBsType())) {
 			lambdaQueryWrapper.isNotNull(PjOrder::getSalerId);
 			lambdaQueryWrapper.groupBy(PjOrder::getSalerName);
@@ -1319,8 +1246,8 @@ public class StatisticsServiceImpl implements IStatisticsService {
 				.eq(ObjectUtils.isNotNull(saleDetailDto.getStorageId()), PjOrder::getStorageId, saleDetailDto.getStorageId())
 				.ge(ObjectUtils.isNotNull(saleDetailDto.getBusinesDateStart()), PjOrder::getBusinesDate, saleDetailDto.getBusinesDateStart())
 				.le(ObjectUtils.isNotNull(saleDetailDto.getBusinesDateEnd()), PjOrder::getBusinesDate, saleDetailDto.getBusinesDateEnd())
-				.ge(ObjectUtils.isNotNull(saleDetailDto.getDateStart()), PjOrder::getDeliveryBusinesDate, saleDetailDto.getDateStart())
-				.le(ObjectUtils.isNotNull(saleDetailDto.getDateEnd()), PjOrder::getDeliveryBusinesDate, saleDetailDto.getDateEnd());
+				.apply(ObjectUtils.isNotNull(saleDetailDto.getDateStart()), "DATE_FORMAT( delivery_busines_date, '%Y-%m-%d' )  >= '" + saleDetailDto.getDateStart() + "'")
+				.apply(ObjectUtils.isNotNull(saleDetailDto.getDateEnd()), "DATE_FORMAT( delivery_busines_date, '%Y-%m-%d' )  <= '" + saleDetailDto.getDateEnd() + "'");
 			if ("2".equals(saleDetailDto.getBsType())) {
 				orderLambdaQueryWrapper.apply("find_in_set(saler_name,'" + name + "')");
 			} else {
@@ -1432,7 +1359,7 @@ public class StatisticsServiceImpl implements IStatisticsService {
 			.ge(ObjectUtils.isNotNull(saleDetailDto.getBusinesDateStart()), PjOrder::getBusinesDate, saleDetailDto.getBusinesDateStart())
 			.le(ObjectUtils.isNotNull(saleDetailDto.getBusinesDateEnd()), PjOrder::getBusinesDate, saleDetailDto.getBusinesDateEnd())
 			.apply(ObjectUtils.isNotNull(saleDetailDto.getDateStart()), "DATE_FORMAT( delivery_busines_date, '%Y-%m-%d' )  >= '" + saleDetailDto.getDateStart() + "'")
-			.apply(ObjectUtils.isNotNull(saleDetailDto.getDateEnd()), "DATE_FORMAT( delivery_busines_date, '%Y-%m-%d' )  >= '" + saleDetailDto.getDateEnd() + "'");
+			.apply(ObjectUtils.isNotNull(saleDetailDto.getDateEnd()), "DATE_FORMAT( delivery_busines_date, '%Y-%m-%d' )  <= '" + saleDetailDto.getDateEnd() + "'");
 		if ("2".equals(saleDetailDto.getBsType())) {
 			lambdaQueryWrapper.isNotNull(PjOrder::getSalerId);
 			lambdaQueryWrapper.groupBy(PjOrder::getSalerName);
@@ -1458,7 +1385,7 @@ public class StatisticsServiceImpl implements IStatisticsService {
 				.ge(ObjectUtils.isNotNull(saleDetailDto.getBusinesDateStart()), PjOrder::getBusinesDate, saleDetailDto.getBusinesDateStart())
 				.le(ObjectUtils.isNotNull(saleDetailDto.getBusinesDateEnd()), PjOrder::getBusinesDate, saleDetailDto.getBusinesDateEnd())
 				.apply(ObjectUtils.isNotNull(saleDetailDto.getDateStart()), "DATE_FORMAT( delivery_busines_date, '%Y-%m-%d' )  >= '" + saleDetailDto.getDateStart() + "'")
-				.apply(ObjectUtils.isNotNull(saleDetailDto.getDateEnd()), "DATE_FORMAT( delivery_busines_date, '%Y-%m-%d' )  >= '" + saleDetailDto.getDateEnd() + "'");
+				.apply(ObjectUtils.isNotNull(saleDetailDto.getDateEnd()), "DATE_FORMAT( delivery_busines_date, '%Y-%m-%d' )  <= '" + saleDetailDto.getDateEnd() + "'");
 			if ("2".equals(saleDetailDto.getBsType())) {
 				orderLambdaQueryWrapper.apply("find_in_set(saler_name,'" + name + "')");
 			} else {