yangbo 3 years ago
parent
commit
e3641a3c11

+ 4 - 2
kmall-admin/src/main/java/com/kmall/admin/service/impl/OrderServiceImpl.java

@@ -470,7 +470,8 @@ public class OrderServiceImpl implements OrderService {
             }
             cusListing.setConsigneeTel(orderEntity.getMobile());
             if (StringUtils.isNotEmpty(cusListing.getConsigneeTel())) {
-                cusListing.setConsigneeTel(new StringBuilder(cusListing.getConsigneeTel()).replace(3, 7, "****").toString());
+//                cusListing.setConsigneeTel(new StringBuilder(cusListing.getConsigneeTel()).replace(3, 7, "****").toString());
+                cusListing.setConsigneeTel(cusListing.getConsigneeTel());
             }
         }
         cusListing.setOriginAddress(PrintTicketPropertiesBuilder.instance().getAddress());
@@ -516,7 +517,8 @@ public class OrderServiceImpl implements OrderService {
         mailInfo.setSenderAddress("前海综合保税区W104");
 
         // 收货人
-        mailInfo.setConsigneeMob(new StringBuilder(orderEntity.getMobile()).replace(3, 7, "****").toString());
+//        mailInfo.setConsigneeMob(new StringBuilder(orderEntity.getMobile()).replace(3, 7, "****").toString());
+        mailInfo.setConsigneeMob(orderEntity.getMobile());
         mailInfo.setConsigneeName(new StringBuilder(orderEntity.getConsignee()).replace(1, 2, "*").toString());
         mailInfo.setConsigneeProvince(orderEntity.getProvince());
         mailInfo.setConsigneeCity(orderEntity.getCity());

+ 6 - 3
kmall-admin/src/main/webapp/js/sale/sale.js

@@ -1255,9 +1255,12 @@ function printArea(content) {
     doc.close();
     var frameWindow = iframe.contentWindow;
 
-    frameWindow.focus();
-    frameWindow.print();
-    alert('打印小票完成');
+    $(iframe).load(function(){
+        frameWindow.focus();
+        frameWindow.print();
+        alert('打印小票完成');
+    });
+
 }
 
 function printArea2(content) {