From 2f5c0172973363bb39a3e8ca65c86082cf898ff4 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Wed, 14 Aug 2024 17:14:21 +0800
Subject: [PATCH] md

---
 .../erp/emis/service/impl/EmisSettlePayRecordServiceImpl.java  | 3 +++
 emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettlePayRecordServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettlePayRecordServiceImpl.java
index 552628606..0ec8ec3e9 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettlePayRecordServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettlePayRecordServiceImpl.java
@@ -113,6 +113,9 @@ public class EmisSettlePayRecordServiceImpl extends EmisBaseService implements I
         // 不重复的 id流水号
         String  payId= WaybillHelper.genPayId();
         emisSettlePayRecord.setPayId(payId);
+
+        // 支付成功
+        emisSettlePayRecord.setPayStatus("2");
         // 插入数据
         emisSettlePayRecordMapper.insertEmisSettlePayRecord(emisSettlePayRecord);
 
diff --git a/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml
index c712e69ae..fbb9e958b 100644
--- a/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml
@@ -66,6 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="waybillDetail.billWeight" column="bill_weight"/>
         <result property="waybillDetail.totalVolume" column="total_volume"/>
         <result property="waybillDetail.volumeWeight" column="volume_weight"/>
+        <result property="waybillDetail.settlementWeight" column="settlement_weight"/>
         <result property="waybillDetail.freight" column="freight"/>
         <result property="waybillDetail.realFee" column="real_fee"/>
         <result property="waybillDetail.feeRemark" column="fee_remark"/>
@@ -126,7 +127,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
         a.bl_special_quote,a.calc_fee_type,a.send_date,a.send_company,
         a.cust_no,a.cust_name,a.payment_type,a.time_type,
-        a.send_name,a.parcel_qty,a.bill_weight,a.total_volume,a.volume_weight,
+        a.send_name,a.parcel_qty,a.bill_weight,a.total_volume,a.volume_weight,a.settlement_weight,
         a.freight,real_fee,a.fee_remark,a.payment_type,a.remark,
         a.payee,a.salesmen,a.bl_is_question,a.problem_cause,