Merge remote-tracking branch 'origin/dev' into dev

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

@@ -907,8 +907,8 @@ public class OrderController extends BladeController {
 	 * app待收款列表
 	 */
 	@GetMapping("/getPendingPaymentSum")
-	public R getPendingPaymentSum() {
-		return R.data(orderService.getPendingPaymentSum());
+	public R getPendingPaymentSum(PjSettlement settlement) {
+		return R.data(orderService.getPendingPaymentSum(settlement));
 	}
 
 

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

@@ -24,6 +24,7 @@ import org.springblade.salesPart.dto.FinancingProcurement;
 import org.springblade.salesPart.dto.SaleDetail;
 import org.springblade.salesPart.dto.SalespersonCustomer;
 import org.springblade.salesPart.entity.PjOrder;
+import org.springblade.salesPart.entity.PjSettlement;
 import org.springblade.salesPart.excel.PjOrderStatisticsExcel;
 import org.springblade.salesPart.excel.PjShipStockDetails;
 import org.springblade.salesPart.vo.*;
@@ -141,10 +142,10 @@ public interface OrderMapper extends BaseMapper<PjOrder> {
 	/**
 	 * 获取待付款金额和
 	 *
-	 * @param tenantId 租户id
+	 * @param settlement 查询参数
 	 * @return 结果
 	 */
-	BigDecimal getPendingPaymentSum(@Param("tenantId") String tenantId);
+	BigDecimal getPendingPaymentSum(@Param("dto") PjSettlement settlement);
 
 	/**
 	 * 获取支出金额和

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

@@ -1058,15 +1058,22 @@
                         FROM
                             pjpf_order o
                         WHERE
-                            o.tenant_id = #{tenantId}
+                            o.tenant_id = #{dto.tenantId}
                           AND o.is_deleted = '0'
                           AND FIND_IN_SET( o.STATUS, '待确认,待发货,已发货,退款请核,已收货' )
                           AND o.total_money != o.payment_amount_tl
                     AND o.bs_type = 'XS'
-                    AND o.tenant_id = #{tenantId}
+                    AND o.tenant_id = #{dto.tenantId}
+                    <if test="dto.corpName != null and dto.corpName != ''">
+                       and o.customer_name like concat('%', #{dto.corpName}, '%')
+                    </if>
+                    <if test="dto.contractNumber != null and dto.contractNumber != ''">
+                       and o.ord_no like concat('%', #{dto.contractNumber}, '%')
+                    </if>
+
                     ) pos
                         INNER JOIN pjpf_order_items poi ON pos.id = poi.pid
-                        AND poi.tenant_id = #{tenantId}
+                        AND poi.tenant_id = #{dto.tenantId}
                 WHERE
                     poi.is_deleted = 0
                 GROUP BY
@@ -1075,7 +1082,7 @@
             ) po2 ON pcd.id = po2.customerId
         WHERE
             pcd.is_deleted = '0'
-          AND pcd.tenant_id = #{tenantId}
+          AND pcd.tenant_id = #{dto.tenantId}
 
     </select>
     <select id="expenditureSum" resultType="java.math.BigDecimal"

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

@@ -26,6 +26,7 @@ import org.springblade.salesPart.dto.SalespersonCustomer;
 import org.springblade.salesPart.entity.PjOrder;
 import org.springblade.salesPart.entity.PjOrderItems;
 import org.springblade.salesPart.entity.PjProductLaunch;
+import org.springblade.salesPart.entity.PjSettlement;
 import org.springblade.salesPart.excel.*;
 import org.springblade.salesPart.vo.*;
 
@@ -310,9 +311,10 @@ public interface IOrderService extends IService<PjOrder> {
 	/**
 	 * 获取待付款金额
 	 *
+	 * @param settlement 参数
 	 * @return 结果
 	 */
-	BigDecimal getPendingPaymentSum();
+	BigDecimal getPendingPaymentSum(PjSettlement settlement);
 
 	/**
 	 * 采购订单统计金额

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

@@ -4958,8 +4958,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 	}
 
 	@Override
-	public BigDecimal getPendingPaymentSum() {
-		return orderMapper.getPendingPaymentSum(AuthUtil.getTenantId());
+	public BigDecimal getPendingPaymentSum(PjSettlement settlement) {
+		if (Objects.isNull(settlement)) {
+			settlement = new PjSettlement();
+		}
+		settlement.setTenantId(AuthUtil.getTenantId());
+		return orderMapper.getPendingPaymentSum(settlement);
 	}
 
 	@Override