2023年10月7日18:25:49

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

@@ -724,6 +724,7 @@ public class OrderController extends BladeController {
 		if (AuthUtil.getUserRole().contains("业务员")) {
 			lambdaQueryWrapperXS.gt(PjOrder::getSalerId, AuthUtil.getTenantId());
 		}
+		lambdaQueryWrapperXS.apply("(( business_source = '外部销售' AND FIND_IN_SET( actual_payment_status, '2,3' ) ) OR (business_source = '内部销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3' )))");
 		List<PjOrder> pjOrderListXS = orderService.list(lambdaQueryWrapperXS);
 		List<PjOrder> pjOrderListCG = orderService.list(new LambdaQueryWrapper<PjOrder>().eq(PjOrder::getIsDeleted, 0)
 			.eq(PjOrder::getTenantId, AuthUtil.getTenantId())

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

@@ -91,6 +91,7 @@ public class OrderStatisticsController extends BladeController {
 		if (!AuthUtil.getUserRole().contains("admin")) {
 			lambdaQueryWrapper.eq(PjOrder::getSalesCompanyId, AuthUtil.getDeptId());//公司
 		}
+		lambdaQueryWrapper.apply("(( business_source = '外部销售' AND FIND_IN_SET( actual_payment_status, '2,3' ) ) OR (business_source = '内部销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3' )))");
 		lambdaQueryWrapper.orderByDesc(PjOrder::getCreateTime);
 		IPage<PjOrder> pages = orderService.page(Condition.getPage(query), lambdaQueryWrapper);
 		String createUserIds = "";

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

@@ -136,6 +136,7 @@
         WHERE
             po.tenant_id = #{order.tenantId}
           AND po.is_deleted = 0
+          and (( business_source = '外部销售' AND FIND_IN_SET( actual_payment_status, '2,3' ) ) OR (business_source = '内部销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3' )))
         <if test="order.businesDateList != null and order.businesDateList[0] != null and order.businesDateList[0]!= ''">
             and po.busines_date &gt;= #{order.businesDateList[0]}
         </if>
@@ -161,10 +162,10 @@
           and po.bs_type = 'XS'
         AND ((
         po.business_source = '外部销售'
-        AND FIND_IN_SET( po.actual_payment_status, '2,3,4' ))
+        AND FIND_IN_SET( po.actual_payment_status, '2,3' ))
         OR (
         po.business_source = '内部销售'
-        AND FIND_IN_SET( po.actual_payment_status, '0,1,2,3,4' )))
+        AND FIND_IN_SET( po.actual_payment_status, '0,1,2,3' )))
         <if test="firstDay != null">
             and po.busines_date &gt;= #{firstDay}
         </if>