Accept Merge Request #3: (dev-0919 -> dev-feat)

Merge Request: 退款小票打印

Created By: @万新亮
Accepted By: @万新亮
URL: https://chuanghaikeji.coding.net/p/moxuanyunshangwaimai/d/backend/git/merge/3?initial=true

src/main/java/com/sqx/modules/order/service/impl/AppAppOrderServiceImpl.java

@@ -2411,6 +2411,9 @@ public class AppAppOrderServiceImpl extends ServiceImpl<AppOrderDao, TbOrder> im
                 goodsShopRelevancyDao.updateById(goodsShopRelevancy1);
                 goodsShopDao.updateShopSales(2, goodsNum, goodsShopRelevancy.getShopId());
             }
+
+            // 打印退款小票
+            FeiYunUtils.returnPrint(goodsShop.getSnCode(), tbOrder);
         }
         return Result.success();
     }

src/main/java/com/sqx/modules/printInfo/controller/PrintInfoController.java

@@ -87,7 +87,7 @@ public class PrintInfoController {
         tbOrder.setCountOrder(3);
 
         if (StringUtils.isNotEmpty(goodsShop.getSnCode())) {
-            FeiYunUtils.returnPrint(goodsShop.getSnCode(), null, tbOrder);
+            FeiYunUtils.returnPrint(goodsShop.getSnCode(), tbOrder);
         } else {
             return Result.error("当前商家未绑定打印机！");
         }

src/main/java/com/sqx/modules/utils/fieYun/FeiYunUtils.java

@@ -1572,46 +1572,13 @@ public class FeiYunUtils {
      * 小票机打印订单接口
      *
      * @param sn       打印机编号
-     * @param classify 分类 1加油成功出票模版  2提货券推送模版  3加油订单结算模版  4商品消费结算
      * @return 成功：{"msg":"ok","ret":0,"data":"xxxxxxx_xxxxxxxx_xxxxxxxx","serverExecutedTime":5}
      * 失败：{"msg":"错误描述","ret":非0,"data":"null","serverExecutedTime":5}
      */
-    public static String returnPrint(String sn, Integer classify, TbOrder tbOrder) {
+    public static String returnPrint(String sn, TbOrder tbOrder) {
         try {
-            //标签说明：
-            //单标签:
-            //"<BR>"为换行,"<CUT>"为切刀指令(主动切纸,仅限切刀打印机使用才有效果)
-            //"<LOGO>"为打印LOGO指令(前提是预先在机器内置LOGO图片),"<PLUGIN>"为钱箱或者外置音响指令
-            //成对标签：
-            //"<CB></CB>"为居中放大一倍,"<B></B>"为放大一倍,"<C></C>"为居中,<L></L>字体变高一倍
-            //<W></W>字体变宽一倍,"<QR></QR>"为二维码,"<BOLD></BOLD>"为字体加粗,""为右对齐
-            //拼凑订单内容时可参考如下格式
-            //根据打印纸张的宽度，自行调整内容的格式，可参考下面的样例格式
-
-            //region 以前的代码
-            /*content = "<CB>测试打印</CB><BR>";
-            content += "名称　　　　　 单价  数量 金额<BR>";
-            content += "--------------------------------<BR>";
-            content += "饭　　　　　　 1.0    1   1.0<BR>";
-            content += "炒饭　　　　　 10.0   10  10.0<BR>";
-            content += "蛋炒饭　　　　 10.0   10  100.0<BR>";
-            content += "鸡蛋炒饭　　　 100.0  1   100.0<BR>";
-            content += "番茄蛋炒饭　　 1000.0 1   100.0<BR>";
-            content += "西红柿蛋炒饭　 1000.0 1   100.0<BR>";
-            content += "西红柿鸡蛋炒饭 100.0  10  100.0<BR>";
-            content += "备注：加辣<BR>";
-            content += "--------------------------------<BR>";
-            content += "合计：xx.0元<BR>";
-            content += "送货地点：广州市南沙区xx路xx号<BR>";
-            content += "联系电话：13888888888888<BR>";
-            content += "订餐时间：2016-08-08 08:08:08<BR>";
-            content += "<QR>http://www.dzist.com</QR>";*/
-            //endregion
             StringBuilder sb = new StringBuilder();
 
-            log.info("utils方法打印开始");
-
-            //region 以前的代码
             sb.append("<AUDIO-REFUND>");
             sb.append("#").append(tbOrder.getCountOrder()).append("-").append("墨轩云商<BR>");
             sb.append("<CB>用户已取消，请勿继续配送</CB><BR>");
@@ -1621,12 +1588,7 @@ public class FeiYunUtils {
             sb.append("<BR>");
             sb.append("<CUT>");
 
-//            String returnNo = getDigitBarCode(tbOrder.getOrderNumber());
-//            //sb.append("<BC128_C>"+returnNo+"</BC128_C>");
-//            sb.append("<CB>").append(returnNo).append("</CB>");
             String content = sb.toString();
-            log.info("打印内容：" + content);
-            //通过POST请求，发送打印信息到服务器
             RequestConfig requestConfig = RequestConfig.custom()
                     .setSocketTimeout(30000)//读取超时
                     .setConnectTimeout(30000)//连接超时
@@ -1639,7 +1601,7 @@ public class FeiYunUtils {
             String USER = commonInfoService.findOne(326).getValue();
             String UKEY = commonInfoService.findOne(327).getValue();
             HttpPost post = new HttpPost(URL);
-            List<NameValuePair> nvps = new ArrayList<NameValuePair>();
+            List<NameValuePair> nvps = new ArrayList<>();
             nvps.add(new BasicNameValuePair("user", USER));
             String STIME = String.valueOf(System.currentTimeMillis() / 1000);
             nvps.add(new BasicNameValuePair("stime", STIME));
@@ -1683,7 +1645,6 @@ public class FeiYunUtils {
                     e.printStackTrace();
                 }
             }
-            log.error("打印返回值：" + result);
             return result;
         } catch (Exception e) {
             e.printStackTrace();