Merge branch 'master' of http://git.ds-bay.com/project/kmall-pt-general

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

@@ -417,8 +417,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

@@ -590,6 +590,7 @@ let vm = new Vue({
                             })
                             // 打印取货码小票
                             var content = getPrintContent(r.resultObj);
+                            console.log(content);
                             printArea2(content);
                             vm.goodsList = [];
                             vm.customname = '' ;
@@ -606,6 +607,8 @@ let vm = new Vue({
                 }
             });
 
+
+
         },customClearData: function(){
             vm.totalPrice = 0;
             vm.discountedPrice = 0;
@@ -858,6 +861,12 @@ let vm = new Vue({
 
 function getPrintContent(ticket) {
     var content = "<div style=\"width: 250px;font-family: 微软雅黑;font-size: 15px;\">";
+    // // 打印ogo
+    // content += "<div style=\"text-align: center;width: 100%;height: 50px;\">";
+    // // content += "<img src='./../../statics/img/cw_logo.png' />";
+    // // content += "2222222222";
+    // content += "<img src='/statics/img/cw_logo.png' style='width: 100%;height: 100%;' />";
+    // content += "</div>";
     //小票头
     content += "<div style=\"text-align: center;width: 100%;font-weight:bold;font-size: 15px;\">";
     content += ticket.shopName
@@ -881,6 +890,7 @@ function getPrintContent(ticket) {
     content += "<div style=\"width: 100%;margin:5px 0px;font-size: 13px;\">";
     content += "该取货单号只有当天有效"
     content += "</div>";
+    content += "</div>";
 
     return content;
 }
@@ -1051,6 +1061,10 @@ function parsedate(value){
 
 function getPrintContentOrder(ticket) {
     var content = "<div style=\"width: 250px;font-family: 微软雅黑;font-size: 8px;\">";
+    // 打印ogo
+    content += "<div style=\"text-align: center;width: 100%;height: 100px;\">";
+    content += "<img src='/statics/img/cw_logo2.png' style='width: 100%;height: 100%;' />";
+    content += "</div>";
     //小票头
     content += "<div style=\"text-align: center;width: 100%;font-weight:bold;font-size: 13px;\">";
     content += ticket.ticketHead.title;
@@ -1111,18 +1125,18 @@ function getPrintContentOrder(ticket) {
     content += "<span style=\"float: left;width: 50%;text-align: left;\">实收:</span>";
     content += "<span style=\"float: right;width: 50%;text-align: right;\">" + ticket.cashInfo.receipts + "元</span>";
     content += "</div>";
-    content += "<div style=\"width: 100%;\">";
-    content += "<span style=\"float: left;width: 50%;text-align: left;\">找零:</span>";
-    content += "<span style=\"float: right;width: 50%;text-align: right;\">" + ticket.cashInfo.oddChange + "元</span>";
-    content += "</div>";
+    // content += "<div style=\"width: 100%;\">";
+    // content += "<span style=\"float: left;width: 50%;text-align: left;\">找零:</span>";
+    // content += "<span style=\"float: right;width: 50%;text-align: right;\">" + ticket.cashInfo.oddChange + "元</span>";
+    // content += "</div>";
     content += "<div style=\"width: 100%;\">";
     content += "<span style=\"float: left;width: 50%;text-align: left;\">优惠券:</span>";
     content += "<span style=\"float: right;width: 50%;text-align: right;\">" + ticket.cashInfo.coupon + "元</span>";
     content += "</div>";
-    content += "<div style=\"width: 100%;\">";
-    content += "<span style=\"float: left;width: 50%;text-align: left;\">运费:</span>";
-    content += "<span style=\"float: right;width: 50%;text-align: right;\">" + ticket.cashInfo.freight + "元</span>";
-    content += "</div>";
+    // content += "<div style=\"width: 100%;\">";
+    // content += "<span style=\"float: left;width: 50%;text-align: left;\">运费:</span>";
+    // content += "<span style=\"float: right;width: 50%;text-align: right;\">" + ticket.cashInfo.freight + "元</span>";
+    // content += "</div>";
     content += "<div style=\"width: 100%;\">";
     content += "<span style=\"float: left;width: 50%;text-align: left;\">支付渠道:</span>";
     // 后期改成从系统中取
@@ -1152,6 +1166,20 @@ function getPrintContentOrder(ticket) {
     content += "交货地:" + ticket.cusListing.deliveryAddress;
     content += "</div>";
     content += "<div style=\"width: 100%;overflow:hidden;white-space: nowrap;\">--------------------------------------------------</div>";
+    content += "<div style=\"width: 100%;text-align: center;\">";
+    content += "购买跨境商品须知:"
+    content += "</div>";
+    content += "<div style=\"width: 100%;\">";
+    content += "1、凡购买跨境商品均不提供发票；<br> 2、单笔限购5000元，年交易限额2.6万元； <br> 3、所有订单经海关放行后方可提货； <br> 4、凭小票领取您的订单商品。"
+    content += "</div>";
+    content += "<div style=\"width: 100%;overflow:hidden;white-space: nowrap;\">--------------------------------------------------</div>";
+    content += "<div style=\"width: 100%;text-align: center;\">";
+    content += "退换货须知:"
+    content += "</div>";
+    content += "<div style=\"width: 100%;\">";
+    content += "请您当面哦对小票，清点商品，在原包装完好，未拆封、无破损、原始小票等所有物件完全且不影响二次销售的情况下，支持七天无理由退货。食品（含保健品）为特殊商品，非质量原因不退换，希望您能谅解！"
+    content += "</div>";
+    content += "<div style=\"width: 100%;overflow:hidden;white-space: nowrap;\">--------------------------------------------------</div>";
     content += "<div style=\"width: 100%;\">";
     // content += ticket.ticketFoot.summary;
     content += "</div>";
@@ -1164,6 +1192,19 @@ function getPrintContentOrder(ticket) {
     content += "<div style=\"width: 100%;\">";
     content += ticket.ticketFoot.welcome;
     content += "</div>";
+    content += "<div style=\"width: 100%;\">";
+    content += "惠州市惠城区港惠新天地负一层";
+    content += "</div>";
+    content += "<div style=\"width: 100%;\">";
+    content += "请当面清点所购商品，并保管好收银小票以做退换货凭证。";
+    content += "</div>";
+    // 打印二维码
+    content += "<div style=\"text-align: center;width: 100%;height: 250px;\">";
+    content += "<img src='/statics/img/cw_qrcode.png' style='width: 100%;height: 100%;' />";
+    content += "</div>";
+    content += "<div style=\"width: 100%;text-align: center;\">";
+    content += "全球精选，品质生活"
+    content += "</div>";
     return content;
 }
 

kmall-common/src/main/java/com/kmall/common/utils/print/ticket/item/TicketFoot.java

@@ -22,7 +22,7 @@ public class TicketFoot implements Serializable {
     // 网址3
     private String url3;
     //
-    private String welcome = "欢迎再次惠顾";
+    private String welcome = "欢迎再次惠顾--服务电话: 0371-55651210";
 
     public String getSummary() {
         return summary;