授权

suishenbang-system/src/main/java/com/dgtly/system/mapper/CustomersExtMapper.java

@@ -65,5 +65,5 @@ public interface CustomersExtMapper
 
     String selectOrgIdByOrderId(String orderId);
 
-    String selectChainsCodeByOrderId(String orderId);
+    String selectChainsCodeByOrderId(@Param("orderId")List<String> orderId);
 }

suishenbang-system/src/main/java/com/dgtly/system/service/ICustomersExtService.java

@@ -74,8 +74,8 @@ public interface ICustomersExtService
      * @descption: 根据订单编号查询组织代号
      * @param: [orderId]
      * @return: java.lang.String
-     * @auther: ZhangDing
-     * @date: 2020-10-20 10:05
+     * @auther: njs
+     * @date: 2022-07-06 10:05
      */
-    String selectChainsCodeByOrderId(String orderId);
+    String selectChainsCodeByOrderId(List<String> orderId);
 }

suishenbang-system/src/main/java/com/dgtly/system/service/impl/CustomersExtServiceImpl.java

@@ -103,7 +103,7 @@ public class CustomersExtServiceImpl implements ICustomersExtService
     }
 
     @Override
-    public String selectChainsCodeByOrderId(String orderId) {
+    public String selectChainsCodeByOrderId(List<String> orderId) {
         return customersExtMapper.selectChainsCodeByOrderId(orderId);
     }
 }

suishenbang-system/src/main/resources/mapper/system/CustomersExtMapper.xml

@@ -56,12 +56,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <!--根据订单id关联订单基础信息表查询经销商代号-->
     <select id="selectChainsCodeByOrderId" resultType="java.lang.String">
         SELECT
-            s.chains_code
+            s.org_id
         FROM
             sales_order_base t
         LEFT JOIN customers_ext s ON t.belong_to = s.chains_code
-        WHERE
-            t.order_number = #{orderId};
+        WHERE 1=1
+        <if test="orderId !=null">
+        and t.order_number in
+        <foreach item="id" collection="orderId" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+        </if>
     </select>
 
     <insert id="insertCustomersExt" parameterType="CustomersExt">

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

@@ -169,6 +169,8 @@ 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'}"+
             "\n（orderId：订单编号" +
