Merge branch 'master' of dq/kmall-pt into master

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

@@ -201,7 +201,7 @@ public class OrderServiceImpl implements OrderService {
         List<Goods> goodsList = new ArrayList<>();
         for (OrderGoodsEntity orderGoods : orderGoodsEntityList) {
             goodsTotal += orderGoods.getNumber();
-            total = total.add(orderGoods.getRetailPrice().subtract(new BigDecimal(orderGoods.getNumber()))).setScale(2, BigDecimal.ROUND_HALF_UP);
+            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());
             goodsList.add(goods);
         }
@@ -228,54 +228,6 @@ public class OrderServiceImpl implements OrderService {
 
         return TicketPrintUtil.print(head, goodsList, cashInfo, cusListing);
     }
-    /**
-     * 飞鸽打印
-     */
-    /*@Override
-    public String printMsg(Long id) {
-        OrderEntity orderEntity = queryObject(id);
-        Map<String, Object> map = new HashMap<String, Object>();
-
-        map.put("orderId", orderEntity.getId());
-        List<OrderGoodsEntity> orderGoodsEntities = orderGoodsDao.queryList(map);
-
-        String content = "<CB>小程序商城</CB><BR>";
-        content += "名称/商品编码       单价   数量   金额<BR>";
-        for (OrderGoodsEntity orderGoodsEntity : orderGoodsEntities) {
-            content += "--------------------------------<BR>";
-            content += orderGoodsEntity.getGoodsName() + "<BR>" + orderGoodsEntity.getGoodsSn() + "             " + orderGoodsEntity.getRetailPrice() + "    " + orderGoodsEntity.getNumber()
-                    + "   " + orderGoodsEntity.getRetailPrice().multiply(new BigDecimal(orderGoodsEntity.getNumber())) + "<BR>";
-        }
-        content += "--------------------------------<BR>";
-        content += "备注：" + orderEntity.getPostscript() + "<BR>";
-        content += "--------------------------------<BR>";
-        content += "订单编号：" + orderEntity.getOrderSn() + "<BR>";
-        content += "配送配用：" + orderEntity.getFreightPrice() + "元<BR>";
-        content += "优惠价格：" + orderEntity.getCouponPrice() + "元<BR>";
-        content += "合计：" + orderEntity.getOrderPrice() + "元<BR>";
-        content += "实付：" + orderEntity.getActualPrice() + "元<BR>";
-        content += "姓名：" + orderEntity.getUserName() + "<BR>";
-        content += "送货地点：" + orderEntity.getProvince() + orderEntity.getCity() + orderEntity.getDistrict() + orderEntity.getAddress() + "<BR>";
-        content += "联系电话：" + orderEntity.getMobile() + "<BR>";
-        content += "付款时间：" + DateUtils.format(orderEntity.getPayTime(), DateUtils.DATE_TIME_PATTERN) + "<BR>";
-        content += "<QR>https://www.二维码.com</QR>";
-        if ("2".equals(orderEntity.getOrderType())) {
-            content += "<RIGHT><BOLD>【团购】</BOLD></RIGHT>";
-        }
-
-        //所属门店
-        Integer storeId = orderEntity.getStoreId();
-
-        //获取门店的打印机编号，每个门店只有一个打票机
-        Map<String, Object> printParams = new HashMap<String, Object>();
-        List<SysPrinterEntity> printerEntities = printerDao.queryList(printParams);
-        printParams.put("storeId", storeId);
-        String sn = "";
-        if (printerEntities != null && printerEntities.size() != 0) {
-            sn = printerEntities.get(0).getSn();
-        }
-        return FeiGeUtils.printMsg(sn, content, "1");
-    }*/
 
     /**
      * 部分退款