Merge branch 'master' of yb/kmall-pt-general into master

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

@@ -470,8 +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(cusListing.getConsigneeTel());
+                cusListing.setConsigneeTel(new StringBuilder(cusListing.getConsigneeTel()).replace(3, 7, "****").toString());
+//                cusListing.setConsigneeTel(cusListing.getConsigneeTel());
             }
         }
         cusListing.setOriginAddress(PrintTicketPropertiesBuilder.instance().getAddress());
@@ -517,8 +517,8 @@ public class OrderServiceImpl implements OrderService {
         mailInfo.setSenderAddress("前海综合保税区W104");
 
         // 收货人
-//        mailInfo.setConsigneeMob(new StringBuilder(orderEntity.getMobile()).replace(3, 7, "****").toString());
-        mailInfo.setConsigneeMob(orderEntity.getMobile());
+        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());