@@ -189,8 +191,10 @@ public class EsignController extends ApiBaseController {
 
         ParameterObject obj = getParameterObject();
         obj.checkParameterNotNull("orderId,entrustName,beentrustName,bId,carNumber,deliveryNumber,runTime,redirectUrl");
-        String orderId = obj.getString("orderId");
-       // String[] s = orderIds.split(",");
+        String orderIds = obj.getString("orderId");
+        String orderId=StringUtils.strip(orderIds,"[]");
+        orderId=orderId.replace("\"", "");
+        // String[] s = orderIds.split(",");
         try {
        /* for(String orderId : s) {*/
         String userId = obj.getString("userId");
@@ -200,7 +204,9 @@ public class EsignController extends ApiBaseController {
         String bId = obj.getString("bId");
         String runTime=obj.getString("runTime");
         String carNumber = obj.getString("carNumber");
-        String deliveryNumber = obj.getString("deliveryNumber");
+        String deliveryNumbers = obj.getString("deliveryNumber");
+        String deliveryNumber=StringUtils.strip(deliveryNumbers,"[]");
+        deliveryNumber= deliveryNumber.replace("\"", "");
      /*   String[] d= deliveryNumbers.split(",");
         for(String deliveryNumber : d) {*/
         String redirectUrl = obj.getString("redirectUrl");
@@ -216,8 +222,10 @@ public class EsignController extends ApiBaseController {
                 signerAccountId=sysUser.getAccountId();
             }
             /*根据订单id关联查询企业注册后id*/
-            String authorizedAccountId =customersExtService.selectOrgIdByOrderId(orderId);
-            //String authorizedAccountId = "563c540b67354026a5f84f6c5b9d8eb0";
+            String str[] = orderId.split(",");
+            List order= Arrays.asList(str);
+            String authorizedAccountId =customersExtService.selectChainsCodeByOrderId(order);
+            // authorizedAccountId = "563c540b67354026a5f84f6c5b9d8eb0";
 //            signService.signAuth(authorizedAccountId);
             logger.info("签署人认证id：{}",authorizedAccountId);
             /* 根据订单id关联查询企业代号*/

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

@@ -234,11 +234,7 @@ public class PDFSelfUtil {
     public  static int generateEPDF(Document document, OrderSelfNote receivingNote, boolean flag) throws Exception {
         // 段落
         Paragraph paragraph;
-        if (flag) {
-            paragraph = new Paragraph("客  户  自  提  委  托  书", titlefont);
-        } else {
-            paragraph = new Paragraph("客  户  自  提  委  托  书", titlefont);
-        }
+        paragraph = new Paragraph("客  户  自  提  委  托  书", titlefont);
         paragraph.setAlignment(1); //设置文字居中 0靠左   1，居中     2，靠右
         paragraph.setIndentationLeft(12); //设置左缩进
         paragraph.setIndentationRight(12); //设置右缩进
@@ -258,15 +254,9 @@ public class PDFSelfUtil {
         paragraph2.setSpacingAfter(5f); //设置段落下空白
         document.add(paragraph2);*/
         // 直线
-        Paragraph p1 = new Paragraph();
+       /* Paragraph p1 = new Paragraph();
         p1.add(new Chunk(new LineSeparator()));
-        document.add(p1);
-        PdfPTable table1 = createTable(new float[] { 240, 100});
-        table1.addCell(createCell("委托人（名称）： " +receivingNote.getEntrustName(), headfont, Element.ALIGN_LEFT, 1, false));
-        table1.addCell(createCell("受托（提货）人：姓名： " +receivingNote.getBeentrustName(), headfont, Element.ALIGN_LEFT, 2, false));
-        table1.addCell(createCell("身份证号码： " +receivingNote.getbId(), headfont, Element.ALIGN_RIGHT, 2, false));
-        table1.addCell(createCell("车牌： " +receivingNote.getCarNumber(), headfont, Element.ALIGN_RIGHT, 3, false));
-        document.add(table1);
+        document.add(p1);*/
 //        Paragraph paragraph1 = new Paragraph("客户名称： " +receivingNote.getCustomerName() +"                           " +
 //        "                                                     运单号： " +receivingNote.getShipmentNumber(), namefont);
         Paragraph paragraph1 = new Paragraph();
@@ -282,8 +272,8 @@ public class PDFSelfUtil {
 
         //添加空行
         Paragraph p3 = new Paragraph();
-        p3.setSpacingBefore(2f); //设置段落上空白
-        p3.setSpacingAfter(2f); //设置段落下空白
+        p3.setSpacingBefore(5f); //设置段落上空白
+        p3.setSpacingAfter(5f); //设置段落下空白
         // 超链接
 //        Anchor anchor = new Anchor("baidu");
 //        anchor.setReference("www.baidu.com");
@@ -306,25 +296,24 @@ public class PDFSelfUtil {
         calendar.setTime(date);
         // 表格
         PdfPTable table = createTable(new float[] { 160, 60, 60,60});
-        table.addCell(createCell("委托人委托受托人于"+calendar.get(Calendar.YEAR), headfont, Element.ALIGN_LEFT, 4, false));
-        table.addCell(createCell("年"+(calendar.get(Calendar.MONTH)+1), headfont, Element.ALIGN_RIGHT, 4, false));
-        table.addCell(createCell("月"+calendar.get(Calendar.DATE), headfont, Element.ALIGN_RIGHT, 4, false));
-        table.addCell(createCell("日来贵司提取交货单号为"+receivingNote.getDeliveryNumber(), headfont, Element.ALIGN_LEFT, 5, false));
-        table.addCell(createCell("上所载明的货物。", headfont, Element.ALIGN_RIGHT, 5, false));
-        table.addCell(createCell("   特此委托！。", headfont, Element.ALIGN_LEFT, 6, false));
-        document.add(paragraph1);
-        table.addCell(createCell("   委托人："+receivingNote.getEntrustName(), headfont, Element.ALIGN_LEFT, 7, false));
-        table.addCell(createCell("   受托（提货）人："+receivingNote.getBeentrustName(), headfont, Element.ALIGN_LEFT, 8, false));
-        table.addCell(createCell(calendar.get(Calendar.YEAR)+"年"+calendar.get(Calendar.MONTH)+"月"+calendar.get(Calendar.DATE)+"日", headfont, Element.ALIGN_CENTER, 9, false));
-        table.addCell(createCell("委托人盖章：", headfont, Element.ALIGN_RIGHT, 10, false));
+        table.addCell(createCell("委托人（名称）： " +receivingNote.getEntrustName()+"\n\n"+
+                "受托（提货）人：姓名： " +receivingNote.getBeentrustName()+"       身份证号码： " +receivingNote.getbId()+"        车牌： " +receivingNote.getCarNumber()+"\n\n"+
+                "     委托人委托受托人于   "+calendar.get(Calendar.YEAR)+" 年 "+(calendar.get(Calendar.MONTH)+1)+"月"+calendar.get(Calendar.DATE)+" 日 "+"  来贵司提取交货单号为  "+receivingNote.getDeliveryNumber()+"    上所载明的货物。"+"\n\n"+
+                "          特此委托！。"+"\n\n\n\n"+
+                " 委托人： "+receivingNote.getEntrustName()+"\n\n"+
+                "受托（提货）人："+receivingNote.getBeentrustName()+"\n\n", keyfont, Element.ALIGN_LEFT, 2, false));
+
+       // 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));
+        table.addCell(createCell("委托人盖章：", keyfont, Element.ALIGN_RIGHT, 11, false));
         document.add(paragraph1);
-        table.addCell(createCell("委托人盖章：", headfont, Element.ALIGN_RIGHT, 10, false));
         table.addCell(createCell("注意事项：\n" +
                 "1、受托（提货）人须携带身份证或驾驶证原件。\n" +
                 "2、本委托书必须注明立邦公司交货单号。\n" +
                 "3、本委托书必须盖有与销售合同中预留相一致的印章。\n" +
                 "4、仓库不接受传真的公章印鉴(外埠客户因特殊原因自提时，携带的传真件必须得到当地办事处相关人员确认后方为有效)。\n" +
-                "5、本委托书自委托人确定的提货日期后的十日内有效。", headfont, Element.ALIGN_LEFT, 11, false));
+                "5、本委托书自委托人确定的提货日期后的十日内有效。", keyfont, Element.ALIGN_LEFT, 12, false));
 
 
         document.add(table);