Browse Source

e签包回调

njs 3 years ago
parent
commit
f5f61d12f1

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

@@ -292,7 +292,15 @@ public class EsignController extends ApiBaseController {
         if ("2".equals(signResult)) {
 
             /*异步调用回调接口*/
+            if(businessScence!=null &&!("司机授权").equals(businessScence)){
                 signService.callbackNotice(orderFlag);
+            }else{
+                OrderFile orderFile = new OrderFile();
+                orderFile.setFlowId(orderFlag.getFlowId());
+                orderFile.setCode("200");
+                orderFile.setMessage("success");
+                orderFileService.updateOrderFileByFlowId(orderFile);
+            }
                 /*异步保存文件*/
                 signService.saveFile(flowId,orderFlag);
 

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

@@ -349,7 +349,7 @@ public class ESignServiceImpl implements ESignService {
         }
         //计算宽高
         Float fosX = 500F;
-        Float fosY = 700F;
+        Float fosY = 500F;
 //        for (int i =0;i<size;i++){
 //           fosY = fosY-11f;
 //        }

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

@@ -307,13 +307,13 @@ public class PDFSelfUtil {
                 " 委托人: "+receivingNote.getEntrustName()+"\n\n", keyfont, Element.ALIGN_LEFT, 2, false));
 
 
-*/      table.addCell(createCell(" 委托人(名称):姓名: "+receivingNote.getEntrustName(), keyfont, Element.ALIGN_LEFT, 7, false));
+*/      table.addCell(createCell(" 委托人(名称):姓名: "+receivingNote.getEntrustName(), keyfont, Element.ALIGN_LEFT, 7, true));
         table.addCell(createCell(" 受托(提货)人:姓名: "+receivingNote.getBeentrustName(), keyfont, Element.ALIGN_LEFT, 7, false));
         table.addCell(createCell(" 身份证号码: "+receivingNote.getbId(), keyfont, Element.ALIGN_LEFT, 7, false));
         table.addCell(createCell(" 车牌: "+receivingNote.getCarNumber(), keyfont, Element.ALIGN_LEFT, 7, false));
         table.addCell(createCell(" 委托人委托受托人于 "+calendar.get(Calendar.YEAR)+" 年 "+(calendar.get(Calendar.MONTH)+1)+"月"+calendar.get(Calendar.DATE)+" 日 ", keyfont, Element.ALIGN_LEFT, 8, false));
-        table.addCell(createCell(" 来贵司提取交货单号为  "+receivingNote.getDeliveryNumber()+"    上所载明的货物。", textfont, Element.ALIGN_CENTER, 11, false));
-        table.addCell(createCell(" 特此委托! ", keyfont, Element.ALIGN_LEFT, 7, false));
+        table.addCell(createCell(" 来贵司提取交货单号为  "+receivingNote.getDeliveryNumber()+"    上所载明的货物。", keyfont, Element.ALIGN_CENTER, 11, false));
+        table.addCell(createCell(" 特此委托! ", keyfont, Element.ALIGN_LEFT, 7, true));
         table.addCell(createCell(" 委托人:"+receivingNote.getEntrustName(), keyfont, Element.ALIGN_LEFT, 8, false));
         table.addCell(createCell(" 受托(提货)人:"+receivingNote.getBeentrustName(), keyfont, Element.ALIGN_LEFT, 9, false));
         table.addCell(createCell(calendar.get(Calendar.YEAR)+"年"+(calendar.get(Calendar.MONTH)+1)+"月"+calendar.get(Calendar.DATE)+"日", keyfont, Element.ALIGN_RIGHT, 10, false));