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

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

@@ -411,8 +411,16 @@ public class OrderServiceImpl implements OrderService {
         if (!orderEntity.getOrderBizType().equalsIgnoreCase(Dict.orderBizType.item_11.getItem())) {
             cusListing.setWaybillId(orderProcessRecordEntity.getLogisticsNo());
             cusListing.setInvtNo(orderProcessRecordEntity.getInvtNo());
+
             cusListing.setConsignee(orderEntity.getConsignee());
+            // 脱敏设置
+            if (StringUtils.isNotEmpty(cusListing.getConsignee()) && cusListing.getConsignee().length()>1){
+                cusListing.setConsignee(new StringBuilder(cusListing.getConsignee()).replace(1,2,"*").toString());
+            }
             cusListing.setConsigneeTel(orderEntity.getMobile());
+            if (StringUtils.isNotEmpty(cusListing.getConsigneeTel())){
+                cusListing.setConsigneeTel(new StringBuilder(cusListing.getConsigneeTel()).replace(3,7,"****").toString());
+            }
         }
         cusListing.setOriginAddress(PrintTicketPropertiesBuilder.instance().getAddress());
         cusListing.setDeliveryAddress(storeEntity.getStoreAddress());

kmall-admin/src/main/webapp/js/sale/sale.js

@@ -570,6 +570,7 @@ let vm = new Vue({
                             })
                             // 打印取货码小票
                             var content = getPrintContent(r.resultObj);
+                            console.log(content);
                             printArea2(content);
                             vm.goodsList = [];
                             vm.customname = '' ;
@@ -586,6 +587,8 @@ let vm = new Vue({
                 }
             });
 
+
+
         },customClearData: function(){
             vm.totalPrice = 0;
             vm.discountedPrice = 0;