Merge remote-tracking branch 'origin/dev' into dev

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/admin/service/impl/utils/CodeUtil.java

@@ -200,7 +200,7 @@ public class CodeUtil {
         // 收 寄图
         String replace2 = replace1.replace("images/iconJi.png", pathName.concat("images/iconJi.png"))
                 .replace("images/iconShou.png", pathName.concat("images/iconShou.png"));
-
+        logger.info("test1");
         String replace3 = replace2.replace("SF1010874393776", kylinOrderExpress.getMailno())
                 .replace("755W-BA-0123456789", kylinOrderExpress.getDestRouteLabel())
 
@@ -218,7 +218,7 @@ public class CodeUtil {
                 .replace("18510989999", jTel)
                 .replace("寄件地址北京市朝阳区摩登天空测试地址", jAddress)
                 ;
-
+        logger.info("test1");
         Html2Image html2Image = Html2Image.fromHtml(replace3);
 
         String imgPath = pathName.concat("qrcode/img.png");

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/PerformancesExpressServiceImpl.java

@@ -566,16 +566,19 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
     public ResponseDto print(PerformanceExpressSearchAdminParam performanceExpressSearchAdminParam) {
         List<String> ids = performanceExpressSearchAdminParam.getIds();
         for (String orderExpressId : ids) {
+            log.info("orderExpressId", orderExpressId);
             KylinOrderExpress kylinOrderExpress = kylinOrderExpressMapper.selectOne(
                     Wrappers.lambdaQuery(KylinOrderExpress.class)
                             .eq(KylinOrderExpress::getOrderExpressId, orderExpressId)
             );
+            log.info("kylinOrderExpress", kylinOrderExpress);
             KylinOrderTickets orderInfo = kylinOrderTicketsMapper.selectOne(
                     Wrappers.lambdaQuery(KylinOrderTickets.class)
                             .eq(KylinOrderTickets::getOrderTicketsId, kylinOrderExpress.getOrderTicketsId())
             );
-
+            log.info("orderInfo", orderInfo);
             String imgPath = codeUtil.html2img(kylinOrderExpress, jContact, jProvince.concat(jCity).concat(jAddress), jTel, orderInfo);
+            log.info("imgPath", imgPath);
             codeUtil.drawImage(imgPath, 1);
         }
         return ResponseDto.success();