1

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/HyFreightSettlementInfo.java

@@ -63,6 +63,10 @@ public class HyFreightSettlementInfo extends BaseModel<HyFreightSettlementInfo>
      * 收款方姓名
      */
     private String payeeName;
+    /**
+     * 收款方身份证号
+     */
+    private String payeeIdCard;
     /**
      * 银行卡号码
      */

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/OrderInfo.java

@@ -238,6 +238,10 @@ public class OrderInfo extends BaseModel<OrderInfo> {
      * 收款方姓名（车队长姓名）
      */
     private String payeeName;
+    /**
+     * 收款方身份证号
+     */
+    private String payeeIdCard;
     /**
      * 车队长账号
      */

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

@@ -546,9 +546,9 @@ public class HyFreightSettlementInfoServiceImpl extends ServiceImpl<HyFreightSet
                 //查询订单
                 OrderInfo orderInfo1 = orderInfoService.selectById(hyFreightSettlementInfo1.getOrderId());
                 //司机信息
-                HyDriverInfo hyDriverInfo = driverInfoService.selectOne(new EntityWrapper<HyDriverInfo>()
-                        .eq("common_id",hyFreightSettlementInfo1.getCommonId()).eq("delete_flag","0"));
-                hyFreightSettlementInfo1.setDriverIdCard(hyDriverInfo.getNumberCard());
+//                HyDriverInfo hyDriverInfo = driverInfoService.selectOne(new EntityWrapper<HyDriverInfo>()
+//                        .eq("common_id",hyFreightSettlementInfo1.getCommonId()).eq("delete_flag","0"));
+//                hyFreightSettlementInfo1.setDriverIdCard(hyDriverInfo.getNumberCard());
                 //车辆信息
                 HyDriverCarInfo hyDriverCarInfo = driverCarInfoService.selectOne(new EntityWrapper<HyDriverCarInfo>()
                         .eq("car_number",orderInfo1.getCarNumber()).eq("delete_flag","0"));

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

@@ -1128,6 +1128,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                         hyFreightSettlementInfo.setFreightAdvance(orderInfo1.getFreightAdvance());
                         hyFreightSettlementInfo.setDriverName(orderInfo1.getDriverName());
                         hyFreightSettlementInfo.setPayeeName(orderInfo1.getPayeeName());
+                        hyFreightSettlementInfo.setPayeeIdCard(orderInfo1.getPayeeIdCard());
                         hyFreightSettlementInfo.setBankCard(orderInfo1.getBankCard());
                         hyFreightSettlementInfo.setBankDeposit(orderInfo1.getBankDeposit());
                         hyFreightSettlementInfo.setBankDepositBranch(orderInfo1.getBankDepositBranch());
@@ -1298,6 +1299,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                     hyFreightSettlementInfo.setFreightAdvance(orderInfo1.getFreightAdvance());
                     hyFreightSettlementInfo.setDriverName(orderInfo1.getDriverName());
                     hyFreightSettlementInfo.setPayeeName(orderInfo1.getPayeeName());
+                    hyFreightSettlementInfo.setPayeeIdCard(orderInfo1.getPayeeIdCard());
                     hyFreightSettlementInfo.setBankCard(orderInfo1.getBankCard());
                     hyFreightSettlementInfo.setBankDeposit(orderInfo1.getBankDeposit());
                     hyFreightSettlementInfo.setBankDepositBranch(orderInfo1.getBankDepositBranch());
@@ -1422,16 +1424,28 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                     .eq("order_id", orderInfo1.getId()));
             //查询用户信息
             CommonUser commonUser = commonUserService.selectById(orderInfo1.getCommonId());
