1、修改客户查询

src/main/java/com/dk/mdm/mapper/mst/CustomerMapper.xml

@@ -97,6 +97,8 @@
         <result column="follow_staff_name" property="followStaffName"/>
         <result column="receivable_residue" property="receivableResidue"/>
         <result column="receipt_residue" property="receiptResidue"/>
+        <result column="receivable" property="receivable"/>
+        <result column="receipt" property="receipt"/>
         <result column="orderQuantity" property="orderQuantity"/>
         <result column="orderAmount" property="orderAmount"/>
 
@@ -298,12 +300,10 @@
         (SELECT sum(tpob.out_amt) FROM dkic_b.t_psi_outbound tpob WHERE tpob.cus_id = tmc.cus_id AND tpob.cp_id =
         tmc.cp_id AND tpob.flg_valid AND tpob.out_type = '出库类型-销退回库') AS
         "outboundReturnAmount",
-
+        tma.receipt,
+        tma.receivable,
         tma.receivable_residue,
         tma.receipt_residue
-
-
-
         FROM dkic_b.t_mst_customer tmc
         LEFT JOIN dkic_b.t_mst_dictionary_data tmd on tmd.data_id = tmc.cus_from
         LEFT JOIN dkic_b.t_mst_sale_channel tmsc on tmsc.channel_id = tmc.channel_id

src/main/java/com/dk/mdm/model/response/mst/CustomerResponse.java

@@ -312,6 +312,12 @@ public class CustomerResponse extends PageInfo<CustomerResponse> implements Seri
     @ApiModelProperty(value = "总收款金额-总应收收款金额+总应收优惠金额（现金池）")
     private BigDecimal receiptResidue;
 
+    @ApiModelProperty(value = "总收款金额")
+    private BigDecimal receipt;
+
+    @ApiModelProperty(value = "总应收账款")
+    private BigDecimal receivable;
+
     @ApiModelProperty(value = "订单数量")
     private BigDecimal orderQuantity;