运营端接口

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/vo/LedgerLogistics.java

@@ -1,6 +1,7 @@
 package com.sckw.payment.model.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.sckw.payment.model.dto.ILedger;
 import lombok.Getter;
 import lombok.Setter;
@@ -24,6 +25,7 @@ public class LedgerLogistics implements ILedger {
     /**
      * 物流对账单编号
      */
+    @JsonProperty("lLedgerNo")
     private String lLedgerNo;
 
     /**

sckw-modules/sckw-payment/src/main/resources/mapper/KwpLedgerTradeMapper.xml

@@ -153,8 +153,30 @@
         order by klt.generate_time desc
     </select>
     <select id="list" resultType="com.sckw.payment.model.vo.LedgerSell">
-        select
-        <include refid="sell_col"/>
+        select klt.id,
+               klt.t_ledger_no   tLedgerNo,
+               klt.name,
+               klt.start_time    startTime,
+               klt.end_time      endTime,
+               klt.tax_rate      taxRate,
+               klt.trading,
+               klt.total_price   totalPrice,
+               klt.ex_tax_price  exTaxPrice,
+               klt.settle_price  settlePrice,
+               klt.actual_price  actualPrice,
+               klt.audit_phone   auditPhone,
+               klt.audit_user    auditUser,
+               klt.url,
+               klt.generate_time generateTime,
+               klt.receipt_time  receiptTime,
+               klt.remark,
+               klt.status,
+               klt.create_by     createBy,
+               kltu.contacts,
+               kltu.phone,
+               kltu.firm_name    purchaseFirmName,
+               kltu2.firm_name   sellFirmName,
+               klt.order_count   orderCount
         from kwp_ledger_trade klt
                  inner join kwp_ledger_trade_unit kltu
                             on klt.id = kltu.t_ledger_id and kltu.del_flag = 0 and
@@ -182,6 +204,9 @@
                         or kltu.firm_name like concat('%'
                         , #{tradeReq.keywords,jdbcType=VARCHAR}
                         , '%')
+                        or kltu2.firm_name like concat('%'
+                        , #{tradeReq.keywords,jdbcType=VARCHAR}
+                        , '%')
                         or kltu.contacts like concat('%'
                         , #{tradeReq.keywords,jdbcType=VARCHAR}
                         , '%')