修改小票打印样式

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

@@ -294,8 +294,6 @@ public class OrderServiceImpl implements OrderService {
     public Ticket printMsg(Long id) {
         OrderEntity orderEntity = queryInfos(id);
 
-
-
         List<OrderGoodsEntity> orderGoodsEntityList = orderEntity.getOrderGoodsEntityList();
         // 获取门店
         StoreEntity storeEntity = storeDao.queryObject(orderEntity.getStoreId());
@@ -313,12 +311,15 @@ public class OrderServiceImpl implements OrderService {
         // 商品信息
         Integer goodsTotal = 0; // 商品总个数
         BigDecimal total = Constant.ZERO; // 商品总计
+        BigDecimal taxTotal = Constant.ZERO; //税费总计
         List<Goods> goodsList = new ArrayList<>();
         for (OrderGoodsEntity orderGoods : orderGoodsEntityList) {
             goodsTotal += orderGoods.getNumber();
             total = total.add(orderGoods.getRetailPrice().multiply(new BigDecimal(orderGoods.getNumber())))
                          .setScale(2, BigDecimal.ROUND_HALF_UP);
-            Goods goods = new Goods(orderGoods.getGoodsName(), orderGoods.getRetailPrice().toString(),
+            taxTotal = taxTotal.add(orderGoods.getGoodsRate().multiply(orderGoods.getMarketPrice()).setScale(2, BigDecimal.ROUND_HALF_UP));
+            Goods goods = new Goods(orderGoods.getGoodsName(), orderGoods.getMarketPrice().toString(),
+                                    orderGoods.getGoodsRate().multiply(orderGoods.getMarketPrice()).setScale(2, BigDecimal.ROUND_HALF_UP).toString(),
                                     orderGoods.getNumber().toString(),
                                     orderGoods.getRetailPrice().multiply(new BigDecimal(orderGoods.getNumber()))
                                               .setScale(2, BigDecimal.ROUND_HALF_UP).toString());
@@ -329,6 +330,7 @@ public class OrderServiceImpl implements OrderService {
         CashInfo cashInfo = new CashInfo();
         cashInfo.setGoodsTotal(goodsTotal.toString());
         cashInfo.setTotal(total.setScale(2, BigDecimal.ROUND_HALF_UP).toString());
+        cashInfo.setTaxTotal(taxTotal.setScale(2, BigDecimal.ROUND_HALF_UP).toString());
         cashInfo.setReceipts(orderEntity.getActualPrice().setScale(2, BigDecimal.ROUND_HALF_UP).toString());
         cashInfo.setOddChange("0.00");
         cashInfo.setCoupon(orderEntity.getCouponPrice().setScale(2, BigDecimal.ROUND_HALF_UP).toString());
@@ -359,8 +361,6 @@ public class OrderServiceImpl implements OrderService {
     public Ticket printMsg(Long id, String sessionId) {
         OrderEntity orderEntity = queryInfos(id);
 
-
-
         List<OrderGoodsEntity> orderGoodsEntityList = orderEntity.getOrderGoodsEntityList();
         // 获取门店
         StoreEntity storeEntity = storeDao.queryObject(orderEntity.getStoreId());
@@ -378,15 +378,18 @@ public class OrderServiceImpl implements OrderService {
         // 商品信息
         Integer goodsTotal = 0; // 商品总个数
         BigDecimal total = Constant.ZERO; // 商品总计
+        BigDecimal taxTotal = Constant.ZERO; //税费总计
         List<Goods> goodsList = new ArrayList<>();
         for (OrderGoodsEntity orderGoods : orderGoodsEntityList) {
             goodsTotal += orderGoods.getNumber();
             total = total.add(orderGoods.getRetailPrice().multiply(new BigDecimal(orderGoods.getNumber())))
                     .setScale(2, BigDecimal.ROUND_HALF_UP);
-            Goods goods = new Goods(orderGoods.getGoodsName(), orderGoods.getRetailPrice().toString(),
-                    orderGoods.getNumber().toString(),
-                    orderGoods.getRetailPrice().multiply(new BigDecimal(orderGoods.getNumber()))
-                            .setScale(2, BigDecimal.ROUND_HALF_UP).toString());
+            taxTotal = taxTotal.add(orderGoods.getGoodsRate().multiply(orderGoods.getMarketPrice()).setScale(2, BigDecimal.ROUND_HALF_UP));
+            Goods goods = new Goods(orderGoods.getGoodsName(), orderGoods.getMarketPrice().toString(),
+                                    orderGoods.getGoodsRate().multiply(orderGoods.getMarketPrice()).setScale(2, BigDecimal.ROUND_HALF_UP).toString(),
+                                    orderGoods.getNumber().toString(),
+                                    orderGoods.getRetailPrice().multiply(new BigDecimal(orderGoods.getNumber()))
+                                              .setScale(2, BigDecimal.ROUND_HALF_UP).toString());
             goodsList.add(goods);
         }
 
@@ -394,6 +397,7 @@ public class OrderServiceImpl implements OrderService {
         CashInfo cashInfo = new CashInfo();
         cashInfo.setGoodsTotal(goodsTotal.toString());
         cashInfo.setTotal(total.setScale(2, BigDecimal.ROUND_HALF_UP).toString());
+        cashInfo.setTaxTotal(taxTotal.setScale(2, BigDecimal.ROUND_HALF_UP).toString());
         cashInfo.setReceipts(orderEntity.getActualPrice().setScale(2, BigDecimal.ROUND_HALF_UP).toString());
         cashInfo.setOddChange("0.00");
         cashInfo.setCoupon(orderEntity.getCouponPrice().setScale(2, BigDecimal.ROUND_HALF_UP).toString());

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

@@ -1001,10 +1001,11 @@ function getPrintContentOrder(ticket) {
     //商品信息
     content += "<table style=\"width: 100%;\" border=\"0\" cellspacing=\"0\" cellpadding=\"0\">";
     content += "<tr>";
-    content += "<td style=\"width: 50%;text-align: left;font-size: 10px;font-weight: bold;\">商品名称</td>";
+    content += "<td style=\"width: 40%;text-align: left;font-size: 10px;font-weight: bold;\">商品名称</td>";
     content += "<td style=\"width: 17%;text-align: right;font-size: 10px;font-weight: bold;\">单价</td>";
-    content += "<td style=\"width: 15%;text-align: right;font-size: 10px;font-weight: bold;\">数量</td>";
-    content += "<td style=\"width: 18%;text-align: right;font-size: 10px;font-weight: bold;\">小计</td>";
+    content += "<td style=\"width: 16%;text-align: right;font-size: 10px;font-weight: bold;\">税费</td>";
+    content += "<td style=\"width: 10%;text-align: right;font-size: 10px;font-weight: bold;\">数量</td>";
+    content += "<td style=\"width: 17%;text-align: right;font-size: 10px;font-weight: bold;\">小计</td>";
     content += "</tr>";
     content += "</table>";
     content += "<div style=\"width: 100%;overflow:hidden;white-space: nowrap;\">--------------------------------------------------</div>";
@@ -1020,6 +1021,7 @@ function getPrintContentOrder(ticket) {
         content += "</table>";
         content += "</td>";
         content += "<td style=\"width: 17%;text-align: right;font-size: 8px;vertical-align:bottom;padding-top: 8px;\">" + ticket.goods[i].uprice + "</td>";
+        content += "<td style=\"width: 17%;text-align: right;font-size: 8px;vertical-align:bottom;padding-top: 8px;\">" + ticket.goods[i].taxation + "</td>";
         content += "<td style=\"width: 15%;text-align: right;font-size: 8px;vertical-align:bottom;padding-top: 8px;\">" + ticket.goods[i].num + "</td>";
         content += "<td style=\"width: 18%;text-align: right;font-size: 8px;vertical-align:bottom;padding-top: 8px;\">" + ticket.goods[i].subtotal + "元</td>";
         content += "</tr>";
@@ -1034,6 +1036,11 @@ function getPrintContentOrder(ticket) {
     content += "<span style=\"float: right;width: 33%;text-align: right;\">" + ticket.cashInfo.total + "元</span>";
     content += "</div>";
     content += "<div style=\"width: 100%;\">";
+    content += "<span style=\"float: left;width: 50%;text-align: left;\">税费合计:</span>";
+    content += "<span style=\"float: left;width: 17%;text-align: left;\">" + ticket.cashInfo.goodsTotal + "件</span>";
+    content += "<span style=\"float: right;width: 33%;text-align: right;\">" + ticket.cashInfo.taxTotal + "元</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.receipts + "元</span>";
     content += "</div>";
@@ -1071,7 +1078,7 @@ function getPrintContentOrder(ticket) {
     content += "收货人电话:" + ticket.cusListing.consigneeTel;
     content += "</div>";
     content += "<div style=\"width: 100%;\">";
-    content += "始发地:" + ticket.cusListing.originAddress;
+    content += "始发地:" + ticket.cusListing.deliveryAddress;
     content += "</div>";
     content += "<div style=\"width: 100%;\">";
     content += "交货地:" + ticket.cusListing.deliveryAddress;

kmall-api/src/main/java/com/kmall/api/service/ApiOrderService.java

@@ -1248,7 +1248,7 @@ public class ApiOrderService {
         }
         return FeiGeUtils.printMsg(sn, content, "1");
     }*/
-    public Ticket printMsg(Long orderId) {
+    /*public Ticket printMsg(Long orderId) {
         OrderVo orderEntity = queryObject(orderId);
         if(orderEntity != null) {
             if (orderEntity.getOrderBizType().equalsIgnoreCase(Dict.orderBizType.item_10.getItem())
@@ -1276,8 +1276,9 @@ public class ApiOrderService {
                 for (OrderGoodsVo orderGoods : orderGoodsEntityList) {
                     goodsTotal += orderGoods.getNumber();
                     total = total.add(orderGoods.getRetail_price().subtract(new BigDecimal(orderGoods.getNumber()))).setScale(2, BigDecimal.ROUND_HALF_UP);
-                    Goods goods = new Goods(orderGoods.getGoods_name(), orderGoods.getRetail_price().toString(), orderGoods.getNumber().toString()
-                                            ,orderGoods.getRetail_price().multiply(new BigDecimal(orderGoods.getNumber())).setScale(2,BigDecimal.ROUND_HALF_UP).toString());
+                    Goods goods = new Goods(orderGoods.getGoods_name(), orderGoods.getRetail_price().toString(),
+                                            orderGoods.getNumber().toString(),
+                                            orderGoods.getRetail_price().multiply(new BigDecimal(orderGoods.getNumber())).setScale(2,BigDecimal.ROUND_HALF_UP).toString());
                     goodsList.add(goods);
                 }
 
@@ -1308,7 +1309,7 @@ public class ApiOrderService {
         }else{
             return null;
         }
-    }
+    }*/
 
     public List<OrderVo> queryObjectByIdList(List<Long> orderIdList){
         return apiOrderMapper.queryObjectByIdList(orderIdList);

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

@@ -52,11 +52,11 @@ public class Test {
 
         // 商品信息
         List<Goods> goods = new ArrayList<Goods>();
-        goods.add(new Goods("奥地利 进口 Loacker/莱家 威化饼干巧克力味250g/袋", "59.90", "1", "59.9"));
-        goods.add(new Goods("比利时进口零食品 LOTUS和情焦糖饼干312.5g咖啡伴侣小吃", "16.80", "1", "16.80 "));
-        goods.add(new Goods("博智900g高钙燕麦植物奶", "238.00", "1", "238.00"));
-        goods.add(new Goods("韩国进口 海太蜂蜜黄油薯片60g*5袋土豆片休闲网红零食大礼包批发", "100.00", "1", "100.00"));
-        goods.add(new Goods("新西兰进口纽瑞滋脱脂奶粉1kg成人青少年中老年奶粉", "100.00", "1", "100.00"));
+        goods.add(new Goods("奥地利 进口 Loacker/莱家 威化饼干巧克力味250g/袋", "59.90", "0.00", "1", "59.9"));
+        goods.add(new Goods("比利时进口零食品 LOTUS和情焦糖饼干312.5g咖啡伴侣小吃", "16.80", "0.00", "1", "16.80 "));
+        goods.add(new Goods("博智900g高钙燕麦植物奶", "238.00", "0.00", "1", "238.00"));
+        goods.add(new Goods("韩国进口 海太蜂蜜黄油薯片60g*5袋土豆片休闲网红零食大礼包批发", "100.00", "0.00", "1", "100.00"));
+        goods.add(new Goods("新西兰进口纽瑞滋脱脂奶粉1kg成人青少年中老年奶粉", "100.00", "0.00", "1", "100.00"));
 
         // 收银信息
         CashInfo cashInfo = new CashInfo();

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

@@ -15,6 +15,8 @@ public class CashInfo implements Serializable {
 
     // 商品总额
     private String total;
+    // 税费总额
+    private String taxTotal;
     // 商品总数
     private String goodsTotal;
 
@@ -43,6 +45,14 @@ public class CashInfo implements Serializable {
         this.total = total;
     }
 
+    public String getTaxTotal() {
+        return taxTotal;
+    }
+
+    public void setTaxTotal(String taxTotal) {
+        this.taxTotal = taxTotal;
+    }
+
     public String getGoodsTotal() {
         return goodsTotal;
     }

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

@@ -17,14 +17,17 @@ public class Goods implements Serializable {
     private String gname;
     // 商品单价
     private String uprice;
+    //税费
+    private String taxation;
     // 商品数量
     private String num;
     // 小计
     private String subtotal;
 
-    public Goods(String gname, String uprice, String num, String subtotal) {
+    public Goods(String gname, String uprice, String taxation, String num, String subtotal) {
         this.gname = gname;
         this.uprice = uprice;
+        this.taxation = taxation;
         this.num = num;
         this.subtotal = subtotal;
     }
@@ -45,6 +48,14 @@ public class Goods implements Serializable {
         this.uprice = uprice;
     }
 
+    public String getTaxation() {
+        return taxation;
+    }
+
+    public void setTaxation(String taxation) {
+        this.taxation = taxation;
+    }
+
     public String getNum() {
         return num;
     }