自提手机号显示委托书

suishenbang-wxportal/suishenbang-wxportal-api/src/main/java/com/dgtly/wxportal/controller/EsignController.java

@@ -175,9 +175,10 @@ public class EsignController extends ApiBaseController {
      *
      *      * 没有注册就注册，注册完就认证，然后再点击签署按钮，获取经销商用户id，对应主体id
      */
-    @ApiOperation(value = "指派司机授权", notes = "参数：{'orderId':'xxx','userId':'xxx','customerCode':'xxx','entrustName':'xxx','beentrustName':'xxx','bId':'xxx','carNumber':'xxx','deliveryNumber':'xxx','runTime':'xxx','redirectUrl':'xxx'}"+
+    @ApiOperation(value = "指派司机授权", notes = "参数：{'orderId':'xxx','userId':'xxx', 'phone':'xxx', 'customerCode':'xxx','entrustName':'xxx','beentrustName':'xxx','bId':'xxx','carNumber':'xxx','deliveryNumber':'xxx','runTime':'xxx','redirectUrl':'xxx'}"+
             "\n（orderId：订单编号" +
             "\n（userId： 用户id" +
+            "\n（phone： 手机号" +
             "\n（customerCode： 经销商编号" +
             "\n（entrustName： 委托人" +
             "\n（beentrustName：受托（提货）人" +
@@ -193,7 +194,7 @@ public class EsignController extends ApiBaseController {
     public Object dealerSignDriver() {
 
         ParameterObject obj = getParameterObject();
-        obj.checkParameterNotNull("orderId,entrustName,beentrustName,bId,carNumber,deliveryNumber,runTime,redirectUrl");
+        obj.checkParameterNotNull("orderId,entrustName,phone,beentrustName,bId,carNumber,deliveryNumber,runTime,redirectUrl");
         String orderIds = obj.getString("orderId");
         String orderId=StringUtils.strip(orderIds,"[]");
         orderId=orderId.replace("\"", "");
@@ -205,6 +206,7 @@ public class EsignController extends ApiBaseController {
         String entrustName = obj.getString("entrustName");
         String beentrustName = obj.getString("beentrustName");
         String bId = obj.getString("bId");
+        String phone = obj.getString("phone");
         String runTime=obj.getString("runTime");
         String carNumber = obj.getString("carNumber");
         String deliveryNumbers = obj.getString("deliveryNumber");
@@ -237,6 +239,7 @@ public class EsignController extends ApiBaseController {
             /*4、保存订单id和flowId*/
                 OrderFile orderFile = new OrderFile();
                 orderFile.setOrderId(orderId);
+                orderFile.setPhone(phone);
                 orderFile.setDeliveryNumber(deliveryNumber);
                 orderFile.setChainsCode(customerCode);
                 orderFile.setCustomersCode(authorizedAccountId);

suishenbang-wxportal/suishenbang-wxportal-common/src/main/java/com/dgtly/wxportal/domain/OrderFile.java

@@ -112,6 +112,9 @@ public class OrderFile extends BaseEntity
     /** 委托类型对应的值*/
     private String authName;
 
+    /** 司机手机号*/
+    private String phone;
+
 
     public String getAuthName() {
         return authName;
@@ -129,6 +132,14 @@ public class OrderFile extends BaseEntity
         this.authType = authType;
     }
 
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
     public String getBeentrustPost() {
         return beentrustPost;
     }

suishenbang-wxportal/suishenbang-wxportal-common/src/main/java/com/dgtly/wxportal/domain/OrderSelfNote.java

@@ -39,6 +39,9 @@ public class OrderSelfNote extends BaseEntity {
     //  经销商名称
     private String customerName;
     private String agent;
+    //司机手机号
+    private String phone;
+
 
     /** 受托人职位 */
     private String beentrustPost;
@@ -60,6 +63,14 @@ public class OrderSelfNote extends BaseEntity {
         return entrustPost;
     }
 
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
     public void setEntrustPost(String entrustPost) {
         this.entrustPost = entrustPost;
     }

suishenbang-wxportal/suishenbang-wxportal-common/src/main/java/com/dgtly/wxportal/service/impl/ESignServiceImpl.java

@@ -92,7 +92,7 @@ public class ESignServiceImpl implements ESignService {
         receivingNote.setDeliveryNumber(orderFile.getDeliveryNumber());
         receivingNote.setEntrustName(orderFile.getEntrustName());
         receivingNote.setBelongTo(orderFile.getChainsCode());
-
+        receivingNote.setPhone(orderFile.getPhone());
         Map<String,Object> map = new HashMap<>();
         //创建PDF
         ESignUpPDFModal fileModal = creatDriverPdf(receivingNote);

suishenbang-wxportal/suishenbang-wxportal-common/src/main/java/com/dgtly/wxportal/utils/pdf/PDFSelfUtil.java

@@ -356,6 +356,7 @@ public class PDFSelfUtil {
                 " 应 的 交 货 （清） 单 及 提 货 资 料 ， 我 公 司 表 示 认 可 并 接 受 因 此 造 成 的 一 切 法 律 后 果 。"+"\n"+
                 "        本 授 权 委 托 书 期 限 自 委 托 人 签 署 盖 章 后 生 效 ， 自 委 托 人 确 定 “ 预 约 提 货 日 期 十 日 内 有 效。"+"\n\n"+
                 "受托人姓名：  "+"【"+receivingNote.getBeentrustName()+"】"+"\n\n" +
+                "手机号：  "+"【"+receivingNote.getPhone()+"】"+"\n\n" +
                 "受托人身份证：  "+"【"+receivingNote.getbId()+"】"+"\n\n"+
                 "受托人车牌号：  "+"【"+receivingNote.getCarNumber()+"】"+"\n\n"+
                 "自提交货（清单）单号：   "+"【"+receivingNote.getDeliveryNumber()+"】"+"\n\n"+