更新

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

@@ -133,6 +133,20 @@ public class CargoOwnerInfoServiceImpl extends ServiceImpl<CargoOwnerInfoMapper,
             cargoOwnerInfo1.setAuthenticationStatusKey(StatusEnum.IDENTITY_REVIEWED.getFlag());
             this.updateById(cargoOwnerInfo1);
         }
+        else{
+            //新增主键id
+            cargoOwnerInfo.setId(IdGenerator.generateUUID());
+            //判断货主身份证号是否唯一
+            List<CargoOwnerInfo> cargoOwnerInfoList = this.selectList(new EntityWrapper<CargoOwnerInfo>()
+                    .eq("card_number", cargoOwnerInfo.getCardNumber())
+                    .eq("delete_flag", NumberConstant.CONSTANT0));
+            if (cargoOwnerInfoList.size() > 0) {
+                throw new YException(YExceptionEnum.DRIVER_NUMBER_ERROR);
+            }
+            cargoOwnerInfo.setAuthenticationStatus(StatusEnum.IDENTITY_REVIEWED.getName());
+            cargoOwnerInfo.setAuthenticationStatusKey(StatusEnum.IDENTITY_REVIEWED.getFlag());
+            this.insert(cargoOwnerInfo);
+        }
         return "OK";
     }
 

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

@@ -613,6 +613,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
             }
             freightInfoService.updateById(freightInfo);
             String pdfUrl = pdfUtil.tranContract(orderInfo);
+//            String pdfUrl = "https://taohaoliang.oss-cn-beijing.aliyuncs.com/appData/165477963294642.png";
             orderInfo1.setContractNo(orderInfo1.getOrderNo().replace("CY","HT"));
             orderInfo1.setDriverContractUrl(pdfUrl);
             this.updateById(orderInfo1);

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

@@ -74,11 +74,9 @@ public class PdfUtil  implements InitializingBean{
 
 
         //模板路径
-        String pdfTmp = "winsea-haixin-platform-backend" + File.separator + "src" + File.separator + "main" + File.separator + "resources" + File.separator
-                + "templates" + File.separator + "Contract.pdf";
+        String pdfTmp = "templates" + File.separator + "Contract.pdf";
         //生成的新文件路径
-        String newPDFPath = "winsea-haixin-platform-backend" + File.separator + "src" + File.separator + "main" + File.separator + "resources" + File.separator
-                + "templates" + File.separator + "Contract1.pdf";
+        String newPDFPath = "templates" + File.separator + "Contract1.pdf";
         PdfReader reader;
         FileOutputStream out;
         ByteArrayOutputStream bos;