+            //查询司机信息
+            HyDriverInfo hyDriverInfo = driverInfoService.selectOne(new EntityWrapper<HyDriverInfo>()
+                    .eq("common_id", orderInfo1.getCommonId()).eq("delete_flag", "0"));
             //提交
             if ("2".equals(orderInfo.getSubmitFlag())) {
                 orderInfo1.setDriverContract("1");
                 orderInfo1.setDriverContractUrl(pdfUrl);
                 orderInfo1.setDriverAutograph(orderInfo.getDriverAutograph());
                 orderInfo1.setContractNo(orderInfo1.getOrderNo().replace("CY", "CYHT"));
-                orderInfo1.setBankCard(orderInfo.getBankCard());
-                orderInfo1.setBankDeposit(orderInfo.getBankDeposit());
-                orderInfo1.setBankDepositBranch(orderInfo.getBankDepositBranch());
-                orderInfo1.setPayeeName(orderInfo.getPayeeName());
+                if(orderInfo.getBankCard() != null){
+                    orderInfo1.setBankCard(orderInfo.getBankCard());
+                }
+                if(orderInfo.getBankDeposit() != null){
+                    orderInfo1.setBankDeposit(orderInfo.getBankDeposit());
+                }
+                if (orderInfo.getBankDepositBranch() != null) {
+                    orderInfo1.setBankDepositBranch(orderInfo.getBankDepositBranch());
+                }
+                if (orderInfo.getPayeeName() != null) {
+                    orderInfo1.setPayeeName(orderInfo.getPayeeName());
+                    orderInfo1.setPayeeIdCard(hyDriverInfo.getNumberCard());
+                }
                 orderInfo1.setFreight(Double.valueOf(orderInfo.getFreightCars()));
                 orderInfo1.setBillingMethod("1");
                 orderInfo1.setAdvanceCharge(orderInfo.getAdvanceCharge());

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

@@ -1495,24 +1495,25 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
 //        orderInfo.setServiceCharge(150d);
         orderInfo.setFreightAdvance(publishTaskInfo.getFreightAdvance());
         //查询该司机是否绑定车队长
-//        HyBindCarCaptainInfo hyBindCarCaptainInfo = hyBindCarCaptainInfoService.selectOne(new EntityWrapper<HyBindCarCaptainInfo>()
-//        .eq("common_id",orderInfo.getCommonId())
-//                .eq("status_key","5")
-//                .eq("delete_flag","0"));
-//        if (hyBindCarCaptainInfo != null){
-//            //查询车队长信息
-//            HyCarCaptainInfo hyCarCaptainInfo = hyCarCaptainInfoService.selectOne(new EntityWrapper<HyCarCaptainInfo>()
-//                    .eq("common_id",hyBindCarCaptainInfo.getCarCaptainCommonId())
-//                    .eq("status_key","5")
-//                    .eq("delete_flag","0"));
-//            if (hyCarCaptainInfo != null){
-//                orderInfo.setCarCaptainAccountNumber(hyCarCaptainInfo.getAccountNumber());
-//                orderInfo.setPayeeName(hyCarCaptainInfo.getName());
-//                orderInfo.setBankCard(hyCarCaptainInfo.getBankCard());
-//                orderInfo.setBankDeposit(hyCarCaptainInfo.getBankDeposit());
-//                orderInfo.setBankDepositBranch(hyCarCaptainInfo.getBankDepositBranch());
-//            }
-//        }
+        HyBindCarCaptainInfo hyBindCarCaptainInfo = hyBindCarCaptainInfoService.selectOne(new EntityWrapper<HyBindCarCaptainInfo>()
+        .eq("common_id",orderInfo.getCommonId())
+                .eq("status_key","5")
+                .eq("delete_flag","0"));
+        if (hyBindCarCaptainInfo != null){
+            //查询车队长信息
+            HyCarCaptainInfo hyCarCaptainInfo = hyCarCaptainInfoService.selectOne(new EntityWrapper<HyCarCaptainInfo>()
+                    .eq("common_id",hyBindCarCaptainInfo.getCarCaptainCommonId())
+                    .eq("status_key","5")
+                    .eq("delete_flag","0"));
+            if (hyCarCaptainInfo != null){
+                orderInfo.setCarCaptainAccountNumber(hyCarCaptainInfo.getAccountNumber());
+                orderInfo.setPayeeName(hyCarCaptainInfo.getName());
+                orderInfo.setBankCard(hyCarCaptainInfo.getBankCard());
+                orderInfo.setBankDeposit(hyCarCaptainInfo.getBankDeposit());
+                orderInfo.setBankDepositBranch(hyCarCaptainInfo.getBankDepositBranch());
+                orderInfo.setPayeeIdCard(hyCarCaptainInfo.getIdCard());
+            }
+        }
         orderInfo.setOrderStatusKey(StatusEnum.OWNER_CONFIRMED.getFlag());
         orderInfo.setOrderStatus(StatusEnum.OWNER_CONFIRMED.getName());
         orderInfo.setCargoOwnerStatusKey(StatusEnum.OWNER_PENDING_STATEMENT.getFlag());

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

@@ -253,8 +253,8 @@ public class MonitoringSystemReporting {
 
         financialRoot.setDocumentNumber(hyFreightSettlementInfo.getDocumentNo());
         financialRoot.setSendToProDateTime(f1.format(new Date()));
-        financialRoot.setCarrier(hyFreightSettlementInfo.getDriverName());
-        financialRoot.setActualCarrierID(hyFreightSettlementInfo.getDriverIdCard());
+        financialRoot.setCarrier(hyFreightSettlementInfo.getPayeeName());
+        financialRoot.setActualCarrierID(hyFreightSettlementInfo.getPayeeIdCard());
         financialRoot.setVehicleNumber(hyFreightSettlementInfo.getCarNumber());
         if ("黄色".equals(hyFreightSettlementInfo.getCarNumberColour())) {
             financialRoot.setVehiclePlateColorCode("2");
@@ -273,7 +273,7 @@ public class MonitoringSystemReporting {
         List<Financial> financiallist = new ArrayList<>();
         Financial financial1 = new Financial();
         financial1.setPaymentMeansCode("32");
-        financial1.setRecipient(hyFreightSettlementInfo.getDriverName());
+        financial1.setRecipient(hyFreightSettlementInfo.getPayeeName());
         financial1.setReceiptAccount(hyFreightSettlementInfo.getBankCard());
         financial1.setBankCode(hyFreightSettlementInfo.getBankKey());
         financial1.setSequenceCode(hyFreightSettlementInfo.getSerialNumber());
@@ -338,9 +338,9 @@ public class MonitoringSystemReporting {
         setVehicleInfo(dispatch, orderInfo);
         //实际承运人信息
         ActualCarrierInfo actual = new ActualCarrierInfo();
-        actual.setActualCarrierName(orderInfo.getDriverName());
+        actual.setActualCarrierName(orderInfo.getPayeeName());
         actual.setActualCarrierBusinessLicense(orderInfo.getRoadTransportBusinessLicenseNo());
-        actual.setActualCarrierID(orderInfo.getDriverIdCard());
+        actual.setActualCarrierID(orderInfo.getPayeeIdCard());
         List<ActualCarrierInfo> actualList = new ArrayList<>();
         actualList.add(actual);
         dispatch.setActualCarrierInfo(actualList);