1

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/HyFreightSettlementInfoServiceImpl.java

@@ -124,6 +124,8 @@ public class HyFreightSettlementInfoServiceImpl extends ServiceImpl<HyFreightSet
                 hyFreightSettlementInfo1.setEscalationStatusKey(StatusEnum.UNDER_REVIEW.getFlag());
                 hyFreightSettlementInfo1.setEscalationStatus(StatusEnum.UNDER_REVIEW.getName());
                 hyFreightSettlementInfo1.setPaymentDate(new Date());
+                hyFreightSettlementInfo1.setSerialNumber(hyFreightSettlementInfoList.get(i).getSerialNumber());
+                hyFreightSettlementInfo1.setPaymentVoucher(hyFreightSettlementInfoList.get(i).getPaymentVoucher());
                 //查询费用信息
                 FreightInfo freightInfo = freightInfoService.selectOne(new EntityWrapper<FreightInfo>()
                         .eq("order_id", hyFreightSettlementInfo1.getOrderId()));

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/util/EntityAnalyse.java

@@ -401,6 +401,7 @@ public class EntityAnalyse {
         financial.put("driverName", hyFreightSettlementInfo.getDriverName());
         financial.put("driverLicense", hyFreightSettlementInfo.getDriverIdCard());
         financial.put("paymentMeansCode", "32");
+        financial.put("recipient", hyFreightSettlementInfo.getDriverName());
         if ("男".equals(hyFreightSettlementInfo.getDriverSex())) {
             financial.put("sex",1);
         } else {

winsea-haixin-plugin-wangluohuoyun/src/main/resources/mapper/CargoOwnerInfoMapper.xml

@@ -45,7 +45,7 @@
     <select id="getListByCondition" parameterType="Map"
             resultType="com.yh.saas.plugin.yiliangyiyun.entity.HyCargoOwnerInfo">
         SELECT
-        o.id,
+        o.id as id,
         case when o.common_id is null then c.id else o.common_id end as commonId,
         case when o.name is null then c.user_name else o.name end as name,
         c.phone as phone,